Update comments/asserts

Signed-off-by: Eddie Hung <[email protected]>
Xilinx · Nov 8, 2024 · 209ffac · 209ffac
1 parent b72a1fd
commit 209ffac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/RWRoute.java b/src/com/xilinx/rapidwright/rwroute/RWRoute.java
@@ -1820,7 +1820,7 @@ private void exploreAndExpand(ConnectionState state, RouteNode rnode) {
                         break;
                     case NON_LOCAL:
                         // LOCALs cannot connect to NON_LOCALs except via a LUT routethru
-                        assert(rnode.getType() != RouteNodeType.LOCAL ||
+                        assert(!rnode.getType().isLocal() ||
                                routingGraph.lutRoutethru && rnode.getIntentCode() == IntentCode.NODE_PINFEED ||
                                // FIXME:
                                design.getSeries() == Series.Versal);
@@ -1837,6 +1837,9 @@ private void exploreAndExpand(ConnectionState state, RouteNode rnode) {
                     case EXCLUSIVE_SINK:
                     case EXCLUSIVE_SINK_EAST:
                     case EXCLUSIVE_SINK_WEST:
+                        assert(childRNode.getType() != RouteNodeType.EXCLUSIVE_SINK_EAST || rnode.getType() == RouteNodeType.LOCAL_EAST);
+                        assert(childRNode.getType() != RouteNodeType.EXCLUSIVE_SINK_WEST || rnode.getType() == RouteNodeType.LOCAL_WEST);
+                        assert(childRNode.getType() != RouteNodeType.EXCLUSIVE_SINK || rnode.getType() == RouteNodeType.LOCAL);
                         if (!isAccessibleSink(childRNode, connection)) {
                             continue;
                         }

diff --git a/src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java b/src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java
@@ -633,7 +633,7 @@ public boolean isAccessible(RouteNode childRnode, Connection connection) {
         assert(sinkType.isExclusiveSink());
         if ((type == RouteNodeType.LOCAL_EAST && sinkType != RouteNodeType.EXCLUSIVE_SINK_EAST) ||
             (type == RouteNodeType.LOCAL_WEST && sinkType != RouteNodeType.EXCLUSIVE_SINK_WEST) ||
-            // Sinks without a side (e.g. CTRL) can only be approached from LOCAL nodes also without a side
+            // Sinks without a side (e.g. CTRL) must only be approached from LOCAL nodes also without a side
             (sinkType == RouteNodeType.EXCLUSIVE_SINK && type != RouteNodeType.LOCAL)) {
             return false;
         }