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

ice40: Fix carry packer bug

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-09-25 15:52:32 +01:00
parent 09ddcb67d3
commit f1aa7093fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ice40/pack.cc
View File

@ -159,7 +159,7 @@ static void pack_carries(Context *ctx)
exhausted_cells.find(usr.cell->name) == exhausted_cells.end()) { exhausted_cells.find(usr.cell->name) == exhausted_cells.end()) {
// This clause stops us double-packing cells // This clause stops us double-packing cells
i0_matches.insert(usr.cell->name); i0_matches.insert(usr.cell->name);
if (!i1_net) { if (!i1_net && !usr.cell->ports.at(ctx->id("I2")).net) {
// I1 is don't care when disconnected, duplicate I0 // I1 is don't care when disconnected, duplicate I0
i1_matches.insert(usr.cell->name); i1_matches.insert(usr.cell->name);
} }
@ -174,7 +174,7 @@ static void pack_carries(Context *ctx)
exhausted_cells.find(usr.cell->name) == exhausted_cells.end()) { exhausted_cells.find(usr.cell->name) == exhausted_cells.end()) {
// This clause stops us double-packing cells // This clause stops us double-packing cells
i1_matches.insert(usr.cell->name); i1_matches.insert(usr.cell->name);
if (!i0_net) { if (!i0_net && !usr.cell->ports.at(ctx->id("I1")).net) {
// I0 is don't care when disconnected, duplicate I1 // I0 is don't care when disconnected, duplicate I1
i0_matches.insert(usr.cell->name); i0_matches.insert(usr.cell->name);
} }