Merge branch 'master' into grt_arrays

andyfox-rushc · Jan 26, 2024 · 4a355ac · 4a355ac
2 parents c13da34 + 5f8ba2b
commit 4a355ac
Show file tree

Hide file tree

Showing 5 changed files with 17,003 additions and 2 deletions.
diff --git a/src/pdn/src/connect.cpp b/src/pdn/src/connect.cpp
@@ -746,7 +746,7 @@ void Connect::populateGenerateRules()
         use_fixed_via = true;
       }
     }
-    if (use_fixed_via) {
+    if (use_fixed_via || !fixed_tech_vias_.empty()) {
       continue;
     }
     for (odb::dbTechViaGenerateRule* db_via : tech->getViaGenerateRules()) {
@@ -789,7 +789,7 @@ void Connect::populateTechVias()
         use_fixed_via = true;
       }
     }
-    if (use_fixed_via) {
+    if (use_fixed_via || !fixed_generate_vias_.empty()) {
       continue;
     }
     for (odb::dbTechVia* db_via : tech->getVias()) {