caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gowin: Himbaechel. Add redundant checks

Browse Source 
Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2023-07-27 17:28:58 +10:00 committed by myrtle
parent 03c413a27a
commit 01044cc910
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
himbaechel/uarch/gowin/gowin.cc
View File

@ -155,7 +155,7 @@ void GowinImpl::postPlace()
for (auto &cell : ctx->cells) { for (auto &cell : ctx->cells) {
auto ci = cell.second.get(); auto ci = cell.second.get();
IdStringList bel = ctx->getBelName(ci->bel); IdStringList bel = ctx->getBelName(ci->bel);
log_info("%s -> %s\n", ctx->nameOf(ci), bel.str(ctx).c_str()); log_info("%s: %s\n", bel.str(ctx).c_str(), ctx->nameOf(ci));
} }
log_break(); log_break();
} }

5
himbaechel/uarch/gowin/pack.cc
View File

@ -249,7 +249,7 @@ struct GowinPacker
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
// input src // input src
NetInfo *in = ci_cursor->getPort(inputs[i].port); NetInfo *in = ci_cursor->getPort(inputs[i].port);
NPNR_ASSERT(in && in->driver.cell); NPNR_ASSERT(in && in->driver.cell && in->driver.cell->cluster == ClusterId());
int child_dx = dx + inputs[i].dx; int child_dx = dx + inputs[i].dx;
int child_dz = dz + inputs[i].dz; int child_dz = dz + inputs[i].dz;
ci_root.constr_children.push_back(in->driver.cell); ci_root.constr_children.push_back(in->driver.cell);
@ -423,6 +423,7 @@ struct GowinPacker
log_info("Add ALU to the chain (len:%d): %s\n", alu_chain_len, ctx->nameOf(ci)); log_info("Add ALU to the chain (len:%d): %s\n", alu_chain_len, ctx->nameOf(ci));
} }
cin_block_ci->constr_children.push_back(ci); cin_block_ci->constr_children.push_back(ci);
NPNR_ASSERT(ci->cluster == ClusterId());
ci->cluster = cin_block_ci->name; ci->cluster = cin_block_ci->name;
ci->constr_abs_z = false; ci->constr_abs_z = false;
ci->constr_x = alu_chain_len / 6; ci->constr_x = alu_chain_len / 6;
@ -444,6 +445,7 @@ struct GowinPacker
new_cells.push_back(std::move(alu_add_cout_block(ctx, ci, cout_net))); new_cells.push_back(std::move(alu_add_cout_block(ctx, ci, cout_net)));
CellInfo *cout_block_ci = new_cells.back().get(); CellInfo *cout_block_ci = new_cells.back().get();
cin_block_ci->constr_children.push_back(cout_block_ci); cin_block_ci->constr_children.push_back(cout_block_ci);
NPNR_ASSERT(cout_block_ci->cluster == ClusterId());
cout_block_ci->cluster = cin_block_ci->name; cout_block_ci->cluster = cin_block_ci->name;
cout_block_ci->constr_abs_z = false; cout_block_ci->constr_abs_z = false;
cout_block_ci->constr_x = alu_chain_len / 6; cout_block_ci->constr_x = alu_chain_len / 6;
@ -466,6 +468,7 @@ struct GowinPacker
new_cells.push_back(std::move(alu_add_dummy_block(ctx, ci))); new_cells.push_back(std::move(alu_add_dummy_block(ctx, ci)));
CellInfo *dummy_block_ci = new_cells.back().get(); CellInfo *dummy_block_ci = new_cells.back().get();
cin_block_ci->constr_children.push_back(dummy_block_ci); cin_block_ci->constr_children.push_back(dummy_block_ci);
NPNR_ASSERT(dummy_block_ci->cluster == ClusterId());
dummy_block_ci->cluster = cin_block_ci->name; dummy_block_ci->cluster = cin_block_ci->name;
dummy_block_ci->constr_abs_z = false; dummy_block_ci->constr_abs_z = false;
dummy_block_ci->constr_x = alu_chain_len / 6; dummy_block_ci->constr_x = alu_chain_len / 6;