Make INODEs for inter-SLR connections accessible

Allowing INODE -> BOUNCE -> BNODE -> SLL_INPUT

Signed-off-by: Eddie Hung <[email protected]>

Author: eddieh-xlnx

src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java

@@ -1103,6 +1103,12 @@ public boolean isAccessible(RouteNode childRnode, RouteNode parentRnode, Connect
             IntentCode childIntentCode = childRnode.getIntentCode();
             switch (childIntentCode) {
                 case NODE_INODE:
+                    if (connection.isCrossSLR() &&
+                            childRnode.getSLRIndex(this) != sinkRnode.getSLRIndex(this)) {
+                        // Allow INODEs needed for PINBOUNCE -> BNODE -> NODE_SLL_INPUT
+                        // TODO: Only allow those that lead to a SLR crossing
+                        return true;
+                    }
                     // Block access to all INODEs outside the sink tile, since NODE_INODE -> NODE_IMUX -> NODE_PINFEED (or NODE_INODE -> NODE_PINBOUNCE)
                     assert(childTile != sinkTile);
                     return false;
@@ -1111,18 +1117,24 @@ public boolean isAccessible(RouteNode childRnode, RouteNode parentRnode, Connect
                             childTile.getTileTypeEnum() == TileTypeEnum.SLL &&
                             childRnode.getSLRIndex(this) != sinkRnode.getSLRIndex(this)) {
                         // Allow CLE BNODEs since these are used to reach NODE_SLL_INPUT nodes
-                        // TODO: Only allow BNODEs into SLLs that contain SLR crossings
+                        // TODO: Only allow those that lead to a SLR crossing
                         return true;
                     }
                 case NODE_INTF_BNODE:
                 case NODE_CLE_CNODE:
                 case NODE_INTF_CNODE:
-                    // Allow [BC]NODEs that reach into the sink tile
-                    return childTile.getTileYCoordinate() == sinkTile.getTileYCoordinate() &&
-                           childRnode.getEndTileXCoordinate() == sinkTile.getTileXCoordinate();
+                    if (childTile.getTileYCoordinate() != sinkTile.getTileYCoordinate() ||
+                        childRnode.getEndTileXCoordinate() != sinkTile.getTileXCoordinate()) {
+                        assert(parentRnode.getIntentCode() != IntentCode.NODE_INODE);
+                        return false;
+                    }
+                    // Only allow [BC]NODEs that reach into the sink tile
+                    return true;
                 case NODE_PINBOUNCE:
-                    // BOUNCEs are only accessible through INODEs, so transitively this intent code is unreachable
-                    break;
+                    // PINBOUNCEs are only accessible through an INODE, so arriving here means that this must be an inter-SLR connection
+                    assert(connection.isCrossSLR() &&
+                            childRnode.getSLRIndex(this) != sinkRnode.getSLRIndex(this));
+                    return true;
                 case NODE_IMUX:
                     // IMUXes that are not our target EXCLUSIVE_SINK will have been isExcluded() from the graph unless
                     // LUT routethrus are enabled (which would have already returned true above)

test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java

@@ -404,16 +404,16 @@ void testSingleConnectionHelper(String partName,
             // Versal
             // One SLR crossing
             // (Too) close
-            "xcv80,SLICE_X54Y331,SLICE_X54Y332,500",            // Source adjacent to crossing SLL (east)
-            "xcv80,SLICE_X53Y332,SLICE_X53Y331,700",            // Source adjacent to crossing SLL (west)
-            "xcv80,SLICE_X51Y331,SLICE_X51Y332,300",            // Close to crossing SLL
+            "xcv80,SLICE_X54Y331,SLICE_X54Y332,1000",           // Source adjacent to crossing SLL (east)
+            "xcv80,SLICE_X53Y332,SLICE_X53Y331,900",            // Source adjacent to crossing SLL (west)
+            "xcv80,SLICE_X51Y331,SLICE_X51Y332,400",            // Close to crossing SLL
             // Perfect
             "xcv80,SLICE_X54Y331,SLICE_X54Y406,700",            // Source adjacent to crossing SLL (east, north)
             "xcv80,SLICE_X53Y331,SLICE_X53Y406,200",            // Source adjacent to crossing SLL (west, north)
-            "xcv80,SLICE_X54Y406,SLICE_X54Y331,1400",           // Sink adjacent to crossing SLL (east, south)
+            "xcv80,SLICE_X54Y406,SLICE_X54Y331,600",            // Sink adjacent to crossing SLL (east, south)
             "xcv80,SLICE_X53Y406,SLICE_X53Y331,100",            // Sink adjacent to crossing SLL (west, south)
-            "xcv80,SLICE_X51Y331,SLICE_X51Y406,300",            // Source close to crossing SLL
-            "xcv80,SLICE_X0Y331,SLICE_X49Y406,2000",            // Source far from crossing SLL
+            "xcv80,SLICE_X51Y331,SLICE_X51Y406,400",            // Source close to crossing SLL
+            "xcv80,SLICE_X0Y331,SLICE_X49Y406,2700",            // Source far from crossing SLL
 
             // US+
             // One SLR crossing