luke
/
nextpnr
mirror of https://github.com/YosysHQ/nextpnr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes

This commit is contained in:
Miodrag Milanovic 2025-06-23 10:52:12 +02:00
parent 27fdf4e16f
commit f61c10ea19
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
himbaechel/uarch/gatemate/bitstream.cc
View File

@ -264,10 +264,11 @@ struct BitstreamBackend
update_cpe_lt(cell.second.get(), id_IN3, id_INIT_L01, params);
update_cpe_lt(cell.second.get(), id_IN4, id_INIT_L01, params);
} else {
update_cpe_lt(cell.second.get(), id_IN1, id_INIT_L02, params);
update_cpe_lt(cell.second.get(), id_IN2, id_INIT_L02, params);
update_cpe_lt(cell.second.get(), id_IN3, id_INIT_L03, params);
update_cpe_lt(cell.second.get(), id_IN4, id_INIT_L03, params);
// These will be renamed later
update_cpe_lt(cell.second.get(), id_IN1, id_INIT_L00, params);
update_cpe_lt(cell.second.get(), id_IN2, id_INIT_L00, params);
update_cpe_lt(cell.second.get(), id_IN3, id_INIT_L01, params);
update_cpe_lt(cell.second.get(), id_IN4, id_INIT_L01, params);
}
}
if (l.z==7) {
@ -303,7 +304,29 @@ struct BitstreamBackend
}
int id = tile_extra_data(cell.second.get()->bel.tile)->prim_id;
for (auto &p : params) {
cc.tiles[loc].add_word(stringf("CPE%d.%s", id, p.first.c_str(ctx)), p.second.as_bits());
IdString name = p.first;
switch(l.z) {
case 1 : // CPE_LT_L
switch(p.first.index) {
case id_INIT_L00.index : name = id_INIT_L02; break;
case id_INIT_L01.index : name = id_INIT_L03; break;
case id_INIT_L10.index : name = id_INIT_L11; break;
}
break;
case 4 : // CPE_RAMIO_U
switch(p.first.index) {
case id_C_RAM_I.index : name = id_C_RAM_I2; break;
case id_C_RAM_O.index : name = id_C_RAM_O2; break;
}
break;
case 5 : // CPE_RAMIO_L
switch(p.first.index) {
case id_C_RAM_I.index : name = id_C_RAM_I1; break;
case id_C_RAM_O.index : name = id_C_RAM_O1; break;
}
break;
}
cc.tiles[loc].add_word(stringf("CPE%d.%s", id, name.c_str(ctx)), p.second.as_bits());
}
} break;
case id_CLKIN.index: {

26
himbaechel/uarch/gatemate/gatemate.cc
View File

@ -195,29 +195,9 @@ void GateMateImpl::postPlace()
for (auto &cell : ctx->cells) {
if (getBelBucketForCellType(cell.second->type) == id_CPE_LT) {
Loc l = ctx->getBelLocation(cell.second->bel);
if (l.z == 0) { // CPE_HALF_U
//if (cell.second->params.count(id_C_O) && int_or_default(cell.second->params, id_C_O, 0) == 0)
//cell.second->params[id_C_2D_IN] = Property(1, 1);
//cell.second->type = id_CPE_HALF_U;
} else { // CPE_HALF_L
if (l.z == 1) { // CPE_HALF_L
if (!cell.second->params.count(id_INIT_L20))
cell.second->params[id_INIT_L20] = Property(0b1100, 4);
rename_param(cell.second.get(), id_INIT_L00, id_INIT_L02, 4);
rename_param(cell.second.get(), id_INIT_L01, id_INIT_L03, 4);
rename_param(cell.second.get(), id_INIT_L10, id_INIT_L11, 4);
//cell.second->type = id_CPE_HALF_L;
}
}
if (getBelBucketForCellType(cell.second->type) == id_CPE_RAMIO) {
Loc l = ctx->getBelLocation(cell.second->bel);
if (l.z == 4) { // CPE_RAMIO_U
rename_param(cell.second.get(), id_C_RAM_I, id_C_RAM_I2, 1);
rename_param(cell.second.get(), id_C_RAM_O, id_C_RAM_O2, 1);
//cell.second->type = id_CPE_RAMIO_U;
} else { // CPE_HALF_L
rename_param(cell.second.get(), id_C_RAM_I, id_C_RAM_I1, 1);
rename_param(cell.second.get(), id_C_RAM_O, id_C_RAM_O1, 1);
//cell.second->type = id_CPE_RAMIO_L;
}
}
}
@ -238,6 +218,10 @@ void GateMateImpl::postPlace()
cell.second->renamePort(id_IN4, id_IN8);
cell.second->renamePort(id_OUT, id_OUT1);
cell.second->renamePort(id_CPOUT, id_CPOUT1);
rename_param(cell.second.get(), id_INIT_L00, id_INIT_L02, 4);
rename_param(cell.second.get(), id_INIT_L01, id_INIT_L03, 4);
rename_param(cell.second.get(), id_INIT_L10, id_INIT_L11, 4);
if (is_l2t5) {
cell.second->type = id_CPE_L2T5;
} else {