Merge pull request #10683 from sparsh-karna/auto-odb-callback-cugr

grt, rsz: automatic ODB-callback wiring for CUGR and CI log fix

Author: eder-matheus

src/grt/include/grt/GlobalRouter.h

@@ -237,7 +237,6 @@ class GlobalRouter
   // Incremental global routing functions.
   // See class IncrementalGRoute.
   void addDirtyNet(odb::dbNet* net);
-  void updateCUGRNet(odb::dbNet* net);
   odb::PtrSet<odb::dbNet> getDirtyNets() { return dirty_nets_; }
   // check_antennas
   bool haveRoutes();
@@ -375,6 +374,9 @@ class GlobalRouter
                            bool horizontal);
   odb::Rect getGCellRect(int x, int y);
   void initNetlist(std::vector<Net*>& nets, bool incremental = false);
+  std::vector<Net*> initNets(bool check_pin_placement = true);
+  void initRoutingGrid(int min_routing_layer, int max_routing_layer);
+  std::vector<Net*> initCUGR(int min_routing_layer, int max_routing_layer);
   void makeFastrouteNet(Net* net);
   bool pinPositionsChanged(Net* net);
   bool newPinOnGrid(Net* net, std::multiset<RoutePt>& last_pos);

src/grt/src/GlobalRouter.cpp

@@ -173,6 +173,41 @@ GlobalRouter::~GlobalRouter()
   delete rudy_;
 }
 
+std::vector<Net*> GlobalRouter::initNets(bool check_pin_placement)
+{
+  std::vector<Net*> nets = findNets(true);
+  check_pin_placement_ = check_pin_placement;
+  if (check_pin_placement) {
+    checkPinPlacement();
+  }
+  initNetlist(nets);
+  return nets;
+}
+
+void GlobalRouter::initRoutingGrid(int min_routing_layer, int max_routing_layer)
+{
+  initRoutingLayers(min_routing_layer, max_routing_layer);
+  reportLayerSettings(min_routing_layer, max_routing_layer);
+  initRoutingTracks(max_routing_layer);
+  initCoreGrid(max_routing_layer);
+  computeObstructionsAdjustments();
+  computeUserGlobalAdjustments(min_routing_layer, max_routing_layer);
+}
+
+std::vector<Net*> GlobalRouter::initCUGR(int min_routing_layer,
+                                         int max_routing_layer)
+{
+  initRoutingGrid(min_routing_layer, max_routing_layer);
+  std::vector<Net*> nets = initNets(true);
+  initialized_ = true;
+  odb::PtrSet<odb::dbNet> clock_nets;
+  findClockNets(nets, clock_nets);
+
+  cugr_->setCongestionIterations(congestion_iterations_);
+  cugr_->init(min_routing_layer, max_routing_layer, clock_nets);
+  return nets;
+}
+
 std::vector<Net*> GlobalRouter::initFastRoute(int min_routing_layer,
                                               int max_routing_layer,
                                               bool check_pin_placement)
@@ -195,12 +230,7 @@ std::vector<Net*> GlobalRouter::initFastRoute(int min_routing_layer,
   // Init the data structures to monitor 3D capacity during 2D phases
   fastroute_->initEdgesCapacityPerLayer();
 
-  std::vector<Net*> nets = findNets(true);
-  check_pin_placement_ = check_pin_placement;
-  if (check_pin_placement) {
-    checkPinPlacement();
-  }
-  initNetlist(nets);
+  std::vector<Net*> nets = initNets(check_pin_placement);
 
   initialized_ = true;
   return nets;
@@ -366,7 +396,11 @@ void GlobalRouter::startIncremental()
   if (!initialized_ || haveDetailedRoutes()) {
     int min_layer, max_layer;
     getMinMaxLayer(min_layer, max_layer);
-    initFastRoute(min_layer, max_layer);
+    if (use_cugr_) {
+      initCUGR(min_layer, max_layer);
+    } else {
+      initFastRoute(min_layer, max_layer);
+    }
   }
   grouter_cbk_ = new GRouteDbCbk(this);
   grouter_cbk_->addOwner(block_);
@@ -409,12 +443,8 @@ void GlobalRouter::globalRoute(bool save_guides)
     int min_layer, max_layer;
     getMinMaxLayer(min_layer, max_layer);
 
-    std::vector<Net*> nets = initFastRoute(min_layer, max_layer);
     if (use_cugr_) {
-      odb::PtrSet<odb::dbNet> clock_nets;
-      findClockNets(nets, clock_nets);
-      cugr_->setCongestionIterations(congestion_iterations_);
-      cugr_->init(min_layer, max_layer, clock_nets);
+      std::vector<Net*> nets = initCUGR(min_layer, max_layer);
       if (verbose_) {
         reportResources();
       }
@@ -423,6 +453,7 @@ void GlobalRouter::globalRoute(bool save_guides)
       updatePinAccessPoints();
       addRemainingGuides(routes_, nets, min_layer, max_layer);
     } else {
+      std::vector<Net*> nets = initFastRoute(min_layer, max_layer);
       if (verbose_) {
         reportResources();
       }
@@ -2498,7 +2529,11 @@ void GlobalRouter::configFastRoute()
         GRT,
         300,
         "Timing is not available, setting critical nets percentage to 0.");
-    fastroute_->setCriticalNetsPercentage(0);
+    if (use_cugr_) {
+      cugr_->setCriticalNetsPercentage(0);
+    } else {
+      fastroute_->setCriticalNetsPercentage(0);
+    }
   }
 }
 
@@ -5389,6 +5424,13 @@ std::vector<odb::dbNet*> GlobalRouter::getNetsToRoute()
 
 void GlobalRouter::mergeNetsRouting(odb::dbNet* db_net1, odb::dbNet* db_net2)
 {
+  if (use_cugr_) {
+    // TODO: Fully support merging nets in CUGR.
+    // For now, we simply rip up and add the base net to the dirty list
+    // to be completely re-routed from scratch.
+    addDirtyNet(db_net1);
+    return;
+  }
   Net* net1 = db_net_map_[db_net1];
   Net* net2 = db_net_map_[db_net2];
   // Try to connect the routing of the two nets
@@ -6176,23 +6218,32 @@ AbstractGrouteRenderer* GlobalRouter::getRenderer()
 
 void GlobalRouter::addDirtyNet(odb::dbNet* net)
 {
-  db_net_map_[net]->setDirtyNet(true);
-  db_net_map_[net]->saveLastPinPositions();
-  dirty_nets_.insert(net);
-}
-
-void GlobalRouter::updateCUGRNet(odb::dbNet* net)
-{
-  if (use_cugr_) {
-    cugr_->updateNet(net);
+  auto it = db_net_map_.find(net);
+  if (it == db_net_map_.end()) {
+    return;
   }
+
+  it->second->setDirtyNet(true);
+  it->second->saveLastPinPositions();
+  dirty_nets_.insert(net);
 }
 
 std::vector<Net*> GlobalRouter::updateDirtyRoutes(bool save_guides)
 {
   if (auto* pa = service_registry_->find<drt::PinAccessService>()) {
     pa->updateDirtyPinAccess();
   }
+
+  if (use_cugr_) {
+    for (odb::dbNet* net : dirty_nets_) {
+      cugr_->updateNet(net);
+    }
+    dirty_nets_.clear();
+    cugr_->routeIncremental();
+    routes_ = cugr_->getRoutes();
+    return {};
+  }
+
   std::vector<Net*> dirty_nets;
 
   if (!initialized_) {

src/grt/src/GlobalRouter.i

@@ -176,19 +176,7 @@ set_infinite_cap(bool infinite_capacity)
   getGlobalRouter()->setInfiniteCapacity(infinite_capacity);
 }
 
-void
-add_dirty_net(odb::dbNet* net)
-{
-  if (net != nullptr) {
-    getGlobalRouter()->addDirtyNet(net);
-  }
-}
 
-void
-update_cugr_net(odb::dbNet* net)
-{
-  getGlobalRouter()->updateCUGRNet(net);
-}
 
 void start_incremental()
 {

src/grt/src/GlobalRouter.tcl

@@ -176,7 +176,15 @@ proc global_route { args } {
     utl::error GRT 52 "Missing dbBlock."
   }
 
-  grt::set_use_cugr [info exists flags(-use_cugr)]
+  # Only update the use_cugr flag when not in incremental start/end mode.
+  # During -start_incremental / -end_incremental, preserve the flag that was
+  # set during the initial global_route call.
+  set is_inc_start [info exists flags(-start_incremental)]
+  set is_inc_end [info exists flags(-end_incremental)]
+  set is_incremental_bracket [expr { $is_inc_start || $is_inc_end }]
+  if { !$is_incremental_bracket } {
+    grt::set_use_cugr [info exists flags(-use_cugr)]
+  }
 
   grt::set_verbose [info exists flags(-verbose)]
 

src/grt/src/cugr/src/CUGR.cpp

@@ -971,6 +971,9 @@ void CUGR::getBTermsAccessPoints(
 
 void CUGR::addDirtyNet(odb::dbNet* net)
 {
+  if (!design_) {
+    return;
+  }
   auto it = db_net_map_.find(net);
   if (it != db_net_map_.end()) {
     GRNet* gr_net = it->second;
@@ -987,6 +990,9 @@ void CUGR::addDirtyNet(odb::dbNet* net)
 
 void CUGR::updateNet(odb::dbNet* db_net)
 {
+  if (!design_) {
+    return;
+  }
   auto it = db_net_map_.find(db_net);
   if (it != db_net_map_.end()) {
     GRNet* gr_net = it->second;
@@ -1016,6 +1022,9 @@ void CUGR::updateNet(odb::dbNet* db_net)
 
 void CUGR::removeNet(odb::dbNet* db_net)
 {
+  if (!design_) {
+    return;
+  }
   auto it = db_net_map_.find(db_net);
   if (it == db_net_map_.end()) {
     design_->removeNet(db_net);
@@ -1293,8 +1302,6 @@ void CUGR::routeIncremental()
     }
     route();
   }
-
-  printStatistics();
 }
 
 }  // namespace grt

src/grt/test/BUILD

@@ -35,6 +35,7 @@ TESTS = [
     "gcd_flute",
     "increase_capacity1",
     "incremental_deleted_net",
+    "incremental_repair_cugr",
     "incremental_update_net",
     "infinite_cap",
     "inst_pin_out_of_die",

src/grt/test/CMakeLists.txt

@@ -32,6 +32,7 @@ or_integration_tests(
     gcd_flute
     increase_capacity1
     incremental_deleted_net
+    incremental_repair_cugr
     incremental_update_net
     infinite_cap
     inst_pin_out_of_die

src/grt/test/cugr_adjustment1.ok

@@ -3,7 +3,6 @@
 [INFO ODB-0130]     Created 54 pins.
 [INFO ODB-0131]     Created 676 components and 2850 component-terminals.
 [INFO ODB-0133]     Created 579 nets and 1498 connections.
-[WARNING GRT-0300] Timing is not available, setting critical nets percentage to 0.
 [INFO GRT-0020] Min routing layer: metal2
 [INFO GRT-0021] Max routing layer: metal10
 [INFO GRT-0022] Global adjustment: 50%

src/grt/test/cugr_adjustment2.ok

@@ -3,7 +3,6 @@
 [INFO ODB-0130]     Created 54 pins.
 [INFO ODB-0131]     Created 676 components and 2850 component-terminals.
 [INFO ODB-0133]     Created 579 nets and 1498 connections.
-[WARNING GRT-0300] Timing is not available, setting critical nets percentage to 0.
 [INFO GRT-0020] Min routing layer: metal2
 [INFO GRT-0021] Max routing layer: metal10
 [INFO GRT-0022] Global adjustment: 0%

src/grt/test/cugr_adjustment3.ok

@@ -3,7 +3,6 @@
 [INFO ODB-0130]     Created 54 pins.
 [INFO ODB-0131]     Created 676 components and 2850 component-terminals.
 [INFO ODB-0133]     Created 579 nets and 1498 connections.
-[WARNING GRT-0300] Timing is not available, setting critical nets percentage to 0.
 [INFO GRT-0020] Min routing layer: metal2
 [INFO GRT-0021] Max routing layer: metal10
 [INFO GRT-0022] Global adjustment: 0%