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

Merge pull request #603 from litghost/fix_trival_bad_swap

Browse Source 
Prevent trival misplacements in placer1.
This commit is contained in:
gatecat 2021-02-26 20:06:02 +00:00 committed by GitHub
commit 6689bfe923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/placer1.cc
View File

@ -518,6 +518,13 @@ class SAPlacer
old_dist += get_constraints_distance(ctx, other_cell); old_dist += get_constraints_distance(ctx, other_cell);
double delta = 0; double delta = 0;
if (!ctx->isValidBelForCellType(cell->type, newBel)) {
return false;
}
if (other_cell != nullptr && !ctx->isValidBelForCellType(other_cell->type, oldBel)) {
return false;
}
int net_delta_score = 0; int net_delta_score = 0;
if (cfg.netShareWeight > 0) if (cfg.netShareWeight > 0)
net_delta_score += update_nets_by_tile(cell, ctx->getBelLocation(cell->bel), ctx->getBelLocation(newBel)); net_delta_score += update_nets_by_tile(cell, ctx->getBelLocation(cell->bel), ctx->getBelLocation(newBel));
@ -655,6 +662,11 @@ class SAPlacer
if (bound != nullptr && !cells.count(bound->name) && if (bound != nullptr && !cells.count(bound->name) &&
(bound->belStrength >= STRENGTH_STRONG || bound->isConstrained(false))) (bound->belStrength >= STRENGTH_STRONG || bound->isConstrained(false)))
return false; return false;
if (bound != nullptr)
if (!ctx->isValidBelForCellType(bound->type, cr.first->bel))
return false;
dest_bels.emplace_back(std::make_pair(cr.first, targetBel)); dest_bels.emplace_back(std::make_pair(cr.first, targetBel));
} }
#if 0 #if 0