gpl: rename some functions for nesterovBase,

Signed-off-by: Augusto Berndt <[email protected]>

Author: gudeh

src/gpl/src/graphics.cpp

@@ -144,7 +144,7 @@ void Graphics::drawInitial(gui::Painter& painter)
 void Graphics::drawForce(gui::Painter& painter)
 {
   for (const auto& nb : nbVec_) {
-    const auto& bins = nb->getNins();
+    const auto& bins = nb->getBins();
     if (bins.empty()) {
       continue;
     }
@@ -270,7 +270,7 @@ void Graphics::drawNesterov(gui::Painter& painter)
     painter.setPen(gui::Painter::kTransparent);
 
     for (const auto& nb : nbVec_) {
-      for (auto& bin : nb->getNins()) {
+      for (auto& bin : nb->getBins()) {
         int density = bin.getDensity() * 50 + 20;
         gui::Painter::Color color;
         if (density > 255) {
@@ -510,7 +510,7 @@ bool Graphics::populateMap()
   double max_value = std::numeric_limits<double>::lowest();
 
   if (heatmap_type_ == OverflowMinMax) {
-    for (const Bin& bin : grid.getNins()) {
+    for (const Bin& bin : grid.getBins()) {
       int64_t binArea = bin.getBinArea();
       const float scaledBinArea
           = static_cast<float>(binArea * bin.getTargetDensity());
@@ -526,7 +526,7 @@ bool Graphics::populateMap()
     }
   }
 
-  for (const Bin& bin : grid.getNins()) {
+  for (const Bin& bin : grid.getBins()) {
     odb::Rect box(bin.lx(), bin.ly(), bin.ux(), bin.uy());
     double value = 0.0;
 
@@ -559,7 +559,7 @@ bool Graphics::populateMap()
 void Graphics::populateXYGrid()
 {
   BinGrid& grid = nbVec_[0]->getBinGrid();
-  std::vector<Bin>& bin = grid.getNins();
+  std::vector<Bin>& bin = grid.getBins();
   int x_grid = grid.binCntX();
   int y_grid = grid.binCntY();
 

src/gpl/src/nesterovBase.cpp

@@ -2015,12 +2015,12 @@ int64_t NesterovBase::getOverflowAreaUnscaled() const
   return bg_.getOverflowAreaUnscaled();
 }
 
-int NesterovBase::fillerDx() const
+int NesterovBase::getFillerDx() const
 {
   return fillerDx_;
 }
 
-int NesterovBase::fillerDy() const
+int NesterovBase::getFillerDy() const
 {
   return fillerDy_;
 }
@@ -2085,7 +2085,7 @@ float NesterovBase::initTargetDensity() const
   return nbVars_.targetDensity;
 }
 
-float NesterovBase::targetDensity() const
+float NesterovBase::getTargetDensity() const
 {
   return targetDensity_;
 }
@@ -2800,7 +2800,7 @@ void NesterovBase::nesterovAdjustPhi()
   }
 }
 
-void NesterovBase::snapshot()
+void NesterovBase::saveSnapshot()
 {
   if (isConverged_) {
     return;

src/gpl/src/nesterovBase.h

@@ -960,8 +960,8 @@ class NesterovBase
 
   // filler cells / area control
   // will be used in Routability-driven loop
-  int fillerDx() const;
-  int fillerDy() const;
+  int getFillerDx() const;
+  int getFillerDy() const;
   int getFillerCnt() const;
   int64_t getFillerCellArea() const;
   int64_t getWhiteSpaceArea() const;
@@ -997,7 +997,7 @@ class NesterovBase
   // would be changed dynamically in RD loop
   //
   float initTargetDensity() const;
-  float targetDensity() const;
+  float getTargetDensity() const;
 
   void setTargetDensity(float targetDensity);
 
@@ -1066,12 +1066,11 @@ class NesterovBase
 
   void updateNextIter(int iter);
   void setTrueReprintIterHeader() { reprint_iter_header_ = true; }
-  float getPhiCoef(float scaledDiffHpwl) const;
-
-  void snapshot();
+  float getPhiCoef(float scaledDiffHpwl) const; 
 
   bool checkConvergence();
   bool checkDivergence();
+  void saveSnapshot();
   bool revertToSnapshot();
 
   void updateDensityCenterCur();

src/gpl/src/nesterovPlace.cpp

@@ -511,7 +511,7 @@ void NesterovPlace::runTimingDriven(const int iter,
         log_->info(GPL,
                    110,
                    "Timing-driven: new target density: {}",
-                   nesterov->targetDensity());
+                   nesterov->getTargetDensity());
         nbc_->resetDeltaArea();
         nbc_->resetNewGcellsCount();
         nesterov->updateAreas();
@@ -557,7 +557,7 @@ bool NesterovPlace::isDiverged(float& diverge_snapshot_WlCoefX,
       diverge_snapshot_WlCoefX = wireLengthCoefX_;
       diverge_snapshot_WlCoefY = wireLengthCoefY_;
       for (auto& nb : nbVec_) {
-        nb->snapshot();
+        nb->saveSnapshot();
       }
       is_diverge_snapshot_saved = true;
     }
@@ -645,7 +645,7 @@ void NesterovPlace::routabilitySnapshot(
     is_routability_snapshot_saved = true;
 
     for (auto& nb : nbVec_) {
-      nb->snapshot();
+      nb->saveSnapshot();
     }
 
     log_->info(GPL, 38, "Routability snapshot saved at iter = {}", iter);

src/gpl/src/routeBase.cpp

@@ -550,7 +550,7 @@ std::pair<bool, bool> RouteBase::routability()
                curRc,
                minRc_);
     minRc_ = curRc;
-    minRcTargetDensity_ = nbVec_[0]->targetDensity();
+    minRcTargetDensity_ = nbVec_[0]->getTargetDensity();
     minRcViolatedCnt_ = 0;
     nbVec_[0]->clearRemovedFillers();
 
@@ -654,7 +654,7 @@ std::pair<bool, bool> RouteBase::routability()
              52,
              format_label_float,
              "Placement target density:",
-             nbVec_[0]->targetDensity());
+             nbVec_[0]->getTargetDensity());
 
   double prev_white_space_area = nbVec_[0]->getWhiteSpaceArea();
   double prev_movable_area = nbVec_[0]->getMovableArea();
@@ -671,16 +671,16 @@ std::pair<bool, bool> RouteBase::routability()
   // rc not improvement detection -- (not improved the RC values 3 times in a
   // row)
   //
-  if (nbVec_[0]->targetDensity() > rbVars_.maxDensity
+  if (nbVec_[0]->getTargetDensity() > rbVars_.maxDensity
       || minRcViolatedCnt_ >= 3) {
-    bool density_exceeded = nbVec_[0]->targetDensity() > rbVars_.maxDensity;
+    bool density_exceeded = nbVec_[0]->getTargetDensity() > rbVars_.maxDensity;
     bool congestion_not_improving = minRcViolatedCnt_ >= 3;
 
     if (density_exceeded) {
       log_->info(GPL,
                  53,
                  "Target density {:.4f} exceeds the maximum allowed {:.4f}.",
-                 nbVec_[0]->targetDensity(),
+                 nbVec_[0]->getTargetDensity(),
                  rbVars_.maxDensity);
     }
     if (congestion_not_improving) {
@@ -766,7 +766,7 @@ std::pair<bool, bool> RouteBase::routability()
              63,
              format_label_float,
              "New Target Density:",
-             nbVec_[0]->targetDensity());
+             nbVec_[0]->getTargetDensity());
 
   // update densitySizes for all gCell
   nbVec_[0]->updateDensitySize();