Merge pull request #8092 from eder-matheus/grt_fix

eder-matheus · web-flow · commit 795d8a4e4d23 · 2025-08-22T18:54:24.000-03:00
grt: fix pin connection layer
diff --git a/src/grt/include/grt/GlobalRouter.h b/src/grt/include/grt/GlobalRouter.h
@@ -103,6 +103,7 @@ using Guides = std::vector<std::pair<int, odb::Rect>>;
 using LayerId = int;
 using TileSet = std::set<std::pair<int, int>>;
 using RoutePointToPinsMap = std::map<RoutePt, RoutePointPins>;
+using PointPair = std::pair<odb::Point, odb::Point>;
 
 class GlobalRouter
 {
@@ -267,7 +268,7 @@ class GlobalRouter
 
   bool findPinAccessPointPositions(
       const Pin& pin,
-      std::vector<std::pair<odb::Point, odb::Point>>& ap_positions);
+      std::map<int, std::vector<PointPair>>& ap_positions);
   void getNetLayerRange(odb::dbNet* db_net, int& min_layer, int& max_layer);
   void getGridSize(int& x_grids, int& y_grids);
   int getGridTileSize();
@@ -336,14 +337,14 @@ class GlobalRouter
                                std::vector<int8_t>*& edge_costs_per_layer);
 
   // aux functions
-  std::vector<odb::Point> findOnGridPositions(const Pin& pin,
-                                              bool& has_access_points,
-                                              odb::Point& pos_on_grid,
-                                              bool ignore_db_access_points
-                                              = false);
+  std::vector<RoutePt> findOnGridPositions(const Pin& pin,
+                                           bool& has_access_points,
+                                           odb::Point& pos_on_grid,
+                                           bool ignore_db_access_points
+                                           = false);
   int getNetMaxRoutingLayer(const Net* net);
   void findPins(Net* net);
-  void computePinPositionOnGrid(std::vector<odb::Point>& pin_positions_on_grid,
+  void computePinPositionOnGrid(std::vector<RoutePt>& pin_positions_on_grid,
                                 Pin& pin,
                                 odb::Point& pos_on_grid,
                                 bool has_access_points);
diff --git a/src/grt/src/GlobalRouter.cpp b/src/grt/src/GlobalRouter.cpp
@@ -529,10 +529,10 @@ std::vector<int> GlobalRouter::routeLayerLengths(odb::dbNet* db_net)
       odb::Point grid_pt = pin.getOnGridPosition();
       odb::Point pt = pin.getPosition();
 
-      std::vector<std::pair<odb::Point, odb::Point>> ap_positions;
+      std::map<int, std::vector<PointPair>> ap_positions;
       bool has_access_points = findPinAccessPointPositions(pin, ap_positions);
       if (has_access_points) {
-        auto ap_position = ap_positions.front();
+        auto ap_position = ap_positions[0].front();
         pt = ap_position.first;
         grid_pt = ap_position.second;
       }
@@ -877,7 +877,7 @@ Rudy* GlobalRouter::getRudy()
 
 bool GlobalRouter::findPinAccessPointPositions(
     const Pin& pin,
-    std::vector<std::pair<odb::Point, odb::Point>>& ap_positions)
+    std::map<int, std::vector<PointPair>>& ap_positions)
 {
   std::vector<odb::dbAccessPoint*> access_points;
   // get APs from odb
@@ -907,31 +907,35 @@ bool GlobalRouter::findPinAccessPointPositions(
       xform.apply(ap_position);
     }
 
-    ap_positions.push_back(
+    const int ap_layer = ap->getLayer()->getRoutingLevel();
+    ap_positions[ap_layer].push_back(
         {ap_position, grid_->getPositionOnGrid(ap_position)});
   }
 
   return true;
 }
 
-std::vector<odb::Point> GlobalRouter::findOnGridPositions(
+std::vector<RoutePt> GlobalRouter::findOnGridPositions(
     const Pin& pin,
     bool& has_access_points,
     odb::Point& pos_on_grid,
     bool ignore_db_access_points)
 {
-  std::vector<std::pair<odb::Point, odb::Point>> ap_positions;
+  std::map<int, std::vector<PointPair>> ap_positions;
 
   // temporarily ignore odb access points when incremental changes
   // are made, in order to avoid getting invalid APs
   has_access_points = findPinAccessPointPositions(pin, ap_positions);
 
-  std::vector<odb::Point> positions_on_grid;
+  std::vector<RoutePt> positions_on_grid;
 
   if (has_access_points && !ignore_db_access_points) {
-    for (const auto& ap_position : ap_positions) {
-      pos_on_grid = ap_position.second;
-      positions_on_grid.push_back(pos_on_grid);
+    for (const auto& [layer, positions] : ap_positions) {
+      for (const PointPair& position : positions) {
+        pos_on_grid = position.second;
+        positions_on_grid.emplace_back(
+            pos_on_grid.getX(), pos_on_grid.getY(), layer);
+      }
     }
   } else {
     // if odb doesn't have any APs, run the grt version considering the
@@ -959,7 +963,8 @@ std::vector<odb::Point> GlobalRouter::findOnGridPositions(
               pin.getPositionNearInstEdge(pin_box, rect_middle));
         }
       }
-      positions_on_grid.push_back(pos_on_grid);
+      positions_on_grid.emplace_back(
+          pos_on_grid.getX(), pos_on_grid.getY(), conn_layer);
       has_access_points = false;
     }
   }
@@ -972,7 +977,7 @@ void GlobalRouter::findPins(Net* net)
   for (Pin& pin : net->getPins()) {
     bool has_access_points;
     odb::Point pos_on_grid;
-    std::vector<odb::Point> pin_positions_on_grid
+    std::vector<RoutePt> pin_positions_on_grid
         = findOnGridPositions(pin, has_access_points, pos_on_grid);
 
     computePinPositionOnGrid(
@@ -981,15 +986,17 @@ void GlobalRouter::findPins(Net* net)
 }
 
 void GlobalRouter::computePinPositionOnGrid(
-    std::vector<odb::Point>& pin_positions_on_grid,
+    std::vector<RoutePt>& pin_positions_on_grid,
     Pin& pin,
     odb::Point& pos_on_grid,
     const bool has_access_points)
 {
   int votes = -1;
 
-  odb::Point pin_position;
-  for (odb::Point pos : pin_positions_on_grid) {
+  RoutePt pin_position(pin.getPosition().getX(),
+                       pin.getPosition().getY(),
+                       pin.getConnectionLayer());
+  for (const RoutePt& pos : pin_positions_on_grid) {
     int equals = std::count(
         pin_positions_on_grid.begin(), pin_positions_on_grid.end(), pos);
     if (equals > votes) {
@@ -1005,16 +1012,18 @@ void GlobalRouter::computePinPositionOnGrid(
     const int conn_layer = pin.getConnectionLayer();
     odb::dbTechLayer* layer = routing_layers_[conn_layer];
     pos_on_grid = grid_->getPositionOnGrid(pos_on_grid);
-    if (!(pos_on_grid == pin_position)
+    if (!(pos_on_grid == odb::Point(pin_position.x(), pin_position.y()))
         && ((layer->getDirection() == odb::dbTechLayerDir::HORIZONTAL
              && pos_on_grid.y() != pin_position.y())
             || (layer->getDirection() == odb::dbTechLayerDir::VERTICAL
                 && pos_on_grid.x() != pin_position.x()))) {
-      pin_position = pos_on_grid;
+      pin_position = RoutePt(
+          pos_on_grid.getX(), pos_on_grid.getY(), pin_position.layer());
     }
   }
 
-  pin.setOnGridPosition(pin_position);
+  pin.setOnGridPosition(odb::Point(pin_position.x(), pin_position.y()));
+  pin.setConnectionLayer(pin_position.layer());
 }
 
 int GlobalRouter::getNetMaxRoutingLayer(const Net* net)
@@ -2221,7 +2230,7 @@ void GlobalRouter::ensurePinsPositions(odb::dbNet* db_net)
       if (pins_not_covered.find(pin.getName()) != std::string::npos) {
         bool has_aps;
         odb::Point pos_on_grid;
-        std::vector<odb::Point> pin_positions_on_grid
+        std::vector<RoutePt> pin_positions_on_grid
             = findOnGridPositions(pin, has_aps, pos_on_grid, true);
         computePinPositionOnGrid(
             pin_positions_on_grid, pin, pos_on_grid, has_aps);
diff --git a/src/grt/src/Pin.cpp b/src/grt/src/Pin.cpp
@@ -182,9 +182,4 @@ odb::Point Pin::getPositionNearInstEdge(const odb::Rect& pin_box,
   return pin_pos;
 }
 
-int Pin::getConnectionLayer() const
-{
-  return connection_layer_;
-}
-
 }  // namespace grt
diff --git a/src/grt/src/Pin.h b/src/grt/src/Pin.h
@@ -48,7 +48,8 @@ class Pin
   const odb::Point& getPosition() const { return position_; }
   const std::vector<int>& getLayers() const { return layers_; }
   int getNumLayers() const { return layers_.size(); }
-  int getConnectionLayer() const;
+  int getConnectionLayer() const { return connection_layer_; }
+  void setConnectionLayer(int layer) { connection_layer_ = layer; }
   PinEdge getEdge() const { return edge_; }
   const std::map<int, std::vector<odb::Rect>>& getBoxes() const
   {
diff --git a/test/jpeg_sky130hd.metrics b/test/jpeg_sky130hd.metrics
@@ -3,7 +3,7 @@
 	"IFP::instance_count": "45634",
 	"floorplan__design__io": 47,
 	"design__io__hpwl": 13000488,
-	"design__instance__displacement__total": 115695,
+	"design__instance__displacement__total": 115694,
 	"design__instance__displacement__mean": 1.573,
 	"design__instance__displacement__max": 11.669,
 	"route__wirelength__estimated": 1.48933e+06,
@@ -21,129 +21,92 @@
 	"RSZ::worst_slack_max": "-0.12962520312918588",
 	"RSZ::tns_max": "-0.3188001064481866",
 	"RSZ::hold_buffer_count": "38",
-	"design__instance__displacement__total": 2183.09,
+	"design__instance__displacement__total": 2168.43,
 	"design__instance__displacement__mean": 0.029,
-	"design__instance__displacement__max": 17.642,
+	"design__instance__displacement__max": 15.382,
 	"route__wirelength__estimated": 1.5989e+06,
 	"DPL::utilization": "21.1",
 	"DPL::design_area": "460883",
 	"route__net": 57397,
 	"route__net__special": 2,
-	"global_route__vias": 349639,
-	"global_route__wirelength": 2644452,
-	"grt__global_route__vias": 5303,
-	"grt__global_route__vias": 176,
-	"grt__antenna_diodes_count": 172,
+	"global_route__vias": 369867,
+	"global_route__wirelength": 2640933,
+	"grt__global_route__vias": 5209,
+	"grt__global_route__vias": 155,
+	"grt__antenna_diodes_count": 180,
 	"grt__antenna__violating__nets": 0,
 	"grt__antenna__violating__pins": 0,
 	"GRT::ANT::errors": "0",
 	"route__net": 57397,
 	"route__net__special": 2,
-	"route__drc_errors__iter:0": 6401,
-	"route__wirelength__iter:0": 1788734,
-	"route__drc_errors__iter:1": 855,
-	"route__wirelength__iter:1": 1780101,
-	"route__drc_errors__iter:2": 421,
-	"route__wirelength__iter:2": 1779380,
+	"route__drc_errors__iter:0": 6392,
+	"route__wirelength__iter:0": 1787880,
+	"route__drc_errors__iter:1": 913,
+	"route__wirelength__iter:1": 1779861,
+	"route__drc_errors__iter:2": 397,
+	"route__wirelength__iter:2": 1779373,
 	"route__drc_errors__iter:3": 2,
-	"route__wirelength__iter:3": 1779336,
+	"route__wirelength__iter:3": 1779338,
 	"route__drc_errors__iter:4": 0,
-	"route__wirelength__iter:4": 1779337,
+	"route__wirelength__iter:4": 1779342,
 	"route__drc_errors": 0,
-	"route__wirelength": 1779337,
-	"route__vias": 313917,
-	"route__vias__singlecut": 313917,
+	"route__wirelength": 1779342,
+	"route__vias": 313894,
+	"route__vias__singlecut": 313894,
 	"route__vias__multicut": 0,
 	"DRT::drv": "0",
-	"drt__repair_antennas__pre_repair__antenna__violating__nets": 70,
-	"drt__repair_antennas__pre_repair__antenna__violating__pins": 83,
-	"drt__repair_antennas__iter_0__global_route__vias": 2866,
-	"drt__repair_antennas__iter_0__antenna_diodes_count": 285,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:0": 918,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:0": 1779850,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:1": 278,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:1": 1779717,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:2": 250,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:2": 1779719,
-	"drt__repair_antennas__iter_0__route__drc_errors__iter:3": 0,
-	"drt__repair_antennas__iter_0__route__wirelength__iter:3": 1779758,
+	"drt__repair_antennas__pre_repair__antenna__violating__nets": 76,
+	"drt__repair_antennas__pre_repair__antenna__violating__pins": 85,
+	"drt__repair_antennas__iter_0__global_route__vias": 3592,
+	"drt__repair_antennas__iter_0__antenna_diodes_count": 294,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:0": 988,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:0": 1779453,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:1": 321,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:1": 1779317,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:2": 265,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:2": 1779320,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:3": 3,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:3": 1779330,
+	"drt__repair_antennas__iter_0__route__drc_errors__iter:4": 0,
+	"drt__repair_antennas__iter_0__route__wirelength__iter:4": 1779325,
 	"drt__repair_antennas__iter_0__route__drc_errors": 0,
-	"drt__repair_antennas__iter_0__route__wirelength": 1779758,
-	"drt__repair_antennas__iter_0__route__vias": 314080,
-	"drt__repair_antennas__iter_0__route__vias__singlecut": 314080,
+	"drt__repair_antennas__iter_0__route__wirelength": 1779325,
+	"drt__repair_antennas__iter_0__route__vias": 313976,
+	"drt__repair_antennas__iter_0__route__vias__singlecut": 313976,
 	"drt__repair_antennas__iter_0__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_0__antenna__violating__nets": 12,
-	"drt__repair_antennas__iter_0__antenna__violating__pins": 13,
-	"drt__repair_antennas__iter_1__global_route__vias": 769,
-	"drt__repair_antennas__iter_1__antenna_diodes_count": 313,
-	"drt__repair_antennas__iter_1__route__drc_errors__iter:0": 175,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:0": 1779908,
-	"drt__repair_antennas__iter_1__route__drc_errors__iter:1": 72,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:1": 1779875,
-	"drt__repair_antennas__iter_1__route__drc_errors__iter:2": 40,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:2": 1779864,
+	"drt__repair_antennas__iter_0__antenna__violating__nets": 19,
+	"drt__repair_antennas__iter_0__antenna__violating__pins": 21,
+	"drt__repair_antennas__iter_1__global_route__vias": 997,
+	"drt__repair_antennas__iter_1__antenna_diodes_count": 332,
+	"drt__repair_antennas__iter_1__route__drc_errors__iter:0": 192,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:0": 1779348,
+	"drt__repair_antennas__iter_1__route__drc_errors__iter:1": 42,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:1": 1779273,
+	"drt__repair_antennas__iter_1__route__drc_errors__iter:2": 14,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:2": 1779283,
 	"drt__repair_antennas__iter_1__route__drc_errors__iter:3": 0,
-	"drt__repair_antennas__iter_1__route__wirelength__iter:3": 1779864,
+	"drt__repair_antennas__iter_1__route__wirelength__iter:3": 1779276,
 	"drt__repair_antennas__iter_1__route__drc_errors": 0,
-	"drt__repair_antennas__iter_1__route__wirelength": 1779864,
-	"drt__repair_antennas__iter_1__route__vias": 314153,
-	"drt__repair_antennas__iter_1__route__vias__singlecut": 314153,
+	"drt__repair_antennas__iter_1__route__wirelength": 1779276,
+	"drt__repair_antennas__iter_1__route__vias": 314029,
+	"drt__repair_antennas__iter_1__route__vias__singlecut": 314029,
 	"drt__repair_antennas__iter_1__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_1__antenna__violating__nets": 2,
-	"drt__repair_antennas__iter_1__antenna__violating__pins": 2,
-	"drt__repair_antennas__iter_2__global_route__vias": 56,
-	"drt__repair_antennas__iter_2__antenna_diodes_count": 316,
-	"drt__repair_antennas__iter_2__route__drc_errors__iter:0": 13,
-	"drt__repair_antennas__iter_2__route__wirelength__iter:0": 1779884,
-	"drt__repair_antennas__iter_2__route__drc_errors__iter:1": 0,
-	"drt__repair_antennas__iter_2__route__wirelength__iter:1": 1779881,
-	"drt__repair_antennas__iter_2__route__drc_errors": 0,
-	"drt__repair_antennas__iter_2__route__wirelength": 1779881,
-	"drt__repair_antennas__iter_2__route__vias": 314157,
-	"drt__repair_antennas__iter_2__route__vias__singlecut": 314157,
-	"drt__repair_antennas__iter_2__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_2__antenna__violating__nets": 2,
-	"drt__repair_antennas__iter_2__antenna__violating__pins": 2,
-	"drt__repair_antennas__iter_3__global_route__vias": 62,
-	"drt__repair_antennas__iter_3__antenna_diodes_count": 318,
-	"drt__repair_antennas__iter_3__route__drc_errors__iter:0": 9,
-	"drt__repair_antennas__iter_3__route__wirelength__iter:0": 1779871,
-	"drt__repair_antennas__iter_3__route__drc_errors__iter:1": 0,
-	"drt__repair_antennas__iter_3__route__wirelength__iter:1": 1779868,
-	"drt__repair_antennas__iter_3__route__drc_errors": 0,
-	"drt__repair_antennas__iter_3__route__wirelength": 1779868,
-	"drt__repair_antennas__iter_3__route__vias": 314161,
-	"drt__repair_antennas__iter_3__route__vias__singlecut": 314161,
-	"drt__repair_antennas__iter_3__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_3__antenna__violating__nets": 1,
-	"drt__repair_antennas__iter_3__antenna__violating__pins": 1,
-	"drt__repair_antennas__iter_4__global_route__vias": 42,
-	"drt__repair_antennas__iter_4__antenna_diodes_count": 319,
-	"drt__repair_antennas__iter_4__route__drc_errors__iter:0": 5,
-	"drt__repair_antennas__iter_4__route__wirelength__iter:0": 1779884,
-	"drt__repair_antennas__iter_4__route__drc_errors__iter:1": 0,
-	"drt__repair_antennas__iter_4__route__wirelength__iter:1": 1779887,
-	"drt__repair_antennas__iter_4__route__drc_errors": 0,
-	"drt__repair_antennas__iter_4__route__wirelength": 1779887,
-	"drt__repair_antennas__iter_4__route__vias": 314164,
-	"drt__repair_antennas__iter_4__route__vias__singlecut": 314164,
-	"drt__repair_antennas__iter_4__route__vias__multicut": 0,
-	"drt__repair_antennas__iter_4__antenna__violating__nets": 1,
-	"drt__repair_antennas__iter_4__antenna__violating__pins": 1,
-	"drt__antenna__violating__nets": 1,
-	"drt__antenna__violating__pins": 1,
-	"DRT::ANT::errors": "1",
+	"drt__repair_antennas__iter_1__antenna__violating__nets": 0,
+	"drt__repair_antennas__iter_1__antenna__violating__pins": 0,
+	"drt__antenna__violating__nets": 0,
+	"drt__antenna__violating__pins": 0,
+	"DRT::ANT::errors": "0",
 	"design__violations": 0,
 	"timing__drv__floating__nets": 0,
 	"timing__drv__floating__pins": 0,
-	"DRT::worst_slack_min": "0.09995449195693355",
-	"DRT::worst_slack_max": "-0.2870423979752196",
-	"DRT::tns_max": "-9.286394138732806",
-	"DRT::clock_skew": "0.6894636168247199",
-	"DRT::max_slew_slack": "-1.2674772793225084",
+	"DRT::worst_slack_min": "0.0962816520429936",
+	"DRT::worst_slack_max": "-0.31572167995844214",
+	"DRT::tns_max": "-7.3133448034178",
+	"DRT::clock_skew": "0.6811709167300511",
+	"DRT::max_slew_slack": "-2.67742023180178",
 	"DRT::max_fanout_slack": "100.0",
-	"DRT::max_capacitance_slack": "-2.6939405927223747",
+	"DRT::max_capacitance_slack": "-4.333322601907189",
 	"DRT::clock_period": "8.000000",
-	"flow__warnings__count": 248,
+	"flow__warnings__count": 168,
 	"flow__errors__count": 0
 }
diff --git a/test/jpeg_sky130hd.metrics_limits b/test/jpeg_sky130hd.metrics_limits

Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,4 @@ odb::Point Pin::getPositionNearInstEdge(const odb::Rect& pin_box,`
`182`	`182`	`return pin_pos;`
`183`	`183`	`}`
`184`	`184`
`185`		`-int Pin::getConnectionLayer() const`
`186`		`-{`
`187`		`- return connection_layer_;`
`188`		`-}`
`189`		`-`
`190`	`185`	`} // namespace grt`