gpl: rename macros to large instances,

avoid conflicting definition of macros from eplace (instances with more than 6 rows hieght)

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

Author: gudeh

src/gpl/src/nesterovBase.cpp

@@ -1685,7 +1685,7 @@ NesterovBase::NesterovBase(NesterovBaseVars nbVars,
   srand(42);
   // area update from pb
   stdInstsArea_ = pb_->stdInstsArea();
-  macroInstsArea_ = pb_->macroInstsArea();
+  large_insts_area_ = pb_->largeInstsArea();
 
   int dbu_per_micron = pb_->db()->getChip()->getBlock()->getDbUnitsPerMicron();
 
@@ -1838,7 +1838,7 @@ void NesterovBase::initFillerGCells()
 
   float tmp_targetDensity
       = static_cast<float>(stdInstsArea_)
-            / static_cast<float>(whiteSpaceArea_ - macroInstsArea_)
+            / static_cast<float>(whiteSpaceArea_ - large_insts_area_)
         + 0.01;
   // targetDensity initialize
   if (nbVars_.useUniformTargetDensity) {
@@ -2163,7 +2163,7 @@ int64_t NesterovBase::getNesterovInstsArea() const
 {
   return stdInstsArea_
          + static_cast<int64_t>(
-             std::round(pb_->macroInstsArea() * targetDensity_));
+             std::round(pb_->largeInstsArea() * targetDensity_));
 }
 
 float NesterovBase::getSumPhi() const
@@ -2224,15 +2224,15 @@ void NesterovBase::updateAreas()
 {
   // bloating can change the following :
   // stdInstsArea and macroInstsArea
-  stdInstsArea_ = macroInstsArea_ = 0;
+  stdInstsArea_ = large_insts_area_ = 0;
   for (auto it = nb_gcells_.begin(); it < nb_gcells_.end(); ++it) {
     auto& gCell = *it;  // old-style loop for old OpenMP
     if (!gCell) {
       continue;
     }
     if (gCell->isLargeInstance()) {
-      macroInstsArea_ += static_cast<int64_t>(gCell->dx())
-                         * static_cast<int64_t>(gCell->dy());
+      large_insts_area_ += static_cast<int64_t>(gCell->dx())
+                           * static_cast<int64_t>(gCell->dy());
     } else if (gCell->isStdInstance()) {
       stdInstsArea_ += static_cast<int64_t>(gCell->dx())
                        * static_cast<int64_t>(gCell->dy());

src/gpl/src/nesterovBase.h

@@ -553,7 +553,6 @@ class Bin
   void setInstPlacedArea(int64_t area);
 
   void addNonPlaceAreaBiNormal(int64_t area);
-  // void addInstPlacedArea(int64_t area);
   void addFillerArea(int64_t area);
 
   void addNonPlaceArea(int64_t area);
@@ -645,11 +644,6 @@ inline void Bin::addNonPlaceAreaBiNormal(int64_t area)
   non_place_area_binormal_ += area;
 }
 
-// inline void Bin::addInstPlacedArea(int64_t area)
-// {
-//   instPlacedArea_ += area;
-// }
-
 inline void Bin::addNonPlaceArea(int64_t area)
 {
   non_place_area_ += area;
@@ -986,7 +980,7 @@ class NesterovBase
   // This is mainly used for NesterovLoop
   int64_t getNesterovInstsArea() const;
   int64_t getStdInstArea() const { return this->stdInstsArea_; }
-  int64_t getMacroInstArea() const { return this->macroInstsArea_; }
+  int64_t getLargeInstArea() const { return this->large_insts_area_; }
 
   // sum phi and target density
   // used in NesterovPlace
@@ -1144,7 +1138,7 @@ class NesterovBase
   int64_t initial_filler_area_ = 0;
 
   int64_t stdInstsArea_ = 0;
-  int64_t macroInstsArea_ = 0;
+  int64_t large_insts_area_ = 0;
 
   std::vector<GCell> fillerStor_;
   std::vector<GCellHandle> nb_gcells_;

src/gpl/src/placerBase.cpp

@@ -246,7 +246,6 @@ void Instance::setExtId(int extId)
   extId_ = extId;
 }
 
-// ePlace macro definition
 bool Instance::isPbLargeInstance() const
 {
   return is_large_instance_;
@@ -814,7 +813,7 @@ void PlacerBaseCommon::init()
     instStor_.push_back(temp_inst);
 
     if (temp_inst.dy() > siteSizeY_ * 6) {
-      macroInstsArea_ += temp_inst.area();
+      large_insts_area_ += temp_inst.area();
     }
   }
 
@@ -1056,10 +1055,9 @@ void PlacerBase::init()
       placeInsts_.push_back(inst);
       int64_t instArea = inst->area();
       placeInstsArea_ += instArea;
-      // macro cells should be
-      // macroInstsArea_
+      // ePlace macros are defined as taller than 6 rows
       if (inst->dy() > siteSizeY_ * 6) {
-        macroInstsArea_ += instArea;
+        large_insts_area_ += instArea;
       }
       // smaller or equal height cells should be
       // stdInstArea_
@@ -1358,7 +1356,7 @@ void PlacerBase::printInfo() const
              21,
              format_label_um2,
              "Large instances area:",
-             block->dbuAreaToMicrons(macroInstsArea_));
+             block->dbuAreaToMicrons(large_insts_area_));
 
   if (util >= 100.1) {
     log_->error(GPL, 301, "Utilization {:.3f} % exceeds 100%.", util);
@@ -1372,9 +1370,9 @@ void PlacerBase::unlockAll()
   }
 }
 
-int64_t PlacerBase::macroInstsArea() const
+int64_t PlacerBase::largeInstsArea() const
 {
-  return macroInstsArea_;
+  return large_insts_area_;
 }
 
 // https://stackoverflow.com/questions/33333363/built-in-mod-vs-custom-mod-function-improve-the-performance-of-modulus-op

src/gpl/src/placerBase.h

@@ -109,6 +109,7 @@ class Instance
   int ux_ = 0;
   int uy_ = 0;
   int extId_ = INT_MIN;
+  // ePlace macro definition (instances larger than 6 row height)
   bool is_large_instance_ = false;
   bool is_locked_ = false;
 };
@@ -311,7 +312,7 @@ class PlacerBaseCommon
   int64_t getHpwl() const;
   void printInfo() const;
 
-  int64_t getMacroInstsArea() const { return macroInstsArea_; }
+  int64_t getLargeInstsArea() const { return large_insts_area_; }
 
   odb::dbDatabase* db() const { return db_; }
 
@@ -343,7 +344,7 @@ class PlacerBaseCommon
   int siteSizeX_ = 0;
   int siteSizeY_ = 0;
 
-  int64_t macroInstsArea_ = 0;
+  int64_t large_insts_area_ = 0;
 
   void init();
   void reset();
@@ -386,7 +387,7 @@ class PlacerBase
 
   int64_t placeInstsArea() const { return placeInstsArea_; }
   int64_t nonPlaceInstsArea() const { return nonPlaceInstsArea_; }
-  int64_t macroInstsArea() const;
+  int64_t largeInstsArea() const;
   int64_t stdInstsArea() const { return stdInstsArea_; }
 
   odb::dbDatabase* db() const { return db_; }
@@ -417,10 +418,10 @@ class PlacerBase
   int64_t placeInstsArea_ = 0;
   int64_t nonPlaceInstsArea_ = 0;
 
-  // macroInstsArea_ + stdInstsArea_ = placeInstsArea_;
-  // macroInstsArea_ should be separated
+  // large_insts_area_ + stdInstsArea_ = placeInstsArea_;
+  // large_insts_area_ should be separated
   // because of target_density tuning
-  int64_t macroInstsArea_ = 0;
+  int64_t large_insts_area_ = 0;
   int64_t stdInstsArea_ = 0;
 
   std::shared_ptr<PlacerBaseCommon> pbCommon_;