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

Moving missing empty check into initial placement loop.

Browse Source 
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2021-02-01 07:26:54 -08:00
parent 9089ee2d16
commit 1deab29b05
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/placer_heap.cc
View File

@ -523,20 +523,29 @@ class HeAPPlacer
bool placed = false; bool placed = false;
int attempt_count = 0; int attempt_count = 0;
while (!placed) { while (!placed) {
if (!available_bels.count(ci->type) || available_bels.at(ci->type).empty()) {
log_error("Unable to place cell '%s', no BELs remaining to implement cell type '%s'\n",
ci->name.c_str(ctx),
ci->type.c_str(ctx));
}
++attempt_count; ++attempt_count;
if (attempt_count > 25000) { if (attempt_count > 25000) {
log_error("Unable to find a placement location for cell '%s'\n", ci->name.c_str(ctx)); log_error("Unable to find a placement location for cell '%s'\n", ci->name.c_str(ctx));
} }
// Make sure this cell type is in the available BEL map at
// all.
if (!available_bels.count(ci->type)) {
log_error("Unable to place cell '%s', no BELs remaining to implement cell type '%s'\n",
ci->name.c_str(ctx),
ci->type.c_str(ctx));
}
// Find an unused BEL from bels_for_cell_type. // Find an unused BEL from bels_for_cell_type.
auto &bels_for_cell_type = available_bels.at(ci->type); auto &bels_for_cell_type = available_bels.at(ci->type);
BelId bel; BelId bel;
while(true) { while(true) {
if (bels_for_cell_type.empty()) {
log_error("Unable to place cell '%s', no BELs remaining to implement cell type '%s'\n",
ci->name.c_str(ctx),
ci->type.c_str(ctx));
}
BelId candidate_bel = bels_for_cell_type.back(); BelId candidate_bel = bels_for_cell_type.back();
bels_for_cell_type.pop_back(); bels_for_cell_type.pop_back();
if(bels_used.count(candidate_bel)) { if(bels_used.count(candidate_bel)) {