Tidy up

Signed-off-by: Eddie Hung <eddie.hung@amd.com>
Xilinx · Nov 13, 2024 · d1e843a · d1e843a
1 parent 8c0acba
commit d1e843a
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/RWRoute.java b/src/com/xilinx/rapidwright/rwroute/RWRoute.java
@@ -627,19 +627,16 @@ protected NetWrapper createNetWrapperAndConnections(Net net) {
                 }
 
                 indirectConnections.add(connection);
-                BitSet[] eastWestWires = (routingGraph.eastWestWires == null) ? null :
-                        routingGraph.eastWestWires.get(sinkINTNode.getTile().getTileTypeEnum());
-                RouteNode sinkRnode;
-                if (eastWestWires != null && eastWestWires[0].get(sinkINTNode.getWireIndex())) {
-                    sinkRnode = routingGraph.getOrCreate(sinkINTNode, RouteNodeType.EXCLUSIVE_SINK_EAST);
-                    sinkRnode.setType(RouteNodeType.EXCLUSIVE_SINK_EAST);
-                } else if (eastWestWires != null && eastWestWires[1].get(sinkINTNode.getWireIndex())) {
-                    sinkRnode = routingGraph.getOrCreate(sinkINTNode, RouteNodeType.EXCLUSIVE_SINK_WEST);
-                    sinkRnode.setType(RouteNodeType.EXCLUSIVE_SINK_WEST);
-                } else {
-                    sinkRnode = routingGraph.getOrCreate(sinkINTNode, RouteNodeType.EXCLUSIVE_SINK_BOTH);
-                    sinkRnode.setType(RouteNodeType.EXCLUSIVE_SINK_BOTH);
-                }
+
+                RouteNodeInfo rni = RouteNodeInfo.get(sinkINTNode, routingGraph);
+                assert(rni.type.isAnyLocal());
+                RouteNodeType sinkType = rni.type == RouteNodeType.LOCAL_EAST ? RouteNodeType.EXCLUSIVE_SINK_EAST :
+                                         rni.type == RouteNodeType.LOCAL_WEST ? RouteNodeType.EXCLUSIVE_SINK_WEST :
+                                         rni.type == RouteNodeType.LOCAL_BOTH ? RouteNodeType.EXCLUSIVE_SINK_BOTH :
+                                         null;
+                assert(sinkType != null);
+                RouteNode sinkRnode = routingGraph.getOrCreate(sinkINTNode, sinkType);
+                sinkRnode.setType(sinkType);
                 connection.setSinkRnode(sinkRnode);
 
                 // Where appropriate, allow all 6 LUT pins to be swapped to begin with