Merge pull request #8224 from LucasYuki/gpl_routability_regions

gpl: support regions for routability mode

Author: maliberty

src/gpl/src/graphicsImpl.cpp

@@ -91,9 +91,10 @@ void GraphicsImpl::debugForNesterovPlace(
         region_names.reserve(nbVec_.size());
         for (size_t i = 0; i < nbVec_.size(); ++i) {
           std::string name;
-          if (nbVec_[i] && nbVec_[i]->getPb() && nbVec_[i]->getPb()->group()) {
+          if (nbVec_[i] && nbVec_[i]->getPb()
+              && nbVec_[i]->getPb()->getGroup()) {
             name = fmt::format(
-                "nb[{}] {}", i, nbVec_[i]->getPb()->group()->getName());
+                "nb[{}] {}", i, nbVec_[i]->getPb()->getGroup()->getName());
           } else {
             name = fmt::format("nb[{}]", i);
           }

src/gpl/src/nesterovBase.cpp

@@ -1698,7 +1698,7 @@ NesterovBase::NesterovBase(NesterovBaseVars nbVars,
   log_->info(GPL,
              33,
              "Initializing Nesterov region: {}",
-             pb_->group() ? pb_->group()->getName() : "Top-level");
+             pb_->getGroup() ? pb_->getGroup()->getName() : "Top-level");
 
   // Set a fixed seed
   srand(42);
@@ -2765,11 +2765,11 @@ void NesterovBase::updateNextIter(const int iter)
     prev_reported_overflow_unscaled_ = sum_overflow_unscaled_;
 
     std::string group_name;
-    if (pb_->group()) {
-      group_name = fmt::format(" ({})", pb_->group()->getName());
+    if (pb_->getGroup()) {
+      group_name = fmt::format(" ({})", pb_->getGroup()->getName());
     }
 
-    if ((iter == 0 || reprint_iter_header_) && !pb_->group()) {
+    if ((iter == 0 || reprint_iter_header_) && !pb_->getGroup()) {
       if (iter == 0) {
         log_->info(GPL, 31, "HPWL: Half-Perimeter Wirelength");
       }
@@ -2928,8 +2928,8 @@ bool NesterovBase::checkConvergence(int gpl_iter_count,
     return true;
   }
   if (sum_overflow_unscaled_ <= npVars_->targetOverflow) {
-    const bool has_group = pb_->group();
-    const std::string group_name = has_group ? pb_->group()->getName() : "";
+    const bool has_group = pb_->getGroup();
+    const std::string group_name = has_group ? pb_->getGroup()->getName() : "";
     const int final_iter = gpl_iter_count;
     dbBlock* block = pb_->db()->getChip()->getBlock();
 

src/gpl/src/nesterovBase.h

@@ -1131,6 +1131,8 @@ class NesterovBase
 
   std::shared_ptr<PlacerBase> getPb() const { return pb_; }
 
+  odb::dbGroup* getGroup() const { return pb_->getGroup(); }
+
  private:
   NesterovBaseVars nbVars_;
   std::shared_ptr<PlacerBase> pb_;

src/gpl/src/placerBase.h

@@ -388,7 +388,7 @@ class PlacerBase
   int64_t stdInstsArea() const { return stdInstsArea_; }
 
   odb::dbDatabase* db() const { return db_; }
-  odb::dbGroup* group() const { return group_; }
+  odb::dbGroup* getGroup() const { return group_; }
 
   void unlockAll();