diff options
| author | Serge Bazanski <serge@bazanski.pl> | 2018-07-17 16:03:48 +0100 |
|---|---|---|
| committer | Serge Bazanski <serge@bazanski.pl> | 2018-07-17 16:03:48 +0100 |
| commit | 498bef3f3e82ed214daf44ada83eb22a21159993 (patch) | |
| tree | b5d982452b972df13c20cabc0c2b2b73256a285d /ice40 | |
| parent | f3c6c76fff90d89dd65af2c02124c098dab63892 (diff) | |
| parent | 2eb783d626a9a17baf70d2f7750be3c11623d5bc (diff) | |
| download | nextpnr-498bef3f3e82ed214daf44ada83eb22a21159993.tar.gz nextpnr-498bef3f3e82ed214daf44ada83eb22a21159993.tar.bz2 nextpnr-498bef3f3e82ed214daf44ada83eb22a21159993.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into q3k/lock-2-electric-boogaloo
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/place_legaliser.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ice40/place_legaliser.cc b/ice40/place_legaliser.cc index 559358c7..5fffb4fb 100644 --- a/ice40/place_legaliser.cc +++ b/ice40/place_legaliser.cc @@ -246,7 +246,7 @@ class PlacementLegaliser std::tuple<int, int, int> find_closest_bel(float target_x, float target_y, CellChain &chain) { std::tuple<int, int, int> best_origin = std::make_tuple(-1, -1, -1); - wirelen_t best_wirelength = std::numeric_limits<wirelen_t>::max(); + wirelen_t best_metric = std::numeric_limits<wirelen_t>::max(); int width = ctx->chip_info->width, height = ctx->chip_info->height; // Slow, should radiate outwards from target position - TODO int chain_size = int(chain.cells.size()); @@ -260,11 +260,11 @@ class PlacementLegaliser valid = false; break; } else { - wirelen += get_cell_wirelength_at_bel(ctx, chain.cells.at(k), lb.first); + wirelen += get_cell_metric_at_bel(ctx, chain.cells.at(k), lb.first, MetricType::COST); } } - if (valid && wirelen < best_wirelength) { - best_wirelength = wirelen; + if (valid && wirelen < best_metric) { + best_metric = wirelen; best_origin = std::make_tuple(x, y, 0); } } |