Merge pull request #8880 from gadfort/correct-via-count

pdn: correct via count in log

Author: maliberty

src/pdn/src/via.cpp

@@ -3071,13 +3071,32 @@ void Via::writeToDb(odb::dbSWire* wire,
     int x = 0;
     int y = 0;
     int ripup_count = 0;
+    int via_ripup_count = 0;
     for (auto* shape : ripup_shapes) {
       int via_x, via_y;
       if (shape->getBlockVia() != nullptr || shape->getTechVia() != nullptr) {
         shape->getViaXY(via_x, via_y);
         x += via_x;
         y += via_y;
         ripup_count++;
+
+        if (odb::dbVia* via = shape->getBlockVia()) {
+          for (auto* box : via->getBoxes()) {
+            if (box->getTechLayer() != nullptr
+                && box->getTechLayer()->getType()
+                       == odb::dbTechLayerType::CUT) {
+              via_ripup_count++;
+            }
+          }
+        } else if (odb::dbTechVia* via = shape->getTechVia()) {
+          for (auto* box : via->getBoxes()) {
+            if (box->getTechLayer() != nullptr
+                && box->getTechLayer()->getType()
+                       == odb::dbTechLayerType::CUT) {
+              via_ripup_count++;
+            }
+          }
+        }
       }
 
       odb::dbSBox::destroy(shape);
@@ -3091,7 +3110,7 @@ void Via::writeToDb(odb::dbSWire* wire,
         utl::PDN,
         195,
         "Removing {} via(s) between {} and {} at ({:.4f} um, {:.4f} um) for {}",
-        ripup_count,
+        via_ripup_count,
         lower_->getLayer()->getName(),
         upper_->getLayer()->getName(),
         tech_layer.dbuToMicron(x / ripup_count),

src/pdn/test/core_grid_with_single_edge_pins.ok

@@ -5,8 +5,8 @@
 [INFO ODB-0133]     Created 385 nets and 1110 connections.
 [INFO IFP-0001] Added 72 rows of 527 site FreePDK45_38x28_10R_NP_162NW_34O.
 [INFO PDN-0001] Inserting grid: Core
-[WARNING PDN-0195] Removing 3 via(s) between metal1 and metal4 at (2.0000 um, 0.0050 um) for VSS
-[WARNING PDN-0195] Removing 3 via(s) between metal1 and metal4 at (42.0000 um, 0.0050 um) for VSS
-[WARNING PDN-0195] Removing 3 via(s) between metal1 and metal4 at (62.0000 um, 0.0050 um) for VSS
-[WARNING PDN-0195] Removing 3 via(s) between metal1 and metal4 at (82.0000 um, 0.0050 um) for VSS
+[WARNING PDN-0195] Removing 9 via(s) between metal1 and metal4 at (2.0000 um, 0.0050 um) for VSS
+[WARNING PDN-0195] Removing 9 via(s) between metal1 and metal4 at (42.0000 um, 0.0050 um) for VSS
+[WARNING PDN-0195] Removing 9 via(s) between metal1 and metal4 at (62.0000 um, 0.0050 um) for VSS
+[WARNING PDN-0195] Removing 9 via(s) between metal1 and metal4 at (82.0000 um, 0.0050 um) for VSS
 No differences found.

src/pdn/test/pads_black_parrot_flipchip.ok

@@ -6,11 +6,11 @@
 [INFO ODB-0132]     Created 143 special nets and 883 connections.
 [INFO ODB-0133]     Created 219 nets and 267 connections.
 [INFO PDN-0001] Inserting grid: Core
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (181.7350 um, 1349.6200 um) for VSS
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (181.7350 um, 1829.6200 um) for VSS
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (185.2350 um, 2464.6200 um) for VDD
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (2814.7200 um, 1660.3800 um) for VDD
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (2814.7200 um, 2295.3800 um) for VDD
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (2818.2200 um, 535.3800 um) for VSS
-[WARNING PDN-0195] Removing 1 via(s) between metal9 and metal10 at (2818.2200 um, 1175.3800 um) for VSS
+[WARNING PDN-0195] Removing 8 via(s) between metal9 and metal10 at (181.7350 um, 1349.6200 um) for VSS
+[WARNING PDN-0195] Removing 8 via(s) between metal9 and metal10 at (181.7350 um, 1829.6200 um) for VSS
+[WARNING PDN-0195] Removing 12 via(s) between metal9 and metal10 at (185.2350 um, 2464.6200 um) for VDD
+[WARNING PDN-0195] Removing 12 via(s) between metal9 and metal10 at (2814.7200 um, 1660.3800 um) for VDD
+[WARNING PDN-0195] Removing 12 via(s) between metal9 and metal10 at (2814.7200 um, 2295.3800 um) for VDD
+[WARNING PDN-0195] Removing 8 via(s) between metal9 and metal10 at (2818.2200 um, 535.3800 um) for VSS
+[WARNING PDN-0195] Removing 8 via(s) between metal9 and metal10 at (2818.2200 um, 1175.3800 um) for VSS
 No differences found.