Merge pull request #10903 from eder-matheus/pr1-cugr-net-lifecycle

Author: eder-matheus

src/grt/src/GlobalRouter.cpp

@@ -4805,6 +4805,12 @@ void GlobalRouter::removeNet(odb::dbNet* db_net)
 
   if (use_cugr_) {
     cugr_->removeNet(db_net);
+    auto it = db_net_map_.find(db_net);
+    if (it != db_net_map_.end()) {
+      delete it->second;
+      db_net_map_.erase(it);
+    }
+    routes_.erase(db_net);
   } else {
     auto it = db_net_map_.find(db_net);
     if (it == db_net_map_.end() || it->second == nullptr) {
@@ -6363,13 +6369,24 @@ std::vector<Net*> GlobalRouter::updateDirtyRoutes(bool save_guides)
 
   if (use_cugr_) {
     cugr_->setVerbose(false);
-    for (odb::dbNet* net : dirty_nets_) {
-      cugr_->updateNet(net);
+    std::vector<Net*> dirty_nets;
+    dirty_nets.reserve(dirty_nets_.size());
+    for (odb::dbNet* db_net : dirty_nets_) {
+      // Rebuild the GlobalRouter pin set from the netlist (as updateDirtyNets
+      // does for FastRoute); updatePinAccessPoints below fixes the positions.
+      Net* net = getNet(db_net);
+      updateNetPins(net);
+      net->setDirtyNet(false);
+      net->clearLastPinPositions();
+      cugr_->updateNet(db_net);
+      dirty_nets.push_back(net);
     }
     dirty_nets_.clear();
     cugr_->routeIncremental();
     routes_ = cugr_->getRoutes();
-    return {};
+    // Sync pin access points with CUGR's routing, as the full route does.
+    updatePinAccessPoints();
+    return dirty_nets;
   }
 
   std::vector<Net*> dirty_nets;

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

@@ -1223,7 +1223,13 @@ void CUGR::getITermsAccessPoints(
     odb::dbNet* net,
     odb::PtrMap<odb::dbITerm, odb::Point3D>& access_points)
 {
-  GRNet* gr_net = db_net_map_.at(net);
+  // Nets absent from the map (e.g. < 2 pins, skipped by updateNet) have no
+  // CUGR access points; leave the output empty.
+  auto it = db_net_map_.find(net);
+  if (it == db_net_map_.end()) {
+    return;
+  }
+  GRNet* gr_net = it->second;
   for (const auto& [iterm, ap] : gr_net->getITermAccessPoints()) {
     const int x = grid_graph_->getGridline(0, ap.point.x());
     const int y = grid_graph_->getGridline(1, ap.point.y());
@@ -1235,7 +1241,11 @@ void CUGR::getBTermsAccessPoints(
     odb::dbNet* net,
     odb::PtrMap<odb::dbBTerm, odb::Point3D>& access_points)
 {
-  GRNet* gr_net = db_net_map_.at(net);
+  auto it = db_net_map_.find(net);
+  if (it == db_net_map_.end()) {
+    return;
+  }
+  GRNet* gr_net = it->second;
   for (const auto& [bterm, ap] : gr_net->getBTermAccessPoints()) {
     const int x = grid_graph_->getGridline(0, ap.point.x());
     const int y = grid_graph_->getGridline(1, ap.point.y());