RouteNodeGraph.allowRoutethru() to ignore NODE_PINFEED targets

Signed-off-by: Eddie Hung <[email protected]>
Xilinx · Oct 23, 2024 · d9927c2 · d9927c2
1 parent ab908c2
commit d9927c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/RouteNode.java b/src/com/xilinx/rapidwright/rwroute/RouteNode.java
@@ -245,7 +245,8 @@ private void setBaseCost() {
             case PINFEED_O:
                 // Only setBaseCost() is called on creation; getBaseCost() should
                 // never be called
-                assert(getLength() == 0);
+                assert(getLength() == 0 ||
+                       (getLength() <= 3 && (getIntentCode() == IntentCode.NODE_INTF2 || getIntentCode() == IntentCode.NODE_INTF4)));
                 break;
             default:
                 throw new RuntimeException(getType().toString());

diff --git a/src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java b/src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java
@@ -112,6 +112,8 @@ public class RouteNodeGraph {
     protected final static int MAX_OCCUPANCY = 256;
     protected final float[] presentCongestionCosts;
 
+    protected final boolean isVersal;
+
     protected static int getTileCount(Design design) {
         Device device = design.getDevice();
         return device.getColumns() * device.getRows();
@@ -289,6 +291,7 @@ public RouteNodeGraph(Design design, RWRouteConfig config) {
         }
 
         presentCongestionCosts = new float[MAX_OCCUPANCY];
+        isVersal = series == Series.Versal;
     }
 
     public void initialize() {
@@ -353,7 +356,7 @@ public void preserve(Net net, List<SitePinInst> pins) {
                 String pinName = pin.getName();
                 char lutLetter = pinName.charAt(0);
                 String otherPinName = null;
-                String otherPinNameSuffix = design.getSeries() == Series.Versal ? "Q" : "MUX";
+                String otherPinNameSuffix = isVersal ? "Q" : "MUX";
                 if (pinName.endsWith(otherPinNameSuffix)) {
                     otherPinName = lutLetter + "_O";
                 } else if (pinName.endsWith("_O")) {
@@ -653,6 +656,15 @@ protected boolean allowRoutethru(Node head, Node tail) {
             return false;
         }
 
+        if (tail.getIntentCode() == IntentCode.NODE_PINFEED) {
+            assert(isVersal);
+            assert(head.getIntentCode() == IntentCode.NODE_IMUX ||
+                   head.getIntentCode() == IntentCode.NODE_PINBOUNCE ||
+                   head.getIntentCode() == IntentCode.NODE_CLE_CTRL ||
+                   head.getIntentCode() == IntentCode.NODE_INTF_CTRL);
+            return false;
+        }
+
         // Should not get to this point unless LUT routethru-s are enabled
         assert(lutRoutethru);