diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-11-09 12:57:14 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-11-09 12:57:14 +0100 |
| commit | 66dd17664c08aca17b53d2853558121aa9e702e4 (patch) | |
| tree | b6bc5dd919e5f525ec7328861b81f616673a1ea6 /common/place_common.cc | |
| parent | e91241f10d68fcaaf0a81fa77e9a91666120ccee (diff) | |
| parent | 15d9b3d3cc05656e58d01ba2f97ec92b6daaee1c (diff) | |
| download | nextpnr-66dd17664c08aca17b53d2853558121aa9e702e4.tar.gz nextpnr-66dd17664c08aca17b53d2853558121aa9e702e4.tar.bz2 nextpnr-66dd17664c08aca17b53d2853558121aa9e702e4.zip | |
Merge branch 'master' of github.com:YosysHQ/nextpnr into router_improve
Diffstat (limited to 'common/place_common.cc')
| -rw-r--r-- | common/place_common.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common/place_common.cc b/common/place_common.cc index 5cdb96ef..da8ab37d 100644 --- a/common/place_common.cc +++ b/common/place_common.cc @@ -237,6 +237,12 @@ class ConstraintLegaliseWorker return false; } } + // Don't place at tiles where any strongly bound Bels exist, as we might need to rip them up later + for (auto tilebel : ctx->getBelsByTile(loc.x, loc.y)) { + CellInfo *tcell = ctx->getBoundBelCell(tilebel); + if (tcell && tcell->belStrength >= STRENGTH_STRONG) + return false; + } usedLocations.insert(loc); for (auto child : cell->constr_children) { IncreasingDiameterSearch xSearch, ySearch, zSearch; @@ -329,7 +335,8 @@ class ConstraintLegaliseWorker yRootSearch = IncreasingDiameterSearch(cell->constr_y); if (cell->constr_z == cell->UNCONSTR) - zRootSearch = IncreasingDiameterSearch(currentLoc.z, 0, ctx->getTileBelDimZ(currentLoc.x, currentLoc.y)); + zRootSearch = + IncreasingDiameterSearch(currentLoc.z, 0, ctx->getTileBelDimZ(currentLoc.x, currentLoc.y)); else zRootSearch = IncreasingDiameterSearch(cell->constr_z); while (!xRootSearch.done()) { |