gpl: move revert checks to original place

Signed-off-by: LucasYuki <[email protected]>

Author: LucasYuki

src/gpl/src/routeBase.cpp

@@ -251,8 +251,8 @@ RouteBase::RouteBase(RouteBaseVars rbVars,
   nbc_ = std::move(nbc);
   log_ = log;
   nbVec_ = std::move(nbVec);
-  minRcTargetDensity_.resize(nbVec_.size());
-  inflatedAreaDelta_.resize(nbVec_.size());
+  minRcTargetDensity_.resize(nbVec_.size(), 0);
+  inflatedAreaDelta_.resize(nbVec_.size(), 0);
   init();
 }
 
@@ -549,15 +549,6 @@ std::pair<bool, bool> RouteBase::routability(
     int routability_driven_revert_count)
 {
   increaseCounter();
-  if (routability_driven_revert_count >= max_routability_revert_) {
-    log_->info(GPL,
-               91,
-               "Routability mode reached the maximum allowed reverts {}",
-               routability_driven_revert_count);
-
-    revertToMinCongestion();
-    return std::make_pair(false, true);
-  }
 
   // create Tile Grid
   std::unique_ptr<TileGrid> tg(new TileGrid());
@@ -611,20 +602,6 @@ std::pair<bool, bool> RouteBase::routability(
                curRc,
                minRc_,
                min_RC_violated_cnt_);
-
-    // rc not improvement detection -- (not improved the RC values 3 times in a
-    // row)
-    if (min_RC_violated_cnt_ >= max_routability_no_improvement_) {
-      log_->info(GPL,
-                 54,
-                 "No improvement in routing congestion for {} consecutive "
-                 "iterations (limit is {}).",
-                 min_RC_violated_cnt_,
-                 max_routability_no_improvement_);
-
-      revertToMinCongestion();
-      return std::make_pair(false, true);
-    }
   }
 
   // set inflated ratio
@@ -759,6 +736,29 @@ std::pair<bool, bool> RouteBase::routability(
     }
   }
 
+  if (routability_driven_revert_count >= max_routability_revert_) {
+    log_->info(GPL,
+               91,
+               "Routability mode reached the maximum allowed reverts {}",
+               routability_driven_revert_count);
+
+    revertToMinCongestion();
+    return std::make_pair(false, true);
+  }
+  // rc not improvement detection -- (not improved the RC values 3 times in a
+  // row)
+  if (min_RC_violated_cnt_ >= max_routability_no_improvement_) {
+    log_->info(GPL,
+               54,
+               "No improvement in routing congestion for {} consecutive "
+               "iterations (limit is {}).",
+               min_RC_violated_cnt_,
+               max_routability_no_improvement_);
+
+    revertToMinCongestion();
+    return std::make_pair(false, true);
+  }
+
   // updateArea
   for (int i = 0; i < nbVec_.size(); i++) {
     nbVec_[i]->updateAreas();