Merge pull request #8815 from gadfort/pdn-cut_spacing

pdn: check getTechLayerCutSpacingRules for adjacenct cuts

Author: maliberty

src/pdn/src/via.cpp

@@ -1777,21 +1777,44 @@ bool ViaGenerator::updateCutSpacing(int rows, int cols)
 
   bool changed = false;
   const odb::Rect cut = getCut();
-  for (auto* rule : layer->getV54SpacingRules()) {
-    uint numcuts;
-    uint within;
-    uint spacing;
-    bool except_same_pgnet;
-    if (!rule->getAdjacentCuts(numcuts, within, spacing, except_same_pgnet)) {
+  for (auto* rule : layer->getTechLayerCutSpacingRules()) {
+    if (rule->getType()
+        != odb::dbTechLayerCutSpacingRule::CutSpacingType::ADJACENTCUTS) {
       continue;
     }
-    if (except_same_pgnet) {
+
+    if (!rule->isCutClassToAll() && rule->getCutClass() != cutclass_) {
       continue;
     }
-    if (numcuts <= adj_cuts) {
-      cut_pitch_x_ = cut.dx() + spacing;
-      cut_pitch_y_ = cut.dy() + spacing;
-      changed = true;
+
+    if (rule->getNumCuts() <= adj_cuts) {
+      if (max_dim == rows) {
+        cut_pitch_y_ = cut.dy() + rule->getCutSpacing();
+        changed = true;
+      } else {
+        cut_pitch_x_ = cut.dx() + rule->getCutSpacing();
+        changed = true;
+      }
+    }
+  }
+
+  if (!changed) {
+    for (auto* rule : layer->getV54SpacingRules()) {
+      uint numcuts;
+      uint within;
+      uint spacing;
+      bool except_same_pgnet;
+      if (!rule->getAdjacentCuts(numcuts, within, spacing, except_same_pgnet)) {
+        continue;
+      }
+      if (except_same_pgnet) {
+        continue;
+      }
+      if (numcuts <= adj_cuts) {
+        cut_pitch_x_ = cut.dx() + spacing;
+        cut_pitch_y_ = cut.dy() + spacing;
+        changed = true;
+      }
     }
   }