diff options
| author | David Shah <dave@ds0.me> | 2019-01-30 17:31:33 +0000 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2019-03-22 10:31:54 +0000 |
| commit | 352f15e96b408dac40658ab058a7575d9daa85cb (patch) | |
| tree | 03f533a72849c66eb11b15710539eb5f7f5e2c0a | |
| parent | 70a6379bf65352a62053a70ccfaa6c73898103ed (diff) | |
| download | nextpnr-352f15e96b408dac40658ab058a7575d9daa85cb.tar.gz nextpnr-352f15e96b408dac40658ab058a7575d9daa85cb.tar.bz2 nextpnr-352f15e96b408dac40658ab058a7575d9daa85cb.zip | |
HeAP: Avoid getting stuck in legaliser ripup
Signed-off-by: David Shah <dave@ds0.me>
| -rw-r--r-- | common/placer_heap.cc | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/common/placer_heap.cc b/common/placer_heap.cc index dd948753..c9ec068d 100644 --- a/common/placer_heap.cc +++ b/common/placer_heap.cc @@ -720,7 +720,8 @@ class HeAPPlacer for (auto cell : solve_cells) { remaining.emplace(chain_size[cell->name], cell->name); } - + int ripup_radius = 2; + int total_iters = 0; while (!remaining.empty()) { auto top = remaining.top(); remaining.pop(); @@ -729,7 +730,7 @@ class HeAPPlacer // Was now placed, ignore if (ci->bel != BelId()) continue; - // log_info(" Legalising %s\n", top.second.c_str(ctx)); + // log_info(" Legalising %s (%s)\n", top.second.c_str(ctx), ci->type.c_str(ctx)); int bt = std::get<0>(bel_types.at(ci->type)); auto &fb = fast_bels.at(bt); int radius = 0; @@ -739,6 +740,12 @@ class HeAPPlacer BelId bestBel; int best_inp_len = std::numeric_limits<int>::max(); + total_iters++; + if (total_iters > int(solve_cells.size())) { + total_iters = 0; + ripup_radius = std::max(std::max(max_x, max_y), ripup_radius * 2); + } + while (!placed) { int nx = ctx->rng(2 * radius + 1) + std::max(cell_locs.at(ci->name).x - radius, 0); @@ -748,6 +755,22 @@ class HeAPPlacer iter_at_radius++; if (iter >= (10 * (radius + 1))) { radius = std::min(std::max(max_x, max_y), radius + 1); + while (radius < std::max(max_x, max_y)) { + for (int x = std::max(0, cell_locs.at(ci->name).x - radius); + x <= std::min(max_x, cell_locs.at(ci->name).x + radius); x++) { + if (x >= int(fb.size())) + break; + for (int y = std::max(0, cell_locs.at(ci->name).y - radius); + y <= std::min(max_y, cell_locs.at(ci->name).y + radius); y++) { + if (y >= int(fb.at(x).size())) + break; + if (fb.at(x).at(y).size() > 0) + goto notempty; + } + } + radius = std::min(std::max(max_x, max_y), radius + 1); + } + notempty: iter_at_radius = 0; iter = 0; } @@ -784,7 +807,7 @@ class HeAPPlacer if (ci->constr_children.empty() && !ci->constr_abs_z) { for (auto sz : fb.at(nx).at(ny)) { - if (ctx->checkBelAvail(sz) || radius > 2) { + if (ctx->checkBelAvail(sz) || radius > ripup_radius) { CellInfo *bound = ctx->getBoundBelCell(sz); if (bound != nullptr) { if (bound->constr_parent != nullptr || !bound->constr_children.empty() || |