Merge pull request #7399 from The-OpenROAD-Project-staging/rsz-repair-ideal-clk-slew

rsz: Use ideal clk slew in driver repair if applicable

Author: maliberty

src/rsz/src/RepairDesign.cc

@@ -50,6 +50,7 @@ using sta::Port;
 using sta::TimingArc;
 using sta::TimingArcSet;
 using sta::TimingRole;
+using sta::VertexInEdgeIterator;
 
 RepairDesign::RepairDesign(Resizer* resizer) : resizer_(resizer)
 {
@@ -728,6 +729,7 @@ bool RepairDesign::performGainBuffering(Net* net,
 
 void RepairDesign::checkDriverArcSlew(const Corner* corner,
                                       const Instance* inst,
+                                      const Edge* edge,
                                       const TimingArc* arc,
                                       float load_cap,
                                       float limit,
@@ -739,8 +741,11 @@ void RepairDesign::checkDriverArcSlew(const Corner* corner,
   Pin* in_pin = network_->findPin(inst, arc->from()->name());
 
   if (model && in_pin) {
-    Slew in_slew = sta_->graph()->slew(
-        graph_->pinLoadVertex(in_pin), in_rf, dcalc_ap->index());
+    Vertex* vertex = graph_->pinLoadVertex(in_pin);
+    // edgeFromSlew returns the graph slew value for the pin, or the ideal
+    // clock slew if applicable
+    Slew in_slew
+        = graph_delay_calc_->edgeFromSlew(vertex, in_rf, edge, dcalc_ap);
     const Pvt* pvt = dcalc_ap->operatingConditions();
 
     ArcDelay arc_delay;
@@ -784,17 +789,25 @@ bool RepairDesign::repairDriverSlew(const Corner* corner, const Pin* drvr_pin)
         if (limit_exists) {
           float limit_w_margin = maxSlewMargined(limit);
 
-          for (TimingArcSet* arc_set : size_cell->timingArcSets()) {
+          VertexInEdgeIterator edge_iter(graph_->pinDrvrVertex(drvr_pin),
+                                         graph_);
+          while (edge_iter.hasNext()) {
+            Edge* edge = edge_iter.next();
+            TimingArcSet* arc_set = edge->timingArcSet();
             const TimingRole* role = arc_set->role();
             if (!role->isTimingCheck() && role != TimingRole::tristateDisable()
                 && role != TimingRole::tristateEnable()
                 && role != TimingRole::clockTreePathMin()
                 && role != TimingRole::clockTreePathMax()) {
-              for (TimingArc* arc : arc_set->arcs()) {
-                if (arc->to() == port) {
-                  checkDriverArcSlew(
-                      corner, inst, arc, load_cap, limit_w_margin, violation);
-                }
+              TimingArcSet* size_arc_set = size_cell->findTimingArcSet(arc_set);
+              for (TimingArc* arc : size_arc_set->arcs()) {
+                checkDriverArcSlew(corner,
+                                   inst,
+                                   edge,
+                                   arc,
+                                   load_cap,
+                                   limit_w_margin,
+                                   violation);
               }
             }
           }

src/rsz/src/RepairDesign.hh

@@ -22,6 +22,7 @@ enum class ParasiticsSrc;
 using sta::Corner;
 using sta::dbNetwork;
 using sta::dbSta;
+using sta::Edge;
 using sta::LibertyCell;
 using sta::LibertyPort;
 using sta::MinMax;
@@ -92,6 +93,7 @@ class RepairDesign : dbStaState
 
   void checkDriverArcSlew(const Corner* corner,
                           const Instance* inst,
+                          const Edge* edge,
                           const TimingArc* arc,
                           float load_cap,
                           float limit,

test/ibex_sky130hd.metrics

@@ -3,133 +3,147 @@
 	"IFP::instance_count": "15696",
 	"floorplan__design__io": 264,
 	"design__io__hpwl": 69322388,
-	"design__instance__displacement__total": 35094.7,
-	"design__instance__displacement__mean": 1.529,
+	"design__instance__displacement__total": 35077.4,
+	"design__instance__displacement__mean": 1.528,
 	"design__instance__displacement__max": 13.07,
-	"route__wirelength__estimated": 707932,
-	"RSZ::repair_design_buffer_count": "484",
+	"route__wirelength__estimated": 707929,
+	"RSZ::repair_design_buffer_count": "480",
 	"RSZ::max_slew_slack": "30.107261037234757",
 	"RSZ::max_fanout_slack": "100.0",
 	"RSZ::max_capacitance_slack": "65.66070541260767",
 	"design__instance__displacement__total": 1367.27,
 	"design__instance__displacement__mean": 0.058,
 	"design__instance__displacement__max": 13.6,
-	"route__wirelength__estimated": 728751,
-	"design__instance__count__setup_buffer": 130,
+	"route__wirelength__estimated": 728748,
+	"design__instance__count__setup_buffer": 126,
 	"design__instance__count__hold_buffer": 0,
 	"RSZ::worst_slack_min": "0.3789708654155415",
-	"RSZ::worst_slack_max": "-0.9000906941214466",
-	"RSZ::tns_max": "-4.559287298970523",
+	"RSZ::worst_slack_max": "-0.900084476872333",
+	"RSZ::tns_max": "-4.559224238300941",
 	"RSZ::hold_buffer_count": "0",
-	"design__instance__displacement__total": 751.386,
-	"design__instance__displacement__mean": 0.032,
+	"design__instance__displacement__total": 744.217,
+	"design__instance__displacement__mean": 0.031,
 	"design__instance__displacement__max": 12.533,
-	"route__wirelength__estimated": 741523,
-	"DPL::utilization": "28.3",
-	"DPL::design_area": "171354",
-	"route__net": 15311,
+	"route__wirelength__estimated": 741521,
+	"DPL::utilization": "28.2",
+	"DPL::design_area": "171313",
+	"route__net": 15303,
 	"route__net__special": 2,
-	"global_route__vias": 142479,
-	"global_route__wirelength": 1304044,
-	"grt__global_route__vias": 8602,
-	"grt__global_route__vias": 774,
-	"grt__antenna_diodes_count": 196,
+	"global_route__vias": 142461,
+	"global_route__wirelength": 1304162,
+	"grt__global_route__vias": 8233,
+	"grt__global_route__vias": 1461,
+	"grt__global_route__vias": 211,
+	"grt__antenna_diodes_count": 216,
 	"grt__antenna__violating__nets": 0,
 	"grt__antenna__violating__pins": 0,
 	"GRT::ANT::errors": "0",
-	"route__net": 15311,
+	"route__net": 15303,
 	"route__net__special": 2,
-	"route__drc_errors__iter:0": 5697,
-	"route__wirelength__iter:0": 948936,
-	"route__drc_errors__iter:1": 1406,
-	"route__wirelength__iter:1": 944696,
-	"route__drc_errors__iter:2": 1333,
-	"route__wirelength__iter:2": 943538,
-	"route__drc_errors__iter:3": 227,
-	"route__wirelength__iter:3": 943582,
-	"route__drc_errors__iter:4": 86,
-	"route__wirelength__iter:4": 943499,
-	"route__drc_errors__iter:5": 29,
-	"route__wirelength__iter:5": 943490,
-	"route__drc_errors__iter:6": 4,
-	"route__wirelength__iter:6": 943501,
+	"route__drc_errors__iter:0": 5574,
+	"route__wirelength__iter:0": 949721,
+	"route__drc_errors__iter:1": 1348,
+	"route__wirelength__iter:1": 945245,
+	"route__drc_errors__iter:2": 1076,
+	"route__wirelength__iter:2": 944425,
+	"route__drc_errors__iter:3": 177,
+	"route__wirelength__iter:3": 944285,
+	"route__drc_errors__iter:4": 26,
+	"route__wirelength__iter:4": 944236,
+	"route__drc_errors__iter:5": 13,
+	"route__wirelength__iter:5": 944221,
+	"route__drc_errors__iter:6": 2,
+	"route__wirelength__iter:6": 944215,
 	"route__drc_errors__iter:7": 0,
-	"route__wirelength__iter:7": 943493,
+	"route__wirelength__iter:7": 944212,
 	"route__drc_errors": 0,
-	"route__wirelength": 943493,
+	"route__wirelength": 944212,
 	"route__vias": 131392,
 	"route__vias__singlecut": 131392,
 	"route__vias__multicut": 0,
 	"DRT::drv": "0",
-	"drt__repair_antennas__pre_repair__antenna__violating__nets": 47,
-	"drt__repair_antennas__pre_repair__antenna__violating__pins": 62,
-	"drt__repair_antennas__iter_0__global_route__vias": 1401,
-	"drt__repair_antennas__iter_0__antenna_diodes_count": 259,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:0": 922,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:0": 942103,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:1": 349,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:1": 942066,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:2": 266,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:2": 942024,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:3": 25,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:3": 942000,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:4": 4,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:4": 941999,
+	"drt__repair_antennas__pre_repair__antenna__violating__nets": 41,
+	"drt__repair_antennas__pre_repair__antenna__violating__pins": 50,
+	"drt__repair_antennas__iter_0__global_route__vias": 1328,
+	"drt__repair_antennas__iter_0__antenna_diodes_count": 267,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:0": 786,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:0": 943604,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:1": 264,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:1": 943487,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:2": 260,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:2": 943482,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:3": 20,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:3": 943466,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:4": 6,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:4": 943462,
 	"drt__repair_antennas__iter_0__route__drc_errors__iter:5": 0,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:5": 942002,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:5": 943462,
 	"drt__repair_antennas__iter_0__route__drc_errors": 0,
-	"drt__repair_antennas__iter_0__route__wirelength": 942002,
-	"drt__repair_antennas__iter_0__route__vias": 131554,
-	"drt__repair_antennas__iter_0__route__vias__singlecut": 131554,
+	"drt__repair_antennas__iter_0__route__wirelength": 943462,
+	"drt__repair_antennas__iter_0__route__vias": 131524,
+	"drt__repair_antennas__iter_0__route__vias__singlecut": 131524,
 	"drt__repair_antennas__iter_0__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_0__antenna__violating__nets": 3,
-	"drt__repair_antennas__iter_0__antenna__violating__pins": 4,
-	"drt__repair_antennas__iter_1__global_route__vias": 160,
-	"drt__repair_antennas__iter_1__antenna_diodes_count": 263,
-	"drt__repair_antennas__iter_1__route__drc_errors__iter:0": 32,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:0": 942019,
-	"drt__repair_antennas__iter_1__route__drc_errors__iter:1": 4,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:1": 942006,
-	"drt__repair_antennas__iter_1__route__drc_errors__iter:2": 2,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:2": 942012,
+	"drt__repair_antennas__iter_0__antenna__violating__nets": 6,
+	"drt__repair_antennas__iter_0__antenna__violating__pins": 9,
+	"drt__repair_antennas__iter_1__global_route__vias": 275,
+	"drt__repair_antennas__iter_1__antenna_diodes_count": 276,
+	"drt__repair_antennas__iter_1__route__drc_errors__iter:0": 154,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:0": 943409,
+	"drt__repair_antennas__iter_1__route__drc_errors__iter:1": 28,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:1": 943353,
+	"drt__repair_antennas__iter_1__route__drc_errors__iter:2": 14,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:2": 943347,
 	"drt__repair_antennas__iter_1__route__drc_errors__iter:3": 0,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:3": 942021,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:3": 943344,
 	"drt__repair_antennas__iter_1__route__drc_errors": 0,
-	"drt__repair_antennas__iter_1__route__wirelength": 942021,
-	"drt__repair_antennas__iter_1__route__vias": 131563,
-	"drt__repair_antennas__iter_1__route__vias__singlecut": 131563,
+	"drt__repair_antennas__iter_1__route__wirelength": 943344,
+	"drt__repair_antennas__iter_1__route__vias": 131583,
+	"drt__repair_antennas__iter_1__route__vias__singlecut": 131583,
 	"drt__repair_antennas__iter_1__route__vias__multicut": 0,
 	"drt__repair_antennas__iter_1__antenna__violating__nets": 1,
 	"drt__repair_antennas__iter_1__antenna__violating__pins": 2,
-	"drt__repair_antennas__iter_2__global_route__vias": 139,
-	"drt__repair_antennas__iter_2__antenna_diodes_count": 265,
-	"drt__repair_antennas__iter_2__route__drc_errors__iter:0": 9,
-	"drt__repair_antennas__iter_2__route__wirelength__iter:0": 942040,
-	"drt__repair_antennas__iter_2__route__drc_errors__iter:1": 1,
-	"drt__repair_antennas__iter_2__route__wirelength__iter:1": 942037,
+	"drt__repair_antennas__iter_2__global_route__vias": 151,
+	"drt__repair_antennas__iter_2__antenna_diodes_count": 278,
+	"drt__repair_antennas__iter_2__route__drc_errors__iter:0": 13,
+	"drt__repair_antennas__iter_2__route__wirelength__iter:0": 943390,
+	"drt__repair_antennas__iter_2__route__drc_errors__iter:1": 2,
+	"drt__repair_antennas__iter_2__route__wirelength__iter:1": 943390,
 	"drt__repair_antennas__iter_2__route__drc_errors__iter:2": 0,
-	"drt__repair_antennas__iter_2__route__wirelength__iter:2": 942040,
+	"drt__repair_antennas__iter_2__route__wirelength__iter:2": 943393,
 	"drt__repair_antennas__iter_2__route__drc_errors": 0,
-	"drt__repair_antennas__iter_2__route__wirelength": 942040,
-	"drt__repair_antennas__iter_2__route__vias": 131571,
-	"drt__repair_antennas__iter_2__route__vias__singlecut": 131571,
+	"drt__repair_antennas__iter_2__route__wirelength": 943393,
+	"drt__repair_antennas__iter_2__route__vias": 131598,
+	"drt__repair_antennas__iter_2__route__vias__singlecut": 131598,
 	"drt__repair_antennas__iter_2__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_2__antenna__violating__nets": 0,
-	"drt__repair_antennas__iter_2__antenna__violating__pins": 0,
+	"drt__repair_antennas__iter_2__antenna__violating__nets": 1,
+	"drt__repair_antennas__iter_2__antenna__violating__pins": 1,
+	"drt__repair_antennas__iter_3__global_route__vias": 130,
+	"drt__repair_antennas__iter_3__antenna_diodes_count": 279,
+	"drt__repair_antennas__iter_3__route__drc_errors__iter:0": 7,
+	"drt__repair_antennas__iter_3__route__wirelength__iter:0": 943373,
+	"drt__repair_antennas__iter_3__route__drc_errors__iter:1": 0,
+	"drt__repair_antennas__iter_3__route__wirelength__iter:1": 943368,
+	"drt__repair_antennas__iter_3__route__drc_errors": 0,
+	"drt__repair_antennas__iter_3__route__wirelength": 943368,
+	"drt__repair_antennas__iter_3__route__vias": 131592,
+	"drt__repair_antennas__iter_3__route__vias__singlecut": 131592,
+	"drt__repair_antennas__iter_3__route__vias__multicut": 0,
+	"drt__repair_antennas__iter_3__antenna__violating__nets": 0,
+	"drt__repair_antennas__iter_3__antenna__violating__pins": 0,
 	"drt__antenna__violating__nets": 0,
 	"drt__antenna__violating__pins": 0,
 	"DRT::ANT::errors": "0",
 	"design__violations": 0,
 	"timing__drv__floating__nets": 0,
 	"timing__drv__floating__pins": 0,
-	"DRT::worst_slack_min": "-0.1731081993414379",
-	"DRT::worst_slack_max": "-2.0968711804857425",
-	"DRT::tns_max": "-27.234595793875542",
-	"DRT::clock_skew": "3.112362455853368",
-	"DRT::max_slew_slack": "-4.379382488830554",
+	"DRT::worst_slack_min": "0.0432647263594376",
+	"DRT::worst_slack_max": "-1.8257600392752509",
+	"DRT::tns_max": "-20.79393605048584",
+	"DRT::clock_skew": "2.910018530733028",
+	"DRT::max_slew_slack": "-28.604712801827542",
 	"DRT::max_fanout_slack": "100.0",
-	"DRT::max_capacitance_slack": "-6.870626425463941",
+	"DRT::max_capacitance_slack": "-32.489018655616455",
 	"DRT::clock_period": "15.155000",
-	"flow__warnings__count": 888,
+	"flow__warnings__count": 379,
 	"flow__errors__count": 0
 }

test/ibex_sky130hd.metrics_limits

@@ -1,23 +1,23 @@
 {
   "IFP::instance_count" : "18835.2"
- ,"DPL::design_area" : "205624.8"
- ,"DPL::utilization" : "33.96"
- ,"RSZ::repair_design_buffer_count" : "580"
+ ,"DPL::design_area" : "205575.6"
+ ,"DPL::utilization" : "33.839999999999996"
+ ,"RSZ::repair_design_buffer_count" : "576"
  ,"RSZ::max_slew_slack" : "0"
  ,"RSZ::max_capacitance_slack" : "0"
  ,"RSZ::max_fanout_slack" : "0"
  ,"RSZ::worst_slack_min" : "-1.1365291345844586"
- ,"RSZ::worst_slack_max" : "-2.4155906941214464"
- ,"RSZ::tns_max" : "-2383.288087298971"
+ ,"RSZ::worst_slack_max" : "-2.415584476872333"
+ ,"RSZ::tns_max" : "-2383.288024238301"
  ,"RSZ::hold_buffer_count" : "0"
  ,"GRT::ANT::errors" : "0"
  ,"DRT::drv" : "0"
- ,"DRT::worst_slack_min" : "-1.688608199341438"
- ,"DRT::worst_slack_max" : "-3.6123711804857424"
- ,"DRT::tns_max" : "-2405.963395793876"
- ,"DRT::clock_skew" : "3.7348349470240416"
- ,"DRT::max_slew_slack" : "-5.255258986596665"
- ,"DRT::max_capacitance_slack" : "-8.244751710556729"
+ ,"DRT::worst_slack_min" : "-1.4722352736405624"
+ ,"DRT::worst_slack_max" : "-3.3412600392752507"
+ ,"DRT::tns_max" : "-2399.522736050486"
+ ,"DRT::clock_skew" : "3.4920222368796336"
+ ,"DRT::max_slew_slack" : "-34.32565536219305"
+ ,"DRT::max_capacitance_slack" : "-38.986822386739746"
  ,"DRT::max_fanout_slack" : "0"
  ,"DRT::clock_period" : "15.155"
  ,"DRT::ANT::errors" : "0"