Merge pull request #7254 from The-OpenROAD-Project-staging/grt-rc-correlate

Update grt, drt, rsz utilities to support RC correlation

Author: maliberty

src/drt/include/triton_route/TritonRoute.h

@@ -20,6 +20,7 @@ class dbDatabase;
 class dbInst;
 class dbBTerm;
 class dbNet;
+class dbWire;
 }  // namespace odb
 
 namespace utl {
@@ -163,6 +164,7 @@ class TritonRoute
                  const std::list<std::unique_ptr<frMarker>>& markers,
                  const std::string& marker_name,
                  odb::Rect drcBox = odb::Rect(0, 0, 0, 0)) const;
+  std::vector<int> routeLayerLengths(odb::dbWire* wire) const;
   void checkDRC(const char* filename,
                 int x1,
                 int y1,

src/drt/src/TritonRoute.cpp

@@ -1385,4 +1385,24 @@ void TritonRoute::reportDRC(const std::string& file_name,
   tool_category->writeTR(file_name);
 }
 
+std::vector<int> TritonRoute::routeLayerLengths(odb::dbWire* wire) const
+{
+  std::vector<int> lengths;
+  lengths.resize(db_->getTech()->getLayerCount());
+  odb::dbWireShapeItr shapes;
+  odb::dbShape s;
+
+  for (shapes.begin(wire); shapes.next(s);) {
+    if (!s.isVia()) {
+      lengths[s.getTechLayer()->getNumber()] += s.getLength();
+    } else {
+      if (s.getTechVia()) {
+        lengths[s.getTechVia()->getBottomLayer()->getNumber() + 1] += 1;
+      }
+    }
+  }
+
+  return lengths;
+}
+
 }  // namespace drt

src/drt/src/TritonRoute.i

@@ -13,6 +13,10 @@
 
 %include "../../Exception.i"
 
+%import <stl.i>
+%import <std_vector.i>
+%template(vector_int) std::vector<int>;
+
 %inline %{
 
 int detailed_route_num_drvs()
@@ -218,4 +222,12 @@ void check_drc_cmd(const char* drc_file, int x1, int y1, int x2, int y2, const c
   const int num_threads = ord::OpenRoad::openRoad()->getThreadCount();
   router->checkDRC(drc_file, x1, y1, x2, y2, marker_name, num_threads);
 }
+
+std::vector<int>
+route_layer_lengths(odb::dbWire* db_wire)
+{
+  auto* router = ord::OpenRoad::openRoad()->getTritonRoute();
+  return router->routeLayerLengths(db_wire);
+}
+
 %} // inline

src/grt/src/GlobalRouter.cpp

@@ -517,7 +517,7 @@ void GlobalRouter::estimateRC(sta::SpefWriter* spef_writer)
   for (auto& [db_net, route] : routes_) {
     if (!route.empty()) {
       Net* net = getNet(db_net);
-      builder.estimateParasitcs(db_net, net->getPins(), route, spef_writer);
+      builder.estimateParasitics(db_net, net->getPins(), route, spef_writer);
     }
   }
 }
@@ -533,7 +533,7 @@ void GlobalRouter::estimateRC(odb::dbNet* db_net)
   GRoute& route = iter->second;
   if (!route.empty()) {
     Net* net = getNet(db_net);
-    builder.estimateParasitcs(db_net, net->getPins(), route);
+    builder.estimateParasitics(db_net, net->getPins(), route);
   }
 }
 
@@ -4529,11 +4529,12 @@ void GlobalRouter::reportNetLayerWirelengths(odb::dbNet* db_net,
       via_count++;
     }
   }
+  out << " " << via_count;
   for (size_t i = 0; i < lengths.size(); i++) {
     int64_t length = lengths[i];
     odb::dbTechLayer* layer = db_->getTech()->findRoutingLayer(i);
     if (i > 0 && out.is_open()) {
-      out << " " << via_count << " " << block_->dbuToMicrons(length);
+      out << " " << block_->dbuToMicrons(length);
     }
     if (length > 0) {
       logger_->report("\tLayer {:5s}: {:5.2f}um",
@@ -4662,11 +4663,12 @@ void GlobalRouter::reportNetDetailedRouteWL(odb::dbWire* wire,
     }
   }
 
+  out << " " << via_count;
   for (size_t i = 1; i < lengths.size(); i++) {
     int64_t length = lengths[i];
     odb::dbTechLayer* layer = db_->getTech()->findRoutingLayer(i);
     if (i > 0 && out.is_open()) {
-      out << " " << via_count << " " << block_->dbuToMicrons(length);
+      out << " " << block_->dbuToMicrons(length);
     }
     if (length > 0) {
       logger_->report("\tLayer {:5s}: {:5.2f}um",

src/grt/src/MakeWireParasitics.cpp

@@ -51,10 +51,10 @@ MakeWireParasitics::MakeWireParasitics(utl::Logger* logger,
 {
 }
 
-void MakeWireParasitics::estimateParasitcs(odb::dbNet* net,
-                                           std::vector<Pin>& pins,
-                                           GRoute& route,
-                                           sta::SpefWriter* spef_writer)
+void MakeWireParasitics::estimateParasitics(odb::dbNet* net,
+                                            std::vector<Pin>& pins,
+                                            GRoute& route,
+                                            sta::SpefWriter* spef_writer)
 {
   debugPrint(logger_, GRT, "est_rc", 1, "net {}", net->getConstName());
   if (logger_->debugCheck(GRT, "est_rc", 2)) {
@@ -95,7 +95,7 @@ void MakeWireParasitics::estimateParasitcs(odb::dbNet* net,
   parasitics_->deleteParasiticNetworks(sta_net);
 }
 
-void MakeWireParasitics::estimateParasitcs(odb::dbNet* net, GRoute& route)
+void MakeWireParasitics::estimateParasitics(odb::dbNet* net, GRoute& route)
 {
   debugPrint(logger_, GRT, "est_rc", 1, "net {}", net->getConstName());
   if (logger_->debugCheck(GRT, "est_rc", 2)) {
@@ -493,19 +493,27 @@ float MakeWireParasitics::getNetSlack(odb::dbNet* net)
 std::vector<int> MakeWireParasitics::routeLayerLengths(odb::dbNet* db_net) const
 {
   NetRouteMap& routes = grouter_->getRoutes();
-  std::vector<int> layer_lengths(grouter_->getMaxRoutingLayer() + 1);
+
+  // dbu wirelength for wires, via count for vias
+  std::vector<int> layer_lengths(tech_->getLayerCount());
+
   if (!db_net->getSigType().isSupply()) {
     GRoute& route = routes[db_net];
     std::set<RoutePt> route_pts;
     for (GSegment& segment : route) {
       if (segment.isVia()) {
-        route_pts.insert(
-            RoutePt(segment.init_x, segment.init_y, segment.init_layer));
-        route_pts.insert(
-            RoutePt(segment.final_x, segment.final_y, segment.final_layer));
+        auto& s = segment;
+        // Mimic makeRouteParasitics
+        int min_layer = min(s.init_layer, s.final_layer);
+        odb::dbTechLayer* cut_layer
+            = tech_->findRoutingLayer(min_layer)->getUpperLayer();
+        layer_lengths[cut_layer->getNumber()] += 1;
+        route_pts.insert(RoutePt(s.init_x, s.init_y, s.init_layer));
+        route_pts.insert(RoutePt(s.final_x, s.final_y, s.final_layer));
       } else {
         int layer = segment.init_layer;
-        layer_lengths[layer] += segment.length();
+        layer_lengths[tech_->findRoutingLayer(layer)->getNumber()]
+            += segment.length();
         route_pts.insert(RoutePt(segment.init_x, segment.init_y, layer));
         route_pts.insert(RoutePt(segment.final_x, segment.final_y, layer));
       }
@@ -532,7 +540,8 @@ std::vector<int> MakeWireParasitics::routeLayerLengths(odb::dbNet* db_net) const
         layer--;
       int wire_length_dbu
           = abs(pt.getX() - grid_pt.getX()) + abs(pt.getY() - grid_pt.getY());
-      layer_lengths[layer] += wire_length_dbu;
+      layer_lengths[tech_->findRoutingLayer(layer)->getNumber()]
+          += wire_length_dbu;
     }
   }
   return layer_lengths;

src/grt/src/MakeWireParasitics.h

@@ -48,11 +48,11 @@ class MakeWireParasitics : public AbstractMakeWireParasitics
                      odb::dbTech* tech,
                      odb::dbBlock* block,
                      GlobalRouter* grouter);
-  void estimateParasitcs(odb::dbNet* net,
-                         std::vector<Pin>& pins,
-                         GRoute& route,
-                         sta::SpefWriter* spef_writer = nullptr);
-  void estimateParasitcs(odb::dbNet* net, GRoute& route) override;
+  void estimateParasitics(odb::dbNet* net,
+                          std::vector<Pin>& pins,
+                          GRoute& route,
+                          sta::SpefWriter* spef_writer = nullptr);
+  void estimateParasitics(odb::dbNet* net, GRoute& route) override;
 
   void clearParasitics() override;
   // Return GRT layer lengths in dbu's for db_net's route indexed by routing

src/grt/src/fastroute/include/AbstractMakeWireParasitics.h

@@ -16,7 +16,7 @@ class AbstractMakeWireParasitics
  public:
   ~AbstractMakeWireParasitics() = default;
 
-  virtual void estimateParasitcs(odb::dbNet* net, GRoute& route) = 0;
+  virtual void estimateParasitics(odb::dbNet* net, GRoute& route) = 0;
 
   virtual void clearParasitics() = 0;
 

src/grt/src/fastroute/src/utility.cpp

@@ -1245,7 +1245,7 @@ float FastRouteCore::CalculatePartialSlack()
     odb::dbNet* db_net = net_route.first;
     GRoute& route = net_route.second;
     if (!route.empty()) {
-      parasitics_builder_->estimateParasitcs(db_net, route);
+      parasitics_builder_->estimateParasitics(db_net, route);
     }
   }
   for (const int& netID : net_ids_) {

src/grt/test/report_wire_length4.rptok

@@ -1,5 +1,5 @@
 tool net total_wl #pins #vias li1_wl met1_wl met2_wl met3_wl met4_wl met5_wl 
-grt: clk 201.6 2 2 0 2 0 2 0 2 144 2 57.6 2 0
-drt: clk 184.95 2 5 0 5 0.215 5 0.185 5 134.97 5 49.58 5 0
-grt: net60 14.4 2 2 0 2 0 2 14.4 2 0 2 0 2 0
-drt: net60 13.39 2 3 0 3 3.77 3 9.62 3 0 3 0 3 0
+grt: clk 201.6 2 2 0 0 0 144 57.6 0
+drt: clk 184.95 2 5 0 0.215 0.185 134.97 49.58 0
+grt: net60 14.4 2 2 0 0 14.4 0 0 0
+drt: net60 13.39 2 3 0 3.77 9.62 0 0 0

src/rsz/src/Resizer.i

@@ -7,6 +7,7 @@
 #include <fstream>
 
 #include "sta/Liberty.hh"
+#include "sta/Parasitics.hh"
 #include "sta/Network.hh"
 #include "sta/Corner.hh"
 #include "rsz/Resizer.hh"
@@ -122,6 +123,36 @@ using rsz::ParasiticsSrc;
 
 namespace rsz {
 
+void
+report_net_parasitic(Net *net)
+{
+  Resizer *resizer = getResizer();
+  Corner *corner = sta::Sta::sta()->cmdCorner();
+  const ParasiticAnalysisPt *ap = corner->findParasiticAnalysisPt(sta::MinMax::max());
+  auto parasitic = resizer->parasitics()->findParasiticNetwork(net, ap);
+  if (parasitic) {
+    resizer->parasitics()->report(parasitic);
+  }
+}
+
+float
+sum_parasitic_network_resist(Net *net)
+{
+  Resizer *resizer = getResizer();
+  Corner *corner = sta::Sta::sta()->cmdCorner();
+  const ParasiticAnalysisPt *ap = corner->findParasiticAnalysisPt(sta::MinMax::max());
+  auto parasitic = resizer->parasitics()->findParasiticNetwork(net, ap);
+  if (parasitic) {
+    float ret = 0.0;
+    for (auto resist : resizer->parasitics()->resistors(parasitic)) {
+      ret += resizer->parasitics()->value(resist);
+    }
+    return ret;
+  } else {
+    return 0.0f;
+  }
+}
+
 void
 set_layer_rc_cmd(odb::dbTechLayer *layer,
                  const Corner *corner,