Merge pull request The-OpenROAD-Project#4954 from eder-matheus/grt_an…

…tenna_fix grt: avoid breaking the connectivity between wire and pin
Precision-Innovations · Apr 16, 2024 · b98aca8 · b98aca8
2 parents ebcc519 + 982f5ba
commit b98aca8
Show file tree

Hide file tree

Showing 19 changed files with 308 additions and 281 deletions.
diff --git a/src/ant/test/check_grt1.ok b/src/ant/test/check_grt1.ok
@@ -8,7 +8,7 @@
 Net: clk
   Pin: clkbuf_0_clk/A (sky130_fd_sc_hs__clkbuf_1)
     Layer: met2
-      Partial area ratio:  462.21
+      Partial area ratio:  451.78
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
@@ -61,12 +61,19 @@ Net: req_msg[31]
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
+Net: resp_msg[11]
+  Pin: _648_/A (sky130_fd_sc_hs__nand2_1)
+    Layer: met1
+      Partial area ratio:  572.13
+      Required ratio:  400.00 (Side area) (VIOLATED)
+
+
 Net: resp_rdy
   Pin: _343_/A2 (sky130_fd_sc_hs__a21oi_1)
     Layer: met3
       Partial area ratio:  516.42
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
-[INFO ANT-0002] Found 9 net violations.
-[INFO ANT-0001] Found 9 pin violations.
+[INFO ANT-0002] Found 10 net violations.
+[INFO ANT-0001] Found 10 pin violations.
diff --git a/src/grt/src/RepairAntennas.cpp b/src/grt/src/RepairAntennas.cpp
@@ -293,46 +293,47 @@ void RepairAntennas::addWireTerms(Net* net,
           wire_encoder.addPoint(pin_pt.x(), pin_pt.y());
         } else {
           odb::dbTech* tech = db_->getTech();
-          odb::dbTechLayer* layer1
+          odb::dbTechLayer* min_layer
               = tech->findRoutingLayer(grouter_->getMinRoutingLayer());
-          odb::dbTechLayer* layer2
-              = tech->findRoutingLayer(grouter_->getMinRoutingLayer() + 1);
 
-          if (connect_to_segment && tech_layer != layer2) {
-            // if wire to pin connects to a segment in a different layer, create
-            // a via to connect both wires
+          if (connect_to_segment && tech_layer != min_layer) {
+            // create vias to connect the guide segment to the min routing
+            // layer. the min routing layer will be used to connect to the pin.
             wire_encoder.newPath(tech_layer, odb::dbWireType::ROUTED);
             wire_encoder.addPoint(grid_pt.x(), grid_pt.y());
-            wire_encoder.addTechVia(
-                default_vias[grouter_->getMinRoutingLayer()]);
+            for (int l = min_layer->getRoutingLevel();
+                 l < tech_layer->getRoutingLevel();
+                 l++) {
+              wire_encoder.addTechVia(default_vias[l]);
+            }
           }
 
-          if (layer2->getDirection() == odb::dbTechLayerDir::VERTICAL) {
+          if (min_layer->getDirection() == odb::dbTechLayerDir::VERTICAL) {
             makeWire(wire_encoder,
-                     layer2,
+                     min_layer,
                      grid_pt,
                      odb::Point(grid_pt.x(), pin_pt.y()));
             wire_encoder.addTechVia(
                 default_vias[grouter_->getMinRoutingLayer()]);
             makeWire(wire_encoder,
-                     layer1,
+                     min_layer,
                      odb::Point(grid_pt.x(), pin_pt.y()),
                      pin_pt);
           } else {
             makeWire(wire_encoder,
-                     layer2,
+                     min_layer,
                      grid_pt,
                      odb::Point(pin_pt.x(), grid_pt.y()));
             wire_encoder.addTechVia(
                 default_vias[grouter_->getMinRoutingLayer()]);
             makeWire(wire_encoder,
-                     layer1,
+                     min_layer,
                      odb::Point(pin_pt.x(), grid_pt.y()),
                      pin_pt);
           }
 
           // create vias to reach the pin
-          for (int i = layer1->getRoutingLevel() - 1; i >= conn_layer; i--) {
+          for (int i = min_layer->getRoutingLevel() - 1; i >= conn_layer; i--) {
             wire_encoder.addTechVia(default_vias[i]);
           }
         }

diff --git a/src/grt/test/repair_antennas1.defok b/src/grt/test/repair_antennas1.defok
@@ -107,16 +107,17 @@ VIAS 3 ;
     - via2_960x490 + VIARULE M2M3_PR + CUTSIZE 200 200  + LAYERS met2 via2 met3  + CUTSPACING 200 200  + ENCLOSURE 40 145 180 65  + ROWCOL 1 2  ;
     - via3_960x490 + VIARULE M3M4_PR + CUTSIZE 200 200  + LAYERS met3 via3 met4  + CUTSPACING 200 200  + ENCLOSURE 180 60 180 145  + ROWCOL 1 2  ;
 END VIAS
-COMPONENTS 1369 ;
+COMPONENTS 1370 ;
     - ANTENNA_1 sky130_fd_sc_hs__diode_2 + PLACED ( 124800 149850 ) FS ;
+    - ANTENNA_10 sky130_fd_sc_hs__diode_2 + PLACED ( 207360 166500 ) N ;
     - ANTENNA_2 sky130_fd_sc_hs__diode_2 + PLACED ( 106560 49950 ) FS ;
     - ANTENNA_3 sky130_fd_sc_hs__diode_2 + PLACED ( 169440 263070 ) FS ;
     - ANTENNA_4 sky130_fd_sc_hs__diode_2 + PLACED ( 141600 246420 ) N ;
     - ANTENNA_5 sky130_fd_sc_hs__diode_2 + PLACED ( 142080 59940 ) N ;
     - ANTENNA_6 sky130_fd_sc_hs__diode_2 + PLACED ( 104640 203130 ) FS ;
     - ANTENNA_7 sky130_fd_sc_hs__diode_2 + PLACED ( 143520 206460 ) N ;
     - ANTENNA_8 sky130_fd_sc_hs__diode_2 + PLACED ( 196800 216450 ) FS ;
-    - ANTENNA_9 sky130_fd_sc_hs__diode_2 + PLACED ( 207360 166500 ) N ;
+    - ANTENNA_9 sky130_fd_sc_hs__diode_2 + PLACED ( 71040 149850 ) FS ;
     - PHY_0 sky130_fd_sc_hs__decap_4 + FIXED ( 9600 9990 ) FS ;
     - PHY_1 sky130_fd_sc_hs__decap_4 + FIXED ( 288000 9990 ) S ;
     - PHY_10 sky130_fd_sc_hs__decap_4 + FIXED ( 9600 26640 ) N ;
@@ -3485,7 +3486,7 @@ NETS 411 ;
     - reset ( PIN reset ) ( _346_ A1 ) ( _343_ B1 ) ( _339_ B1 ) ( _330_ A ) + USE SIGNAL ;
     - resp_msg[0] ( PIN resp_msg[0] ) ( _596_ B ) ( _503_ B ) ( _328_ X ) + USE SIGNAL ;
     - resp_msg[10] ( PIN resp_msg[10] ) ( _641_ B ) ( _468_ X ) + USE SIGNAL ;
-    - resp_msg[11] ( PIN resp_msg[11] ) ( _648_ A ) ( _474_ Y ) + USE SIGNAL ;
+    - resp_msg[11] ( PIN resp_msg[11] ) ( ANTENNA_9 DIODE ) ( _648_ A ) ( _474_ Y ) + USE SIGNAL ;
     - resp_msg[12] ( PIN resp_msg[12] ) ( _650_ B ) ( _475_ Y ) + USE SIGNAL ;
     - resp_msg[13] ( PIN resp_msg[13] ) ( _654_ A ) ( _479_ Y ) + USE SIGNAL ;
     - resp_msg[14] ( PIN resp_msg[14] ) ( _658_ A ) ( _480_ X ) + USE SIGNAL ;
@@ -3499,7 +3500,7 @@ NETS 411 ;
     - resp_msg[7] ( PIN resp_msg[7] ) ( _629_ B ) ( _462_ Y ) + USE SIGNAL ;
     - resp_msg[8] ( PIN resp_msg[8] ) ( _633_ B ) ( _463_ Y ) + USE SIGNAL ;
     - resp_msg[9] ( PIN resp_msg[9] ) ( _637_ B ) ( _466_ Y ) + USE SIGNAL ;
-    - resp_rdy ( PIN resp_rdy ) ( ANTENNA_9 DIODE ) ( _343_ A2 ) + USE SIGNAL ;
+    - resp_rdy ( PIN resp_rdy ) ( ANTENNA_10 DIODE ) ( _343_ A2 ) + USE SIGNAL ;
     - resp_val ( PIN resp_val ) ( _343_ A1 ) ( _341_ X ) + USE SIGNAL ;
 END NETS
 END DESIGN
diff --git a/src/grt/test/repair_antennas1.ok b/src/grt/test/repair_antennas1.ok
@@ -8,7 +8,7 @@
 Net: clk
   Pin: clkbuf_0_clk/A (sky130_fd_sc_hs__clkbuf_1)
     Layer: met2
-      Partial area ratio:  462.20
+      Partial area ratio:  451.78
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
@@ -61,17 +61,24 @@ Net: req_msg[31]
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
+Net: resp_msg[11]
+  Pin: _648_/A (sky130_fd_sc_hs__nand2_1)
+    Layer: met1
+      Partial area ratio:  572.13
+      Required ratio:  400.00 (Side area) (VIOLATED)
+
+
 Net: resp_rdy
   Pin: _343_/A2 (sky130_fd_sc_hs__a21oi_1)
     Layer: met3
       Partial area ratio:  516.42
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
-[INFO ANT-0002] Found 9 net violations.
-[INFO ANT-0001] Found 9 pin violations.
-[INFO GRT-0012] Found 9 antenna violations.
-[INFO GRT-0015] Inserted 9 diodes.
+[INFO ANT-0002] Found 10 net violations.
+[INFO ANT-0001] Found 10 pin violations.
+[INFO GRT-0012] Found 10 antenna violations.
+[INFO GRT-0015] Inserted 10 diodes.
 [INFO ANT-0002] Found 0 net violations.
 [INFO ANT-0001] Found 0 pin violations.
 No differences found.

diff --git a/src/grt/test/repair_antennas2.defok b/src/grt/test/repair_antennas2.defok
@@ -101,8 +101,9 @@ VIAS 3 ;
     - via2_960x490 + VIARULE M2M3_PR + CUTSIZE 200 200  + LAYERS met2 via2 met3  + CUTSPACING 200 200  + ENCLOSURE 40 145 180 65  + ROWCOL 1 2  ;
     - via3_960x490 + VIARULE M3M4_PR + CUTSIZE 200 200  + LAYERS met3 via3 met4  + CUTSPACING 200 200  + ENCLOSURE 180 60 180 145  + ROWCOL 1 2  ;
 END VIAS
-COMPONENTS 7169 ;
-    - ANTENNA_1 sky130_fd_sc_hs__diode_2 + PLACED ( 14400 109890 ) FS ;
+COMPONENTS 7170 ;
+    - ANTENNA_1 sky130_fd_sc_hs__diode_2 + PLACED ( 132480 156510 ) FS ;
+    - ANTENNA_2 sky130_fd_sc_hs__diode_2 + PLACED ( 169920 206460 ) N ;
     - FILLER_0_0_104 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 59520 9990 ) FS ;
     - FILLER_0_0_112 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 63360 9990 ) FS ;
     - FILLER_0_0_117 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 65760 9990 ) FS ;
@@ -1684,7 +1685,7 @@ COMPONENTS 7169 ;
     - FILLER_0_28_99 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 57120 103230 ) FS ;
     - FILLER_0_29_104 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 59520 106560 ) N ;
     - FILLER_0_29_112 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 63360 106560 ) N ;
-    - FILLER_0_29_12 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 15360 106560 ) N ;
+    - FILLER_0_29_12 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 15360 106560 ) N ;
     - FILLER_0_29_120 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 67200 106560 ) N ;
     - FILLER_0_29_141 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 77280 106560 ) N ;
     - FILLER_0_29_146 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 79680 106560 ) N ;
@@ -1910,7 +1911,6 @@ COMPONENTS 7169 ;
     - FILLER_0_30_59 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 37920 109890 ) FS ;
     - FILLER_0_30_67 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 41760 109890 ) FS ;
     - FILLER_0_30_75 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 45600 109890 ) FS ;
-    - FILLER_0_30_8 sky130_fd_sc_hs__fill_2 + SOURCE DIST + PLACED ( 13440 109890 ) FS ;
     - FILLER_0_30_83 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 49440 109890 ) FS ;
     - FILLER_0_30_91 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 53280 109890 ) FS ;
     - FILLER_0_30_99 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 57120 109890 ) FS ;
@@ -3013,9 +3013,10 @@ COMPONENTS 7169 ;
     - FILLER_0_44_223 sky130_fd_sc_hs__fill_2 + SOURCE DIST + PLACED ( 116640 156510 ) FS ;
     - FILLER_0_44_228 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 119040 156510 ) FS ;
     - FILLER_0_44_233 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 121440 156510 ) FS ;
-    - FILLER_0_44_241 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 125280 156510 ) FS ;
-    - FILLER_0_44_249 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 129120 156510 ) FS ;
-    - FILLER_0_44_253 sky130_fd_sc_hs__fill_1 + SOURCE DIST + PLACED ( 131040 156510 ) FS ;
+    - FILLER_0_44_241 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 125280 156510 ) FS ;
+    - FILLER_0_44_245 sky130_fd_sc_hs__fill_2 + SOURCE DIST + PLACED ( 127200 156510 ) FS ;
+    - FILLER_0_44_247 sky130_fd_sc_hs__fill_1 + SOURCE DIST + PLACED ( 128160 156510 ) FS ;
+    - FILLER_0_44_252 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 130560 156510 ) FS ;
     - FILLER_0_44_258 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 133440 156510 ) FS ;
     - FILLER_0_44_266 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 137280 156510 ) FS ;
     - FILLER_0_44_274 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 141120 156510 ) FS ;
@@ -4226,9 +4227,9 @@ COMPONENTS 7169 ;
     - FILLER_0_59_303 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 155040 206460 ) N ;
     - FILLER_0_59_311 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 158880 206460 ) N ;
     - FILLER_0_59_320 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 163200 206460 ) N ;
-    - FILLER_0_59_330 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 168000 206460 ) N ;
-    - FILLER_0_59_338 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 171840 206460 ) N ;
-    - FILLER_0_59_346 sky130_fd_sc_hs__fill_2 + SOURCE DIST + PLACED ( 175680 206460 ) N ;
+    - FILLER_0_59_330 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 168000 206460 ) N ;
+    - FILLER_0_59_336 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 170880 206460 ) N ;
+    - FILLER_0_59_344 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 174720 206460 ) N ;
     - FILLER_0_59_348 sky130_fd_sc_hs__fill_1 + SOURCE DIST + PLACED ( 176640 206460 ) N ;
     - FILLER_0_59_354 sky130_fd_sc_hs__fill_4 + SOURCE DIST + PLACED ( 179520 206460 ) N ;
     - FILLER_0_59_361 sky130_fd_sc_hs__fill_8 + SOURCE DIST + PLACED ( 182880 206460 ) N ;
@@ -7108,7 +7109,7 @@ COMPONENTS 7169 ;
     - _533_ sky130_fd_sc_hs__o21ai_1 + PLACED ( 124320 146520 ) N ;
     - _535_ sky130_fd_sc_hs__inv_2 + PLACED ( 137280 106560 ) N ;
     - _536_ sky130_fd_sc_hs__nor2_1 + PLACED ( 132000 163170 ) FS ;
-    - _537_ sky130_fd_sc_hs__a21oi_1 + PLACED ( 131520 156510 ) FS ;
+    - _537_ sky130_fd_sc_hs__a21oi_1 + PLACED ( 128640 156510 ) FS ;
     - _538_ sky130_fd_sc_hs__inv_1 + PLACED ( 127200 203130 ) FS ;
     - _539_ sky130_fd_sc_hs__nor2_8 + PLACED ( 124800 206460 ) N ;
     - _541_ sky130_fd_sc_hs__nand2_1 + PLACED ( 104160 163170 ) FS ;
@@ -7221,7 +7222,7 @@ COMPONENTS 7169 ;
     - input19 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 192960 266400 ) N ;
     - input2 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 216450 ) FS ;
     - input20 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 163680 263070 ) FS ;
-    - input21 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 17280 106560 ) N ;
+    - input21 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 106560 ) N ;
     - input22 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 119880 ) N ;
     - input23 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 264000 183150 ) FS ;
     - input24 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 103200 9990 ) FS ;
@@ -7239,7 +7240,7 @@ COMPONENTS 7169 ;
     - input35 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 151200 263070 ) FS ;
     - input4 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 96570 ) FS ;
     - input5 sky130_fd_sc_hs__buf_1 + PLACED ( 13440 149850 ) FS ;
-    - input6 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 106560 ) N ;
+    - input6 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 109890 ) FS ;
     - input7 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 159840 ) N ;
     - input8 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 13440 156510 ) FS ;
     - input9 sky130_fd_sc_hs__clkbuf_1 + PLACED ( 101280 266400 ) N ;
@@ -8994,7 +8995,7 @@ NETS 437 ;
     - _221_ ( _507_ B1 ) ( _506_ Y ) + USE SIGNAL ;
     - _222_ ( _509_ A ) ( _507_ X ) + USE SIGNAL ;
     - _223_ ( _509_ B ) ( _508_ Y ) + USE SIGNAL ;
-    - _224_ ( _511_ B1 ) ( _510_ Y ) + USE SIGNAL ;
+    - _224_ ( ANTENNA_2 DIODE ) ( _511_ B1 ) ( _510_ Y ) + USE SIGNAL ;
     - _225_ ( _513_ A ) ( _511_ X ) + USE SIGNAL ;
     - _226_ ( _513_ B ) ( _512_ Y ) + USE SIGNAL ;
     - _227_ ( _515_ B1 ) ( _514_ Y ) + USE SIGNAL ;
@@ -9060,7 +9061,7 @@ NETS 437 ;
     - _288_ ( _596_ B1 ) ( _595_ Y ) + USE SIGNAL ;
     - _289_ ( _597_ B1 ) ( _596_ Y ) + USE SIGNAL ;
     - _290_ ( _598_ B ) ( _597_ X ) + USE SIGNAL ;
-    - clk ( PIN clk ) ( clkbuf_0_clk A ) + USE CLOCK ;
+    - clk ( PIN clk ) ( ANTENNA_1 DIODE ) ( clkbuf_0_clk A ) + USE CLOCK ;
     - clknet_0_clk ( clkbuf_2_3__f_clk A ) ( clkbuf_2_2__f_clk A ) ( clkbuf_2_1__f_clk A ) ( clkbuf_2_0__f_clk A ) ( clkbuf_0_clk X ) + USE CLOCK ;
     - clknet_2_0__leaf_clk ( _614_ CLK ) ( _616_ CLK ) ( _617_ CLK ) ( _630_ CLK ) ( _631_ CLK ) ( _632_ CLK ) ( _633_ CLK )
       ( clkbuf_2_0__f_clk X ) + USE CLOCK ;
@@ -9147,7 +9148,7 @@ NETS 437 ;
     - net45 ( output45 A ) ( _403_ Y ) ( _547_ B ) + USE SIGNAL ;
     - net46 ( output46 A ) ( _405_ X ) ( _553_ B ) + USE SIGNAL ;
     - net47 ( output47 A ) ( _406_ X ) ( _557_ B ) + USE SIGNAL ;
-    - net48 ( ANTENNA_1 DIODE ) ( output48 A ) ( _409_ X ) ( _560_ B ) + USE SIGNAL ;
+    - net48 ( output48 A ) ( _409_ X ) ( _560_ B ) + USE SIGNAL ;
     - net49 ( output49 A ) ( _412_ X ) ( _563_ B ) + USE SIGNAL ;
     - net5 ( input5 X ) ( _522_ B ) + USE SIGNAL ;
     - net50 ( output50 A ) ( _415_ Y ) ( _567_ B ) + USE SIGNAL ;

diff --git a/src/grt/test/repair_antennas2.guideok b/src/grt/test/repair_antennas2.guideok
@@ -3660,7 +3660,8 @@ net54
 79200 151200 86400 158400 li1
 79200 151200 100800 158400 met1
 93600 151200 100800 158400 li1
-93600 151200 136800 158400 met1
+93600 151200 129600 158400 met1
+122400 151200 129600 158400 li1
 129600 100800 144000 108000 met1
 136800 100800 144000 108000 li1
 129600 108000 136800 115200 li1
@@ -3679,18 +3680,18 @@ net54
 129600 115200 136800 122400 li1
 129600 115200 136800 122400 met1
 129600 108000 136800 122400 met2
-129600 151200 136800 158400 li1
 129600 151200 136800 158400 met1
 129600 115200 136800 158400 met2
-129600 158400 136800 165600 met1
-129600 151200 136800 165600 met2
+122400 151200 136800 158400 met1
 129600 180000 136800 187200 li1
 129600 180000 136800 187200 met1
 129600 158400 136800 187200 met2
+129600 158400 136800 165600 met1
 129600 187200 158400 194400 met1
 151200 187200 158400 194400 li1
 151200 187200 165600 194400 met1
 129600 180000 136800 194400 met2
+129600 151200 136800 165600 met2
 115200 201600 136800 208800 met1
 86400 100800 108000 108000 met1
 28800 201600 36000 208800 met1
@@ -3761,10 +3762,7 @@ net59
 )
 net6
 (
-14400 100800 21600 108000 li1
-14400 100800 21600 108000 met1
-14400 100800 21600 115200 met2
-14400 108000 21600 115200 met1
+14400 108000 21600 115200 li1
 14400 108000 136800 115200 met1
 129600 108000 136800 115200 li1
 )
@@ -3810,8 +3808,8 @@ net7
 net8
 (
 14400 158400 21600 165600 li1
-14400 158400 136800 165600 met1
-129600 158400 136800 165600 li1
+14400 158400 129600 165600 met1
+122400 158400 129600 165600 li1
 )
 net9
 (
@@ -3988,10 +3986,11 @@ req_msg[27]
 )
 req_msg[28]
 (
-14400 100800 21600 108000 met2
-14400 100800 21600 115200 met2
+7200 108000 14400 115200 li1
+7200 108000 21600 115200 met1
 14400 108000 21600 115200 met1
-14400 108000 21600 115200 li1
+14400 100800 21600 115200 met2
+14400 100800 21600 108000 met2
 0 100800 21600 108000 met3
 )
 req_msg[29]

diff --git a/src/grt/test/repair_antennas2.ok b/src/grt/test/repair_antennas2.ok
@@ -5,26 +5,26 @@
 [INFO ODB-0131]     Created 1277 components and 6322 component-terminals.
 [INFO ODB-0132]     Created 2 special nets and 2554 connections.
 [INFO ODB-0133]     Created 437 nets and 1214 connections.
-Net: net48
-  Pin: output48/A (sky130_fd_sc_hs__clkbuf_1)
+Net: clk
+  Pin: clkbuf_0_clk/A (sky130_fd_sc_hs__buf_1)
     Layer: met1
-      Partial area ratio:  504.36
+      Partial area ratio:  411.05
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
-[INFO ANT-0002] Found 1 net violations.
-[INFO ANT-0001] Found 1 pin violations.
-[INFO GRT-0012] Found 1 antenna violations.
-[INFO GRT-0015] Inserted 1 diodes.
-Net: net48
-  Pin: output48/A (sky130_fd_sc_hs__clkbuf_1)
+Net: _224_
+  Pin: _511_/B1 (sky130_fd_sc_hs__o21a_1)
     Layer: met1
-      Partial area ratio:  504.36
+      Partial area ratio:  452.83
       Required ratio:  400.00 (Side area) (VIOLATED)
 
 
-[INFO ANT-0002] Found 1 net violations.
-[INFO ANT-0001] Found 1 pin violations.
+[INFO ANT-0002] Found 2 net violations.
+[INFO ANT-0001] Found 2 pin violations.
+[INFO GRT-0012] Found 2 antenna violations.
+[INFO GRT-0015] Inserted 2 diodes.
+[INFO ANT-0002] Found 0 net violations.
+[INFO ANT-0001] Found 0 pin violations.
 [INFO DPL-0001] Placed 5891 filler instances.
 No differences found.
 No differences found.