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

Fix chain swap

Browse Source 
Issue was due to dest_bels being not cleared between clusters unbindes, causing
newly bind bels to be unbinded and having their old bel value changed to new bel value.
Then when swap failed 2 cells were being bind to a single bel.

I tested leaving dest_bels in the function scope and moving it to the loop scope.
Code with dest_bels in the loop scope was faster than leaving it in the function scope,
and checking if the cell is in the processed cluster.

Signed-off-by: Maciej Dudek <mdudek@antmicro.com>
This commit is contained in:
Maciej Dudek 2021-09-23 13:58:22 +02:00
parent b2e9ce46f1
commit 8c97cbe341
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/placer1.cc
View File

@ -619,7 +619,6 @@ class SAPlacer
{ {
std::vector<std::pair<CellInfo *, Loc>> cell_rel; std::vector<std::pair<CellInfo *, Loc>> cell_rel;
dict<IdString, BelId> moved_cells; dict<IdString, BelId> moved_cells;
std::vector<std::pair<CellInfo *, BelId>> dest_bels;
double delta = 0; double delta = 0;
int orig_share_cost = total_net_share; int orig_share_cost = total_net_share;
moveChange.reset(this); moveChange.reset(this);
@ -629,7 +628,11 @@ class SAPlacer
std::queue<std::pair<ClusterId, BelId>> displaced_clusters; std::queue<std::pair<ClusterId, BelId>> displaced_clusters;
displaced_clusters.emplace(cell->cluster, newBase); displaced_clusters.emplace(cell->cluster, newBase);
while (!displaced_clusters.empty()) { while (!displaced_clusters.empty()) {
std::vector<std::pair<CellInfo *, BelId>> dest_bels;
auto cursor = displaced_clusters.front(); auto cursor = displaced_clusters.front();
#if CHAIN_DEBUG
log_info("%d Cluster %s\n", __LINE__, cursor.first.c_str(ctx));
#endif
displaced_clusters.pop(); displaced_clusters.pop();
if (!ctx->getClusterPlacement(cursor.first, cursor.second, dest_bels)) if (!ctx->getClusterPlacement(cursor.first, cursor.second, dest_bels))
goto swap_fail; goto swap_fail;
@ -727,13 +730,23 @@ class SAPlacer
commit_cost_changes(moveChange); commit_cost_changes(moveChange);
return true; return true;
swap_fail: swap_fail:
#if CHAIN_DEBUG
log_info("Swap failed\n");
#endif
for (auto cell_pair : moved_cells) { for (auto cell_pair : moved_cells) {
CellInfo *cell = ctx->cells.at(cell_pair.first).get(); CellInfo *cell = ctx->cells.at(cell_pair.first).get();
if (cell->bel != BelId()) if (cell->bel != BelId()){
#if CHAIN_DEBUG
log_info("%d unbind %s\n", __LINE__, ctx->nameOfBel(cell->bel));
#endif
ctx->unbindBel(cell->bel); ctx->unbindBel(cell->bel);
} }
}
for (auto cell_pair : moved_cells) { for (auto cell_pair : moved_cells) {
CellInfo *cell = ctx->cells.at(cell_pair.first).get(); CellInfo *cell = ctx->cells.at(cell_pair.first).get();
#if CHAIN_DEBUG
log_info("%d bind %s %s\n", __LINE__, ctx->nameOfBel(cell_pair.second), cell->name.c_str(ctx));
#endif
ctx->bindBel(cell_pair.second, cell, STRENGTH_WEAK); ctx->bindBel(cell_pair.second, cell, STRENGTH_WEAK);
} }
return false; return false;