From 48e06896a2f86af3ccf7a8b01bf23ac5a522ad8d Mon Sep 17 00:00:00 2001 From: David Shah Date: Fri, 3 Aug 2018 15:02:42 +0200 Subject: place_common: Fixing rel legaliser search bugs Signed-off-by: David Shah --- common/place_common.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/place_common.cc b/common/place_common.cc index 0b7a0352..d26a377e 100644 --- a/common/place_common.cc +++ b/common/place_common.cc @@ -251,7 +251,7 @@ class ConstraintLegaliseWorker zSearch = IncreasingDiameterSearch(loc.z + child->constr_z); } } - while (!(xSearch.done() && ySearch.done() && zSearch.done())) { + while (!xSearch.done()) { Loc cloc; cloc.x = xSearch.get(); cloc.y = ySearch.get(); @@ -267,7 +267,7 @@ class ConstraintLegaliseWorker } } - if (usedLocations.count(loc)) + if (usedLocations.count(cloc)) continue; if (valid_loc_for(child, cloc, solution, usedLocations)) return true; @@ -306,7 +306,7 @@ class ConstraintLegaliseWorker yRootSearch = IncreasingDiameterSearch(currentLoc.y, 0, ctx->getGridDimY() - 1); if (cell->constr_z == cell->UNCONSTR) zRootSearch = IncreasingDiameterSearch(currentLoc.z, 0, ctx->getTileDimZ(currentLoc.x, currentLoc.y)); - while (!(xRootSearch.done() && yRootSearch.done() && zRootSearch.done())) { + while (!xRootSearch.done()) { Loc rootLoc; rootLoc.x = xRootSearch.get(); rootLoc.y = yRootSearch.get(); -- cgit v1.2.3