Route backward from sinks to LCBs and update test

Signed-off-by: Wenhao Lin <wenhao.lin@amd.com>
Xilinx · Nov 14, 2024 · 579b93a · 579b93a
1 parent 9533bc3
commit 579b93a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/src/com/xilinx/rapidwright/router/RouteNode.java b/src/com/xilinx/rapidwright/router/RouteNode.java
@@ -395,6 +395,19 @@ public ArrayList<PIP> getPIPsBackToSourceByNodes() {
         return pips;
     }
 
+    public ArrayList<PIP> getPIPsForwardToSinkByNodes() {
+        ArrayList<PIP> pips = new ArrayList<>();
+        RouteNode curr = this;
+        do {
+            PIP pip = RouterHelper.findPIPbetweenNodes(Node.getNode(curr), Node.getNode(curr.parent));
+            if (pip != null) {
+                pips.add(pip);
+            }
+            curr = curr.parent;
+        } while (curr.parent != null);
+        return pips;
+    }
+
     public Wire[] getWiresInNode() {
         return Node.getWiresInNode(getTile(),getWire());
     }

diff --git a/src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java b/src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java
@@ -314,8 +314,6 @@ public static void symmetricClkRouting(Net clk, Device device, Function<Node,Nod
             Map<RouteNode, List<SitePinInst>> lcbMappings = getLCBPinMappingsOnVersal(clk, getNodeStatus);
             VersalClockRouting.routeDistributionToLCBs(clk, upDownDistLines, lcbMappings.keySet());
 
-            VersalClockRouting.routeLCBsToSinks(clk, lcbMappings, getNodeStatus);
-
             Set<PIP> clkPIPsWithoutDuplication = new HashSet<>(clk.getPIPs());
             clk.setPIPs(clkPIPsWithoutDuplication);
         }
@@ -446,20 +444,19 @@ public static Map<RouteNode, List<SitePinInst>> getLCBPinMappingsOnVersal(Net cl
             IntentCode.NODE_PINFEED,
             IntentCode.NODE_GLOBAL_LEAF
         );
-        Set<Node> used = new HashSet<>();
         Set<Node> visited = new HashSet<>();
         Queue<RouteNode> q = new LinkedList<>();
         Predicate<Node> isNodeUnavailable = (node) -> getNodeStatus.apply(node) == NodeStatus.UNAVAILABLE;
         RouteThruHelper routeThruHelper = new RouteThruHelper(clk.getDesign().getDevice());
 
         nextPin: for (SitePinInst p: clk.getPins()) {
             if (p.isOutPin()) continue;
-            Node intNode = RouterHelper.projectInputPinToINTNode(p);
-            RouteNode intRouteNode = new RouteNode(intNode.getTile(), intNode.getWireIndex(), null, 0);
+            Node sinkNode = p.getConnectedNode();
+            RouteNode sinkRouteNode = new RouteNode(sinkNode.getTile(), sinkNode.getWireIndex(), null, 0);
             ClockRegion cr = p.getTile().getClockRegion();
 
             q.clear();
-            q.add(intRouteNode);
+            q.add(sinkRouteNode);
 
             while (!q.isEmpty()) {
                 RouteNode curr = q.poll();
@@ -469,11 +466,14 @@ public static Map<RouteNode, List<SitePinInst>> getLCBPinMappingsOnVersal(Net cl
                     if (!uphill.getTile().getClockRegion().equals(cr)) continue;
                     if (!allowedIntentCodes.contains(uphill.getIntentCode())) continue;
                     if (!visited.add(uphill)) continue;
-                    if (used.contains(uphill)) continue;
+                    // if (used.contains(uphill)) continue;
                     if (routeThruHelper.isRouteThru(uphill, currNode) && currNode.getIntentCode() != IntentCode.NODE_IRI) continue;
                     if (isNodeUnavailable.test(uphill)) continue;
                     if (uphill.getIntentCode() == IntentCode.NODE_GLOBAL_LEAF) {
-                        RouteNode rn = new RouteNode(uphill.getTile(), uphill.getWireIndex(), null, 0);
+                        RouteNode rn = new RouteNode(uphill.getTile(), uphill.getWireIndex(), curr, curr.getLevel()+1);
+                        clk.getPIPs().addAll(rn.getPIPsForwardToSinkByNodes());
+                        rn.setParent(null);
+                        rn.setLevel(0);
                         lcbMappings.computeIfAbsent(rn, (k) -> new ArrayList<>()).add(p);
                         visited.clear();
                         continue nextPin;

diff --git a/test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java b/test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java
@@ -535,9 +535,6 @@ public void testSingleConnection(String partName,
     @Test
     public void testClockRoutingOnVersal() {
         Design design = RapidWrightDCP.loadDCP("two_clk_check_NetTools.dcp");
-        design.setTrackNetChanges(true);
-
-        // Pseudo-randomly unroute some pins from a multi-pin net
         for (Net net : design.getNets()) {
             if (NetTools.isGlobalClock(net)) {
                 net.unroute();
@@ -558,9 +555,6 @@ public void testClockRoutingOnVersal() {
         router.initialize();
         router.routeGlobalClkNets();
 
-        for (Net net : design.getModifiedNets()) {
-            assertAllPinsRouted(net);
-        }
         VivadoToolsHelper.assertFullyRouted(design);
     }
 }