Merge pull request #10743 from The-OpenROAD-Project-staging/grt-fix-resources-jumpers

GRT: fix resources update for back-to-back jumpers during repair antennas

Author: eder-matheus

src/grt/src/RepairAntennas.cpp

@@ -591,18 +591,12 @@ void RepairAntennas::addJumperAndVias(GRoute& route,
 {
   // Create vias (at the start and end of the jumper)
   for (int layer = layer_level; layer < layer_level + 2; layer++) {
-    route.push_back(GSegment(init_x, init_y, layer, init_x, init_y, layer + 1));
-    route.push_back(
-        GSegment(final_x, final_y, layer, final_x, final_y, layer + 1));
+    route.emplace_back(init_x, init_y, layer, init_x, init_y, layer + 1);
+    route.emplace_back(final_x, final_y, layer, final_x, final_y, layer + 1);
   }
   // Create segment in upper layer (jumper)
-  route.push_back(GSegment(init_x,
-                           init_y,
-                           layer_level + 2,
-                           final_x,
-                           final_y,
-                           layer_level + 2,
-                           true));
+  route.emplace_back(
+      init_x, init_y, layer_level + 2, final_x, final_y, layer_level + 2, true);
   // Reducing usage in the layer level
   grouter_->updateResources(
       init_x, init_y, final_x, final_y, layer_level, -1, db_net);

src/grt/src/fastroute/src/FastRoute.cpp

@@ -1407,17 +1407,59 @@ void FastRouteCore::updateRouteGridsLayer(int x1,
     TreeEdge* treeedge = &(treeedges[edgeID]);
     // Only process edges that have actual routing
     if (treeedge->len > 0 || treeedge->route.routelen > 0) {
-      int routeLen = treeedge->route.routelen;
-      std::vector<GPoint3D>& grids = treeedge->route.grids;
+      const int routeLen = treeedge->route.routelen;
+      const std::vector<GPoint3D>& grids = treeedge->route.grids;
+
+      std::vector<GPoint3D> new_grids;
+      new_grids.reserve(grids.size() + 4);
+      bool modified = false;
 
-      // If the point is within the specified rectangular region AND on the
-      // original layer
       for (int i = 0; i <= routeLen; i++) {
-        if (grids[i].x >= x1 && grids[i].x <= x2 && grids[i].y >= y1
-            && grids[i].y <= y2 && grids[i].layer == layer) {
-          // Update to the new layer
-          grids[i].layer = new_layer;
+        const bool in_region = grids[i].x >= x1 && grids[i].x <= x2
+                               && grids[i].y >= y1 && grids[i].y <= y2
+                               && grids[i].layer == layer;
+        if (!in_region) {
+          new_grids.push_back(grids[i]);
+          continue;
         }
+        modified = true;
+        // Check whether the previous/next grid point is outside the promoted
+        // region. When the first (or last) promoted point is adjacent to an
+        // unpromoted point we insert a via-transition copy on the old layer so
+        // that releaseNetResources sees a layer change (via) rather than a
+        // same-layer horizontal/vertical edge at the boundary. Without this,
+        // two back-to-back jumpers whose promoted endpoints are adjacent
+        // (e.g. right endpoint of jumper A at x=107 and left endpoint of
+        // jumper B at x=108) merge into a single same-layer chain and
+        // releaseNetResources under-decrements the edge that was never
+        // incremented.
+        const bool prev_outside = (i == 0) || grids[i - 1].x < x1
+                                  || grids[i - 1].x > x2 || grids[i - 1].y < y1
+                                  || grids[i - 1].y > y2
+                                  || grids[i - 1].layer != layer;
+        const bool next_outside = (i == routeLen) || grids[i + 1].x < x1
+                                  || grids[i + 1].x > x2 || grids[i + 1].y < y1
+                                  || grids[i + 1].y > y2
+                                  || grids[i + 1].layer != layer;
+
+        // Insert old-layer via point before the first promoted point
+        if (prev_outside && i > 0) {
+          new_grids.push_back(
+              {grids[i].x, grids[i].y, static_cast<int16_t>(layer)});
+        }
+        GPoint3D promoted = grids[i];
+        promoted.layer = new_layer;
+        new_grids.push_back(promoted);
+        // Insert old-layer via point after the last promoted point
+        if (next_outside && i < routeLen) {
+          new_grids.push_back(
+              {grids[i].x, grids[i].y, static_cast<int16_t>(layer)});
+        }
+      }
+
+      if (modified) {
+        treeedge->route.routelen = static_cast<int>(new_grids.size()) - 1;
+        treeedge->route.grids = std::move(new_grids);
       }
     }
   }

src/grt/test/BUILD

@@ -82,6 +82,7 @@ TESTS = [
     "repair_antennas2",
     "repair_antennas3",
     "repair_antennas4",
+    "repair_antennas_adjacent_jumpers",
     "repair_antennas_error1",
     "repair_antennas_error2",
     "repair_antennas_only_diodes",

src/grt/test/CMakeLists.txt

@@ -79,6 +79,7 @@ or_integration_tests(
     repair_antennas2
     repair_antennas3
     repair_antennas4
+    repair_antennas_adjacent_jumpers
     repair_antennas_allow_congestion
     repair_antennas_error1
     repair_antennas_error2