From 5d6aca43ed46134c7d8b2f9010913b91e60cf370 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Thu, 14 Nov 2024 20:59:16 -0800 Subject: [PATCH] [GlobalSignalRouting] Do not encourage reuse Signed-off-by: Eddie Hung --- .../rapidwright/rwroute/GlobalSignalRouting.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java b/src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java index 42cd8a11a..3a515e934 100644 --- a/src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java +++ b/src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java @@ -393,7 +393,7 @@ public static void routeStaticNet(List pins, } Node node = sink.getConnectedNode(); - if (getNodeState.apply(node) == NodeStatus.UNAVAILABLE) { + if (getNodeState.apply(node) != NodeStatus.INUSE) { throw new RuntimeException("ERROR: Site pin " + sink + " is not available for net " + currNet); } nodeToRouteToSink.put(node, sink); @@ -531,18 +531,6 @@ public static void routeStaticNet(List pins, node = uphillNode; break search; } - - // uphillNode must be a sink to be routed; preserve only the current routing, clear the queue, - // and restart routing from this new sink to encourage reuse - assert(!uphillSink.isRouted()); - do { - usedRoutingNodes.add(node); - node = prevNode.get(node); - } while (node != INVALID_NODE); - prevNode.keySet().removeIf((n) -> !usedRoutingNodes.contains(n) && !n.equals(uphillNode)); - q.clear(); - q.add(uphillNode); - continue search; } q.add(uphillNode);