OpenROAD update sta to latest from upstream 07/10

src/grt/src/fastroute/include/Graph2D.h

@@ -5,6 +5,7 @@
 
 #include <cstdint>
 #include <functional>
+#include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ -152,9 +153,13 @@ class Graph2D
   multi_array<Edge, 2> h_edges_;    // The way it is indexed is (X, Y)
   multi_array<Cap3D, 3> v_cap_3D_;  // The way it is indexed is (Layer, X, Y)
   multi_array<Cap3D, 3> h_cap_3D_;  // The way it is indexed is (Layer, X, Y)
-  multi_array<std::set<FrNet*>, 2>
+  // Maps each NDR net present on an edge to whether it contributed the
+  // inflated overflow cost when it was added. Removal must subtract exactly
+  // what the net added, regardless of how the edge's overflow state changed
+  // in between, otherwise the uint16_t usage/ndr_overflow underflows.
+  multi_array<std::map<FrNet*, bool>, 2>
       v_ndr_nets_;  // The way it is indexed is (X, Y)
-  multi_array<std::set<FrNet*>, 2>
+  multi_array<std::map<FrNet*, bool>, 2>
       h_ndr_nets_;  // The way it is indexed is (X, Y)
   std::vector<NDRCongestion> congested_ndrs_;
 

src/grt/src/fastroute/src/graph2d.cpp

@@ -673,10 +673,14 @@ double Graph2D::getCostNDRAware(FrNet* net,
     // half the edge cost a second time in the initial routing steps. But we
     // only need to count once to avoid problems when managing 3D capacity
     if (is_net_present) {
+      // Mirror exactly what this net added: if it contributed the inflated
+      // overflow cost when routed, remove the same amount now. Using the
+      // edge's current ndr_overflow state instead would remove a different
+      // amount than was added when other nets changed that state in between,
+      // underflowing the uint16_t usage/ndr_overflow (GRT-0228).
+      const bool net_added_overflow = ndr_nets.find(net)->second;
       ndr_nets.erase(net);
-      // If the edge already has an overflow caused by NDR net we need to remove
-      // the big edge cost value
-      if (edge.ndr_overflow > 0) {
+      if (net_added_overflow) {
         edge.ndr_overflow--;
         final_edge_cost = -OVERFLOW_COST_MULTIPLIER * edgeCost;
       } else {
@@ -693,13 +697,17 @@ double Graph2D::getCostNDRAware(FrNet* net,
       // If the edge already has an overflow caused by NDR net or it will have
       // an overflow due to lack of capacity in a single layer, we need to add
       // the big edge cost value
-      if (edge.ndr_overflow > 0 || !hasNDRCapacity(net, x, y, direction)) {
+      const bool net_added_overflow
+          = edge.ndr_overflow > 0 || !hasNDRCapacity(net, x, y, direction);
+      if (net_added_overflow) {
         edge.ndr_overflow++;
         final_edge_cost = OVERFLOW_COST_MULTIPLIER * edgeCost;
       } else {
         final_edge_cost = edgeCost;
       }
-      ndr_nets.insert(net);
+      // Remember whether this net added the inflated cost so the matching
+      // rip-up subtracts the same amount.
+      ndr_nets[net] = net_added_overflow;
       updateNDRCapLayer(x, y, net, direction, edge_cost);
     }
   }

src/grt/test/soft_ndr_reset_cap.ok

@@ -33,67 +33,12 @@ met5       Horizontal       3108          1406          54.76%
 ---------------------------------------------------------------
 
 [INFO GRT-0101] Running extra iterations to remove congestion.
-[INFO GRT-0102] Start extra iteration 1/50
-[INFO GRT-0102] Start extra iteration 2/50
-[INFO GRT-0102] Start extra iteration 3/50
-[INFO GRT-0102] Start extra iteration 4/50
-[INFO GRT-0102] Start extra iteration 5/50
-[INFO GRT-0102] Start extra iteration 6/50
-[INFO GRT-0102] Start extra iteration 7/50
-[INFO GRT-0102] Start extra iteration 8/50
-[INFO GRT-0102] Start extra iteration 9/50
-[INFO GRT-0102] Start extra iteration 10/50
 [WARNING GRT-0273] Disabled NDR (to reduce congestion) for net: clk
-[INFO GRT-0102] Start extra iteration 1/50
-[INFO GRT-0102] Start extra iteration 2/50
-[INFO GRT-0102] Start extra iteration 3/50
-[INFO GRT-0102] Start extra iteration 4/50
-[INFO GRT-0102] Start extra iteration 5/50
-[INFO GRT-0102] Start extra iteration 6/50
-[INFO GRT-0102] Start extra iteration 7/50
-[INFO GRT-0102] Start extra iteration 8/50
-[INFO GRT-0102] Start extra iteration 9/50
-[INFO GRT-0102] Start extra iteration 10/50
-[INFO GRT-0102] Start extra iteration 11/50
 [WARNING GRT-0273] Disabled NDR (to reduce congestion) for net: clknet_2_3__leaf_clk
-[INFO GRT-0102] Start extra iteration 1/50
-[INFO GRT-0102] Start extra iteration 2/50
-[INFO GRT-0102] Start extra iteration 3/50
-[INFO GRT-0102] Start extra iteration 4/50
-[INFO GRT-0102] Start extra iteration 5/50
-[INFO GRT-0102] Start extra iteration 6/50
-[INFO GRT-0102] Start extra iteration 7/50
-[INFO GRT-0102] Start extra iteration 8/50
-[INFO GRT-0102] Start extra iteration 9/50
-[INFO GRT-0102] Start extra iteration 10/50
-[INFO GRT-0102] Start extra iteration 11/50
 [WARNING GRT-0273] Disabled NDR (to reduce congestion) for net: clknet_2_2__leaf_clk
-[INFO GRT-0102] Start extra iteration 1/50
-[INFO GRT-0102] Start extra iteration 2/50
-[INFO GRT-0102] Start extra iteration 3/50
-[INFO GRT-0102] Start extra iteration 4/50
-[INFO GRT-0102] Start extra iteration 5/50
-[INFO GRT-0102] Start extra iteration 6/50
-[INFO GRT-0102] Start extra iteration 7/50
-[INFO GRT-0102] Start extra iteration 8/50
-[INFO GRT-0102] Start extra iteration 9/50
-[INFO GRT-0102] Start extra iteration 10/50
-[INFO GRT-0102] Start extra iteration 11/50
 [WARNING GRT-0273] Disabled NDR (to reduce congestion) for net: clknet_2_1__leaf_clk
-[INFO GRT-0102] Start extra iteration 1/50
-[INFO GRT-0102] Start extra iteration 2/50
-[INFO GRT-0102] Start extra iteration 3/50
-[INFO GRT-0102] Start extra iteration 4/50
-[INFO GRT-0102] Start extra iteration 5/50
-[INFO GRT-0102] Start extra iteration 6/50
-[INFO GRT-0102] Start extra iteration 7/50
-[INFO GRT-0102] Start extra iteration 8/50
-[INFO GRT-0102] Start extra iteration 9/50
-[INFO GRT-0102] Start extra iteration 10/50
-[INFO GRT-0102] Start extra iteration 11/50
 [WARNING GRT-0273] Disabled NDR (to reduce congestion) for net: clknet_2_0__leaf_clk
 [WARNING GRT-0273] Disabled NDR (to reduce congestion) for net: clknet_0_clk
-[INFO GRT-0102] Start extra iteration 1/50
 [INFO GRT-0197] Via related to pin nodes: 151
 [INFO GRT-0198] Via related Steiner nodes: 13
 [INFO GRT-0199] Via filling finished.

src/grt/test/soft_ndr_reset_cap.tcl

@@ -38,6 +38,14 @@ set_global_routing_layer_adjustment * 0.7
 
 set_routing_layers -signal met1-met5 -clock met3-met4
 
+# Suppress the per-iteration "GRT-0102 Start extra iteration" trace: its count
+# is order/compiler-sensitive (the same result can be reached in a different
+# number of iterations), so asserting it made the golden fail across builds.
+# Keep -verbose so the routing-resource, congestion, and final-result lines are
+# still checked; the goal this test verifies -- one-at-a-time NDR disables
+# bounded by the reset cap, then a single batch disabling the remaining NDR
+# nets -- is carried by the GRT-0273 warnings, which are always logged.
+suppress_message GRT 102
 global_route -verbose -allow_congestion
 
 set guide_file [make_result_file soft_ndr_reset_cap.guide]