Merge branch 'utils_clocking_cmt' into rwroute_east_west

Xilinx · Nov 8, 2024 · 0db2b4c · 0db2b4c
2 parents 725798d + abd15c7
commit 0db2b4c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/RouterHelper.java b/src/com/xilinx/rapidwright/rwroute/RouterHelper.java
@@ -180,9 +180,13 @@ public static Node projectOutputPinToINTNode(SitePinInst output) {
      */
     public static Node projectInputPinToINTNode(SitePinInst input) {
         Node sink = input.getConnectedNode();
-        if (sink.getTile().getTileTypeEnum() == TileTypeEnum.INT) {
+        TileTypeEnum sinkTileType = sink.getTile().getTileTypeEnum();
+        if (sinkTileType == TileTypeEnum.INT) {
             return sink;
         }
+        // Only block clocking tiles if source is not in a clock tile
+        final boolean blockClocking = !Utils.isClocking(sinkTileType);
+
         int watchdog = 40;
 
         // Starting from the SPI's connected node, perform an uphill breadth-first search
@@ -198,7 +202,7 @@ public static Node projectInputPinToINTNode(SitePinInst input) {
                         EnumSet.of(IntentCode.NODE_CLE_CTRL, IntentCode.NODE_INTF_CTRL).contains(uphill.getIntentCode())) {
                     return uphill;
                 }
-                if (Utils.isClocking(uphillTileType)) {
+                if (uphillTileType != sinkTileType && Utils.isClocking(uphillTileType)) {
                     continue;
                 }
                 queue.add(uphill);

diff --git a/src/com/xilinx/rapidwright/util/Utils.java b/src/com/xilinx/rapidwright/util/Utils.java
@@ -1,7 +1,7 @@
 /*
  * Original work: Copyright (c) 2010-2011 Brigham Young University
  * Modified work: Copyright (c) 2017-2022, Xilinx, Inc.
- * Copyright (c) 2022-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2022-2024, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Author: Chris Lavin, Xilinx Research Labs.

diff --git a/test/src/com/xilinx/rapidwright/rwroute/TestRouterHelper.java b/test/src/com/xilinx/rapidwright/rwroute/TestRouterHelper.java
@@ -73,6 +73,7 @@ public void testProjectOutputPinToINTNode(String partName, String siteName, Stri
     @ParameterizedTest
     @CsvSource({
             "xcvu3p,MMCM_X0Y0,PSEN,INT_X36Y56/IMUX_W0",
+            "xcvu3p,BUFGCE_X0Y58,CLK_IN,INT_X36Y151/IMUX_W34",
             "xcvp1002,MMCM_X2Y0,PSEN,INT_X27Y0/IMUX_B_W24"
     })
     public void testProjectInputPinToINTNode(String partName, String siteName, String pinName, String nodeAsString) {