Merge pull request #5452 from eder-matheus/grt_revert

Revert "Merge pull request #5432 from eder-matheus/grt_offset"

src/ant/test/check_grt1.ok

@@ -353,58 +353,6 @@ Net: req_msg[28]
 
 
 
-Net: req_msg[2]
-  Pin:   _524_/B (sky130_fd_sc_hs__nand2_1)
-    Layer: mcon
-      Partial area ratio:    0.10
-      Required ratio:    3.00 (Gate area) 
-      Cumulative area ratio:    0.10
-      Required ratio:    0.00 (Cumulative area) 
-
-    Layer: met1
-      Partial area ratio:   80.39
-      Required ratio:    0.00 (Gate area) 
-      Cumulative area ratio:   80.39
-      Required ratio:    0.00 (Cumulative area) 
-      Partial area ratio:  401.28
-      Required ratio:  400.00 (Side area) (VIOLATED)
-      Cumulative area ratio:  401.28
-      Required ratio:    0.00 (Cumulative side area) 
-
-    Layer: via
-      Partial area ratio:    0.16
-      Required ratio:    6.00 (Gate area) 
-      Cumulative area ratio:    0.26
-      Required ratio:    0.00 (Cumulative area) 
-
-    Layer: met2
-      Partial area ratio:    4.41
-      Required ratio:    0.00 (Gate area) 
-      Cumulative area ratio:   84.80
-      Required ratio:    0.00 (Cumulative area) 
-      Partial area ratio:   21.39
-      Required ratio:  400.00 (Side area) 
-      Cumulative area ratio:  422.67
-      Required ratio:    0.00 (Cumulative side area) 
-
-    Layer: via2
-      Partial area ratio:    0.14
-      Required ratio:    6.00 (Gate area) 
-      Cumulative area ratio:    0.41
-      Required ratio:    0.00 (Cumulative area) 
-
-    Layer: met3
-      Partial area ratio:    0.39
-      Required ratio:    0.00 (Gate area) 
-      Cumulative area ratio:   85.19
-      Required ratio:    0.00 (Cumulative area) 
-      Partial area ratio:    3.78
-      Required ratio:  400.00 (Side area) 
-      Cumulative area ratio:  426.46
-      Required ratio:    0.00 (Cumulative side area) 
-
-
-
 Net: req_msg[31]
   Pin:   _664_/A1 (sky130_fd_sc_hs__a22oi_1)
     Layer: mcon
@@ -545,5 +493,5 @@ Net: resp_rdy
 
 
 
-[INFO ANT-0002] Found 11 net violations.
-[INFO ANT-0001] Found 11 pin violations.
+[INFO ANT-0002] Found 10 net violations.
+[INFO ANT-0001] Found 10 pin violations.

src/gpl/test/simple01-rd.ok

@@ -77,8 +77,8 @@
 [INFO GPL-0065] OverflowTileCnt2: 0
 [INFO GPL-0066] 0.5%RC: 1.0
 [INFO GPL-0067] 1.0%RC: 0.9866666674613953
-[INFO GPL-0068] 2.0%RC: 0.9122807069828636
-[INFO GPL-0069] 5.0%RC: 0.7670922127175839
+[INFO GPL-0068] 2.0%RC: 0.9263157938656054
+[INFO GPL-0069] 5.0%RC: 0.7713475316128833
 [INFO GPL-0070] 0.5rcK: 1.0
 [INFO GPL-0071] 1.0rcK: 1.0
 [INFO GPL-0072] 2.0rcK: 0.0

src/gpl/test/simple02-rd.ok

@@ -77,8 +77,8 @@
 [INFO GPL-0065] OverflowTileCnt2: 0
 [INFO GPL-0066] 0.5%RC: 1.0
 [INFO GPL-0067] 1.0%RC: 0.9866666674613953
-[INFO GPL-0068] 2.0%RC: 0.9122807069828636
-[INFO GPL-0069] 5.0%RC: 0.7670922127175839
+[INFO GPL-0068] 2.0%RC: 0.9263157938656054
+[INFO GPL-0069] 5.0%RC: 0.7713475316128833
 [INFO GPL-0070] 0.5rcK: 1.0
 [INFO GPL-0071] 1.0rcK: 1.0
 [INFO GPL-0072] 2.0rcK: 0.0

src/gpl/test/simple03-rd.ok

@@ -75,7 +75,7 @@
 [INFO GPL-0083] 0.5%RC: 0.48812615871429443
 [INFO GPL-0084] 1.0%RC: 0.4571320414543152
 [INFO GPL-0085] 2.0%RC: 0.4332096576690674
-[INFO GPL-0086] 5.0%RC: 0.39594786167144774
+[INFO GPL-0086] 5.0%RC: 0.3979834884405136
 [INFO GPL-0087] FinalRC: 0.4726291
 [INFO GPL-0077] FinalRC lower than targetRC(1.25), routability not needed.
 [NesterovSolve] Iter:  290 overflow: 0.267 HPWL: 4778698

src/gpl/test/simple04-rd.ok

@@ -75,7 +75,7 @@
 [INFO GPL-0083] 0.5%RC: 0.48812615871429443
 [INFO GPL-0084] 1.0%RC: 0.4571320414543152
 [INFO GPL-0085] 2.0%RC: 0.4332096576690674
-[INFO GPL-0086] 5.0%RC: 0.39594786167144774
+[INFO GPL-0086] 5.0%RC: 0.3979834884405136
 [INFO GPL-0087] FinalRC: 0.4726291
 [INFO GPL-0077] FinalRC lower than targetRC(0.67), routability not needed.
 [NesterovSolve] Iter:  290 overflow: 0.267 HPWL: 4778698

src/grt/include/grt/GlobalRouter.h

@@ -180,6 +180,7 @@ class GlobalRouter : public ant::GlobalRouteSource
   void setGridOrigin(int x, int y);
   void setAllowCongestion(bool allow_congestion);
   void setMacroExtension(int macro_extension);
+  void setPinOffset(int pin_offset);
 
   // flow functions
   void readGuides(const char* file_name);
@@ -266,6 +267,7 @@ class GlobalRouter : public ant::GlobalRouteSource
   bool findPinAccessPointPositions(
       const Pin& pin,
       std::vector<std::pair<odb::Point, odb::Point>>& ap_positions);
+  odb::Point findFakePinPosition(Pin& pin, odb::dbNet* db_net);
   void getNetLayerRange(odb::dbNet* db_net, int& min_layer, int& max_layer);
   void getGridSize(int& x_grids, int& y_grids);
   int getGridTileSize();
@@ -312,9 +314,9 @@ class GlobalRouter : public ant::GlobalRouteSource
   void computeRegionAdjustments(const odb::Rect& region,
                                 int layer,
                                 float reduction_percentage);
+  void computePinOffsetAdjustments();
   void applyObstructionAdjustment(const odb::Rect& obstruction,
                                   odb::dbTechLayer* tech_layer);
-  void addResourcesForPinAccess();
   int computeNetWirelength(odb::dbNet* db_net);
   void computeWirelength();
   std::vector<Pin*> getAllPorts();
@@ -352,6 +354,10 @@ class GlobalRouter : public ant::GlobalRouteSource
                        const std::map<RoutePt, int>& segs_at_point);
   void mergeSegments(const std::vector<Pin>& pins, GRoute& route);
   bool pinOverlapsWithSingleTrack(const Pin& pin, odb::Point& track_position);
+  void createFakePin(Pin pin,
+                     odb::Point& pin_position,
+                     odb::dbTechLayer* layer,
+                     Net* net);
   odb::Point getRectMiddle(const odb::Rect& rect);
   NetRouteMap findRouting(std::vector<Net*>& nets,
                           int min_routing_layer,
@@ -444,6 +450,7 @@ class GlobalRouter : public ant::GlobalRouteSource
   int min_routing_layer_;
   int max_routing_layer_;
   int layer_for_guide_dimension_;
+  int gcells_offset_;
   int overflow_iterations_;
   int congestion_report_iter_step_;
   bool allow_congestion_;