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

placer1: Fix cluster swap cost updates

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2021-09-18 11:11:16 +01:00
parent 4730a4f339
commit e926cddca2
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/placer1.cc
View File

@ -687,10 +687,6 @@ class SAPlacer
#endif #endif
ctx->unbindBel(bound->bel); ctx->unbindBel(bound->bel);
ctx->bindBel(old_bel, bound, STRENGTH_WEAK); ctx->bindBel(old_bel, bound, STRENGTH_WEAK);
add_move_cell(moveChange, bound, moved_cells.at(bound->name));
if (cfg.netShareWeight > 0)
update_nets_by_tile(bound, ctx->getBelLocation(moved_cells.at(bound->name)),
ctx->getBelLocation(old_bel));
} }
} else if (!ctx->checkBelAvail(db.second)) { } else if (!ctx->checkBelAvail(db.second)) {
goto swap_fail; goto swap_fail;
@ -700,15 +696,15 @@ class SAPlacer
log_info("%d bind %s %s\n", __LINE__, ctx->nameOfBel(db.second), ctx->nameOf(db.first)); log_info("%d bind %s %s\n", __LINE__, ctx->nameOfBel(db.second), ctx->nameOf(db.first));
#endif #endif
ctx->bindBel(db.second, db.first, STRENGTH_WEAK); ctx->bindBel(db.second, db.first, STRENGTH_WEAK);
add_move_cell(moveChange, db.first, moved_cells.at(db.first->name));
if (cfg.netShareWeight > 0)
update_nets_by_tile(db.first, ctx->getBelLocation(moved_cells.at(db.first->name)),
ctx->getBelLocation(db.second));
} }
} }
for (const auto &mm : moved_cells) { for (const auto &mm : moved_cells) {
CellInfo *cell = ctx->cells.at(mm.first).get(); CellInfo *cell = ctx->cells.at(mm.first).get();
add_move_cell(moveChange, cell, moved_cells.at(cell->name));
if (cfg.netShareWeight > 0)
update_nets_by_tile(cell, ctx->getBelLocation(moved_cells.at(cell->name)),
ctx->getBelLocation(cell->bel));
if (!ctx->isBelLocationValid(cell->bel) || !cell->testRegion(cell->bel)) if (!ctx->isBelLocationValid(cell->bel) || !cell->testRegion(cell->bel))
goto swap_fail; goto swap_fail;
} }