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

Address review comments

This commit is contained in:
Miodrag Milanovic 2025-10-15 12:28:05 +02:00
parent 587c5e086d
commit 5e21b48f3e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
himbaechel/uarch/gatemate/pack.cc
View File

@ -400,11 +400,11 @@ void GateMatePacker::remove_double_constrained()
void GateMatePacker::recursiveAddToRegion(CellInfo *root, IdString die) void GateMatePacker::recursiveAddToRegion(CellInfo *root, IdString die)
{ {
if (root->region && root->region->name != die) if (root->region && root->region->name != die)
log_error("Trying to assing cell '%s' to multiple regions.\n", root->name.c_str(ctx)); log_error("Trying to assign cell '%s' to multiple regions.\n", root->name.c_str(ctx));
ctx->constrainCellToRegion(root->name, die); ctx->constrainCellToRegion(root->name, die);
for (auto cell : root->constr_children) { for (auto cell : root->constr_children) {
if (cell->region && cell->region->name != die) if (cell->region && cell->region->name != die)
log_error("Trying to assing cell '%s' to multiple regions.\n", cell->name.c_str(ctx)); log_error("Trying to assign cell '%s' to multiple regions.\n", cell->name.c_str(ctx));
ctx->constrainCellToRegion(cell->name, die); ctx->constrainCellToRegion(cell->name, die);
recursiveAddToRegion(cell, die); recursiveAddToRegion(cell, die);
} }
@ -418,7 +418,7 @@ void GateMatePacker::assign_clocks()
for (auto &user : net->users) { for (auto &user : net->users) {
IdString die = uarch->index_to_die[uarch->tile_extra_data(net->driver.cell->bel.tile)->die]; IdString die = uarch->index_to_die[uarch->tile_extra_data(net->driver.cell->bel.tile)->die];
if (user.cell->region && user.cell->region->name != die) if (user.cell->region && user.cell->region->name != die)
log_error("Trying to assing cell '%s' to multiple regions.\n", user.cell->name.c_str(ctx)); log_error("Trying to assign cell '%s' to multiple regions.\n", user.cell->name.c_str(ctx));
ctx->constrainCellToRegion(user.cell->name, die); ctx->constrainCellToRegion(user.cell->name, die);
if (user.cell->cluster != ClusterId()) { if (user.cell->cluster != ClusterId()) {
CellInfo *root = ctx->getClusterRootCell(user.cell->cluster); CellInfo *root = ctx->getClusterRootCell(user.cell->cluster);

3
himbaechel/uarch/gatemate/pack_clocking.cc
View File

@ -778,8 +778,9 @@ void GateMatePacker::strategy_clk1()
iosel->connectPorts(id_GPIO_OUT, gpio, id_A); iosel->connectPorts(id_GPIO_OUT, gpio, id_A);
iosel->connectPorts(id_GPIO_EN, gpio, id_T); iosel->connectPorts(id_GPIO_EN, gpio, id_T);
gpio->connectPort(id_IO, new_clk1); gpio->connectPort(id_IO, new_clk1);
} else } else {
gpio->connectPort(id_I, new_clk1); gpio->connectPort(id_I, new_clk1);
}
NetInfo *new_signal = ctx->createNet(ctx->idf("%s$die%d", net->name.c_str(ctx), new_die)); NetInfo *new_signal = ctx->createNet(ctx->idf("%s$die%d", net->name.c_str(ctx), new_die));
uarch->glbout[new_die]->connectPort(ctx->id("GLB1"), new_signal); uarch->glbout[new_die]->connectPort(ctx->id("GLB1"), new_signal);