Merge pull request The-OpenROAD-Project#7216 from AcKoucher/mpl-remove-shrink-and-restart

mpl: remove shrink & restart mechanism

Author: eder-matheus

src/mpl/src/SACoreHardMacro.h

@@ -49,7 +49,6 @@ class SACoreHardMacro : public SimulatedAnnealingCore<HardMacro>
  private:
   float calNormCost() const override;
   void calPenalty() override;
-  void shrink() override {}
 
   void perturb() override;
   void restore() override;

src/mpl/src/SACoreSoftMacro.cpp

@@ -800,13 +800,6 @@ void SACoreSoftMacro::resizeOneCluster()
   }
 }
 
-void SACoreSoftMacro::shrink()
-{
-  for (auto& macro_id : pos_seq_) {
-    macros_[macro_id].shrinkArea(shrink_factor_);
-  }
-}
-
 void SACoreSoftMacro::printResults() const
 {
   reportCoreWeights();

src/mpl/src/SACoreSoftMacro.h

@@ -78,8 +78,6 @@ class SACoreSoftMacro : public SimulatedAnnealingCore<SoftMacro>
   // actions used
   void resizeOneCluster();
 
-  void shrink() override;
-
   // A utility function for FillDeadSpace.
   // It's used for calculate the start point and end point for a segment in a
   // grid

src/mpl/src/SimulatedAnnealingCore.cpp

@@ -741,9 +741,6 @@ void SimulatedAnnealingCore<T>::fastSA()
   // as it is too expensive
   notch_weight_ = 0.0;
 
-  int num_restart = 1;
-  const int max_num_restart = 2;
-
   if (isValid()) {
     updateBestValidResult();
   }
@@ -777,20 +774,6 @@ void SimulatedAnnealingCore<T>::fastSA()
     cost_list_.push_back(pre_cost);
     T_list_.push_back(temperature);
 
-    if (best_valid_result_.macro_id_to_width.empty()
-        && (num_restart <= max_num_restart)
-        && (step == std::floor(max_num_step_ / max_num_restart)
-            && (outline_penalty_ > 0.0))) {
-      shrink();
-      packFloorplan();
-      calPenalty();
-      pre_cost = calNormCost();
-      num_restart++;
-      step = 1;
-      num_perturb_per_step_ *= 2;
-      temperature = init_temperature_;
-    }
-
     if (step == max_num_step_ - macros_.size() * 2) {
       notch_weight_ = original_notch_weight_;
       packFloorplan();

src/mpl/src/SimulatedAnnealingCore.h

@@ -124,8 +124,6 @@ class SimulatedAnnealingCore
   void exchangeMacros();
   void generateRandomIndices(int& index1, int& index2);
 
-  virtual void shrink() = 0;  // Shrink the size of macros
-
   // utilities
   static float calAverage(std::vector<float>& value_list);
 
@@ -159,10 +157,6 @@ class SimulatedAnnealingCore
   int max_num_step_ = 0;
   int num_perturb_per_step_ = 0;
 
-  // shrink_factor for dynamic weight
-  const float shrink_factor_ = 0.8;
-  const float shrink_freq_ = 0.1;
-
   // seed for reproduciabilty
   std::mt19937 generator_;
   std::uniform_real_distribution<float> distribution_;

src/mpl/src/object.cpp

@@ -1095,38 +1095,6 @@ void SoftMacro::setHeight(float height)
   }
 }
 
-void SoftMacro::shrinkArea(float percent)
-{
-  if (percent < 0.0) {
-    percent = 0.0;
-  }
-
-  if (percent > 1.0) {
-    percent = 1.0;
-  }
-
-  if (area_ == 0.0 || width_intervals_.size() != height_intervals_.size()
-      || width_intervals_.empty() || cluster_ == nullptr
-      || cluster_->getClusterType() != StdCellCluster
-      || cluster_->isIOCluster()) {
-    return;
-  }
-
-  for (Interval& width_interval : width_intervals_) {
-    width_interval.min *= percent;
-    width_interval.max *= percent;
-  }
-
-  for (Interval& height_interval : height_intervals_) {
-    height_interval.max *= percent;
-    height_interval.min *= percent;
-  }
-
-  width_ = width_ * percent;
-  height_ = height_ * percent;
-  area_ = width_ * height_;
-}
-
 void SoftMacro::setArea(float area)
 {
   if (area_ == 0.0 || width_intervals_.size() != height_intervals_.size()

src/mpl/src/object.h

@@ -486,10 +486,9 @@ class SoftMacro
   void setX(float x);
   void setY(float y);
   void setLocation(const std::pair<float, float>& location);
-  void setWidth(float width);      // only for StdCellCluster and MixedCluster
-  void setHeight(float height);    // only for StdCellCluster and MixedCluster
-  void shrinkArea(float percent);  // only for StdCellCluster
-  void setArea(float area);        // only for StdCellCluster and MixedCluster
+  void setWidth(float width);    // only for StdCellCluster and MixedCluster
+  void setHeight(float height);  // only for StdCellCluster and MixedCluster
+  void setArea(float area);      // only for StdCellCluster and MixedCluster
   void resizeRandomly(std::uniform_real_distribution<float>& distribution,
                       std::mt19937& generator);
   void setShapes(const TilingList& tilings, bool force = false);