RWRoute Fixes (#765)

* PartialRouter.determineRoutingTargets() to recover indirect conns Signed-off-by: Eddie Hung <[email protected]> * RWRoute.saveRouting() to handle altSourceINTNode == null Signed-off-by: Eddie Hung <[email protected]> --------- Signed-off-by: Eddie Hung <[email protected]>
Xilinx · Jul 21, 2023 · c324c50 · c324c50
1 parent 0136ca3
commit c324c50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/PartialRouter.java b/src/com/xilinx/rapidwright/rwroute/PartialRouter.java
@@ -350,9 +350,11 @@ protected void determineRoutingTargets() {
                 rend.setPrev(rstart);
             }
 
-            // Use the prev pointers to attempt to recover routing for all connections
+            // Use the prev pointers to attempt to recover routing for all indirect connections
             for (Connection connection : netWrapper.getConnections()) {
-                finishRouteConnection(connection, connection.getSinkRnode());
+                if (!connection.isDirect()) {
+                    finishRouteConnection(connection, connection.getSinkRnode());
+                }
             }
         }
 

diff --git a/src/com/xilinx/rapidwright/rwroute/RWRoute.java b/src/com/xilinx/rapidwright/rwroute/RWRoute.java
@@ -1356,7 +1356,7 @@ private boolean saveRouting(Connection connection, RouteNode rnode) {
                     altSource = net.getSource();
                 }
                 Node altSourceINTNode = RouterHelper.projectOutputPinToINTNode(altSource);
-                if (altSourceINTNode.equals(sourceRnode.getNode())) {
+                if (sourceRnode.getNode().equals(altSourceINTNode)) {
                     RouteNode altSourceRnode = sourceRnode;
                     connection.setSource(altSource);
                     connection.setSourceRnode(altSourceRnode);