rsz: Fixed incorrect (dbNet*)staToDb() call to dbModNet*.

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

src/rsz/src/RepairDesign.cc

@@ -104,12 +104,19 @@ void RepairDesign::repairDesign(double max_wire_length,
 
 void RepairDesign::performEarlySizingRound(int& repaired_net_count)
 {
+  debugPrint(logger_, RSZ, "early_sizing", 1, "Performing early sizing round.");
   // keep track of user annotations so we don't remove them
   std::set<std::pair<Vertex*, int>> slew_user_annotated;
 
   // We need to override slews in order to get good required time estimates.
   for (int i = resizer_->level_drvr_vertices_.size() - 1; i >= 0; i--) {
     Vertex* drvr = resizer_->level_drvr_vertices_[i];
+    debugPrint(logger_,
+               RSZ,
+               "early_sizing",
+               2,
+               "Annotating slew for driver {}",
+               network_->pathName(drvr->pin()));
     for (auto rf : {RiseFall::rise(), RiseFall::fall()}) {
       if (!drvr->slewAnnotated(rf, min_) && !drvr->slewAnnotated(rf, max_)) {
         sta_->setAnnotatedSlew(drvr,
@@ -130,30 +137,58 @@ void RepairDesign::performEarlySizingRound(int& repaired_net_count)
   for (int i = resizer_->level_drvr_vertices_.size() - 1; i >= 0; i--) {
     Vertex* drvr = resizer_->level_drvr_vertices_[i];
     Pin* drvr_pin = drvr->pin();
+    debugPrint(logger_,
+               RSZ,
+               "early_sizing",
+               2,
+               "Processing driver {}",
+               network_->pathName(drvr_pin));
     // Always get the flat net for the top level port.
     Net* net = network_->isTopLevelPort(drvr_pin)
                    ? network_->net(network_->term(drvr_pin))
                    : db_network_->dbToSta(db_network_->flatNet(drvr_pin));
     if (!net) {
       continue;
     }
-    dbNet* net_db = db_network_->staToDb(net);
+
+    odb::dbNet* net_db = nullptr;
+    odb::dbModNet* mod_net_db = nullptr;
+    db_network_->staToDb(net, net_db, mod_net_db);
     search_->findRequireds(drvr->level() + 1);
 
-    if (net && !resizer_->dontTouch(net) && !net_db->isConnectedByAbutment()
+    bool not_abut_connection = net_db && !net_db->isConnectedByAbutment();
+    if (net && !resizer_->dontTouch(net) && not_abut_connection
         && !sta_->isClock(drvr_pin)
         // Exclude tie hi/low cells and supply nets.
         && !drvr->isConstant()) {
+      debugPrint(logger_,
+                 RSZ,
+                 "early_sizing",
+                 2,
+                 "  Net {} is eligible for repair.",
+                 network_->pathName(net));
       float fanout, max_fanout, fanout_slack;
       sta_->checkFanout(drvr_pin, max_, fanout, max_fanout, fanout_slack);
 
       bool repaired_net = false;
 
       if (performGainBuffering(net, drvr_pin, max_fanout)) {
+        debugPrint(logger_,
+                   RSZ,
+                   "early_sizing",
+                   2,
+                   "  Gain buffering applied to net {}.",
+                   network_->pathName(net));
         repaired_net = true;
       }
 
       if (resizer_->resizeToCapRatio(drvr_pin, false)) {
+        debugPrint(logger_,
+                   RSZ,
+                   "early_sizing",
+                   2,
+                   "  Resized driver {}.",
+                   network_->pathName(drvr_pin));
         repaired_net = true;
       }
 
@@ -172,6 +207,7 @@ void RepairDesign::performEarlySizingRound(int& repaired_net_count)
       }
     }
   }
+  debugPrint(logger_, RSZ, "early_sizing", 1, "Early sizing round finished.");
 
   resizer_->level_drvr_vertices_valid_ = false;
   resizer_->ensureLevelDrvrVertices();

src/rsz/src/Resizer.cc

@@ -2790,7 +2790,9 @@ void Resizer::setDontTouch(const Net* net, bool dont_touch)
 
 bool Resizer::dontTouch(const Net* net)
 {
-  dbNet* db_net = db_network_->staToDb(net);
+  odb::dbNet* db_net = nullptr;
+  odb::dbModNet* db_mod_net = nullptr;
+  db_network_->staToDb(net, db_net, db_mod_net);
   if (db_net == nullptr) {
     return false;
   }

src/rsz/test/gain_buffering1_hier.tcl

@@ -20,6 +20,7 @@ set_dont_use {sky130_fd_sc_hd__probe_*
 set_dont_touch _53_
 
 report_checks -fields {fanout}
+#set_debug_level RSZ early_sizing 2
 repair_design -pre_placement
 report_checks -fields {fanout}
 set verilog_file [make_result_file gain_buffering1_hier_out.v]