Merge pull request #9026 from gadfort/pad-keep-existing

pad: honor FIXED swires in rdl router

Author: maliberty

src/pad/src/RDLRouter.cpp

@@ -28,6 +28,7 @@
 #include "odb/db.h"
 #include "odb/dbObject.h"
 #include "odb/dbTransform.h"
+#include "odb/dbTypes.h"
 #include "odb/geom.h"
 #include "pad/ICeWall.h"
 #include "utl/Logger.h"
@@ -666,7 +667,14 @@ void RDLRouter::route(const std::vector<odb::dbNet*>& nets)
 
   // remove old routes
   for (const auto& route : routes_) {
-    route->getNet()->destroySWires();
+    auto swires = route->getNet()->getSWires();
+    for (auto itr = swires.begin(); itr != swires.end();) {
+      if ((*itr)->getWireType() == odb::dbWireType::FIXED) {
+        itr++;
+        continue;
+      }
+      itr = odb::dbSWire::destroy(itr);
+    }
   }
 
   for (const auto& route : routes_) {
@@ -1795,11 +1803,13 @@ void RDLRouter::populateObstructions(const std::vector<odb::dbNet*>& nets)
   // Get already routed nets obstructions, excluding those that will be routed
   // now
   for (auto* net : block_->getNets()) {
-    if (std::find(nets.begin(), nets.end(), net) != nets.end()) {
-      continue;
-    }
+    const bool is_routing_net = std::ranges::find(nets, net) != nets.end();
 
     for (auto* swire : net->getSWires()) {
+      if (is_routing_net && swire->getWireType() != odb::dbWireType::FIXED) {
+        continue;
+      }
+
       for (auto* box : swire->getWires()) {
         if (box->getTechLayer() != layer_) {
           continue;

src/pad/test/BUILD

@@ -51,6 +51,7 @@ COMPULSORY_TESTS = [
     "rdl_route_bump_via",
     "rdl_route_failed",
     "rdl_route_invalid",
+    "rdl_route_keep_existing",
     "rdl_route_max_iterations",
     "rdl_route_ports",
     "rdl_route_single_target",

src/pad/test/CMakeLists.txt

@@ -46,6 +46,7 @@ or_integration_tests(
     rdl_route_bump_via
     rdl_route_failed
     rdl_route_invalid
+    rdl_route_keep_existing
     rdl_route_max_iterations
     rdl_route_ports
     rdl_route_single_target