Merge pull request #6696 from The-OpenROAD-Project-staging/rsz-rpt-area-timing

rsz: add area growth column to repair_timing -verbose

Author: maliberty

src/rsz/src/RepairHold.cc

@@ -83,6 +83,7 @@ void RepairHold::init()
   logger_ = resizer_->logger_;
   dbStaState::init(resizer_->sta_);
   db_network_ = resizer_->db_network_;
+  initial_design_area_ = resizer_->computeDesignArea();
 }
 
 bool RepairHold::repairHold(
@@ -750,11 +751,11 @@ void RepairHold::printProgress(int iteration, bool force, bool end) const
 
   if (start) {
     logger_->report(
-        "Iteration | Resized | Buffers | Cloned Gates |   WNS   |   TNS   | "
-        "Endpoint");
+        "Iteration | Resized | Buffers | Cloned Gates |   Area   |   WNS   "
+        "|   TNS   | Endpoint");
     logger_->report(
         "----------------------------------------------------------------------"
-        "-----");
+        "----------------");
   }
 
   if (iteration % print_interval_ == 0 || force || end) {
@@ -768,12 +769,17 @@ void RepairHold::printProgress(int iteration, bool force, bool end) const
       itr_field = "final";
     }
 
+    const double design_area = resizer_->computeDesignArea();
+    const double area_growth = design_area - initial_design_area_;
+
     logger_->report(
-        "{: >9s} | {: >7d} | {: >7d} | {: >12d} | {: >7s} | {: >7s} | {}",
+        "{: >9s} | {: >7d} | {: >7d} | {: >12d} | {: >+7.1f}% | {: >7s} | {: "
+        ">7s} | {}",
         itr_field,
         resize_count_,
         inserted_buffer_count_,
         cloned_gate_count_,
+        area_growth / initial_design_area_ * 1e3,
         delayAsString(wns, sta_, 3),
         delayAsString(tns, sta_, 3),
         worst_vertex->name(network_));
@@ -782,7 +788,7 @@ void RepairHold::printProgress(int iteration, bool force, bool end) const
   if (end) {
     logger_->report(
         "----------------------------------------------------------------------"
-        "-----");
+        "----------------");
   }
 }
 

src/rsz/src/RepairHold.hh

@@ -133,6 +133,7 @@ class RepairHold : public sta::dbStaState
   int cloned_gate_count_ = 0;
   int swap_pin_count_ = 0;
   int removed_buffer_count_ = 0;
+  double initial_design_area_ = 0;
   const MinMax* min_ = MinMax::min();
   const MinMax* max_ = MinMax::max();
   const int min_index_ = MinMax::minIndex();

src/rsz/src/RepairSetup.cc

@@ -85,6 +85,7 @@ void RepairSetup::init()
   logger_ = resizer_->logger_;
   dbStaState::init(resizer_->sta_);
   db_network_ = resizer_->db_network_;
+  initial_design_area_ = resizer_->computeDesignArea();
 }
 
 bool RepairSetup::repairSetup(const float setup_slack_margin,
@@ -1809,13 +1810,13 @@ void RepairSetup::printProgress(const int iteration,
   if (start && !end) {
     logger_->report(
         "   Iter   | Removed | Resized | Inserted | Cloned |  Pin  |"
-        "    WNS   |   TNS      |  Viol  | Worst");
+        "   Area   |    WNS   |   TNS      |  Viol  | Worst");
     logger_->report(
         "          | Buffers |  Gates  | Buffers  |  Gates | Swaps |"
-        "          |            | Endpts | Endpt");
+        "          |          |            | Endpts | Endpt");
     logger_->report(
         "-----------------------------------------------------------"
-        "----------------------------------------");
+        "---------------------------------------------------");
   }
 
   if (iteration % print_interval_ == 0 || force || end) {
@@ -1830,15 +1831,19 @@ void RepairSetup::printProgress(const int iteration,
       itr_field = "final";
     }
 
+    const double design_area = resizer_->computeDesignArea();
+    const double area_growth = design_area - initial_design_area_;
+
     logger_->report(
-        "{: >9s} | {: >7d} | {: >7d} | {: >8d} | {: >6d} | {: >5d} | {: >8s} "
-        "| {: >10s} | {: >6d} | {}",
+        "{: >9s} | {: >7d} | {: >7d} | {: >8d} | {: >6d} | {: >5d} "
+        "| {: >+7.1f}% | {: >8s} | {: >10s} | {: >6d} | {}",
         itr_field,
         removed_buffer_count_,
         resize_count_,
         inserted_buffer_count_ + split_load_buffer_count_ + rebuffer_net_count_,
         cloned_gate_count_,
         swap_pin_count_,
+        area_growth / initial_design_area_ * 1e3,
         delayAsString(wns, sta_, 3),
         delayAsString(tns, sta_, 1),
         max(0, num_viols),
@@ -1848,7 +1853,7 @@ void RepairSetup::printProgress(const int iteration,
   if (end) {
     logger_->report(
         "-----------------------------------------------------------"
-        "----------------------------------------");
+        "---------------------------------------------------");
   }
 }
 

src/rsz/src/RepairSetup.hh

@@ -254,6 +254,7 @@ class RepairSetup : public sta::dbStaState
   int cloned_gate_count_ = 0;
   int swap_pin_count_ = 0;
   int removed_buffer_count_ = 0;
+  double initial_design_area_ = 0;
   // Map to block pins from being swapped more than twice for the
   // same instance.
   std::unordered_set<const sta::Instance*> swap_pin_inst_set_;

src/rsz/src/Resizer.i

@@ -521,9 +521,12 @@ repair_setup(double setup_margin,
              double repair_tns_end_percent,
              int max_passes,
              int max_repairs_per_pass,
-             bool match_cell_footprint, bool verbose,
-             bool skip_pin_swap, bool skip_gate_cloning,
-             bool skip_buffering, bool skip_buffer_removal,
+             bool match_cell_footprint,
+             bool verbose,
+             bool skip_pin_swap,
+             bool skip_gate_cloning,
+             bool skip_buffering,
+             bool skip_buffer_removal,
              bool skip_last_gasp)
 {
   ensureLinked();