diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/archcheck.cc | 4 | ||||
| -rw-r--r-- | common/nextpnr.h | 6 | ||||
| -rw-r--r-- | common/place_common.cc | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/common/archcheck.cc b/common/archcheck.cc index 5059066d..3d9e4e76 100644 --- a/common/archcheck.cc +++ b/common/archcheck.cc @@ -75,7 +75,7 @@ void archcheck_locs(const Context *ctx) log_assert(0 <= loc.z); log_assert(loc.x < ctx->getGridDimX()); log_assert(loc.y < ctx->getGridDimY()); - log_assert(loc.z < ctx->getTileDimZ(loc.x, loc.y)); + log_assert(loc.z < ctx->getTileBelDimZ(loc.x, loc.y)); BelId bel2 = ctx->getBelByLocation(loc); dbg(" ... %s\n", ctx->getBelName(bel2).c_str(ctx)); @@ -88,7 +88,7 @@ void archcheck_locs(const Context *ctx) dbg("> %d %d\n", x, y); std::unordered_set<int> usedz; - for (int z = 0; z < ctx->getTileDimZ(x, y); z++) { + for (int z = 0; z < ctx->getTileBelDimZ(x, y); z++) { BelId bel = ctx->getBelByLocation(Loc(x, y, z)); if (bel == BelId()) continue; diff --git a/common/nextpnr.h b/common/nextpnr.h index 28c144ac..29a85a10 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -219,8 +219,14 @@ struct CellInfo; struct Region { IdString name; + + bool constr_bels = false; + bool constr_wires = false; + bool constr_pips = false; + std::unordered_set<BelId> bels; std::unordered_set<WireId> wires; + std::unordered_set<Loc> piplocs; }; enum PlaceStrength diff --git a/common/place_common.cc b/common/place_common.cc index f9867057..5cdb96ef 100644 --- a/common/place_common.cc +++ b/common/place_common.cc @@ -251,7 +251,7 @@ class ConstraintLegaliseWorker ySearch = IncreasingDiameterSearch(loc.y + child->constr_y); } if (child->constr_z == child->UNCONSTR) { - zSearch = IncreasingDiameterSearch(loc.z, 0, ctx->getTileDimZ(loc.x, loc.y)); + zSearch = IncreasingDiameterSearch(loc.z, 0, ctx->getTileBelDimZ(loc.x, loc.y)); } else { if (child->constr_abs_z) { zSearch = IncreasingDiameterSearch(child->constr_z); @@ -329,7 +329,7 @@ class ConstraintLegaliseWorker yRootSearch = IncreasingDiameterSearch(cell->constr_y); if (cell->constr_z == cell->UNCONSTR) - zRootSearch = IncreasingDiameterSearch(currentLoc.z, 0, ctx->getTileDimZ(currentLoc.x, currentLoc.y)); + zRootSearch = IncreasingDiameterSearch(currentLoc.z, 0, ctx->getTileBelDimZ(currentLoc.x, currentLoc.y)); else zRootSearch = IncreasingDiameterSearch(cell->constr_z); while (!xRootSearch.done()) { |