PartialRouter to behave as master

Xilinx · Nov 23, 2022 · dc01d54 · dc01d54
1 parent 4c3d027
commit dc01d54
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/PartialRouter.java b/src/com/xilinx/rapidwright/rwroute/PartialRouter.java
@@ -34,6 +34,7 @@
 import java.util.stream.Collectors;
 
 import com.xilinx.rapidwright.design.Design;
+import com.xilinx.rapidwright.design.DesignTools;
 import com.xilinx.rapidwright.design.Net;
 import com.xilinx.rapidwright.design.SitePinInst;
 import com.xilinx.rapidwright.device.Node;
@@ -96,6 +97,15 @@ public PartialRouter(Design design, RWRouteConfig config, Collection<SitePinInst
         this(design, config, pinsToRoute, false);
     }
 
+    @Override
+    protected void preprocess() {
+        // Pre-processing of the design regarding physical net names pins
+        DesignTools.makePhysNetNamesConsistent(design);
+        // FIXME: Enable for PartialRouter
+        // DesignTools.createPossiblePinsToStaticNets(design);
+        DesignTools.createMissingSitePinInsts(design);
+    }
+
     /**
      * Checks whether this arc is part of an existing route.
      * For Nets containing at least one Connection to be routed, all fully routed
@@ -268,18 +278,17 @@ protected void addGlobalClkRoutingTargets(Net clk) {
     protected void addStaticNetRoutingTargets(Net staticNet) {
         preserveNet(staticNet);
 
-        List<SitePinInst> sinks = staticNet.getSinkPins();
-        if (sinks.size() > 0) {
-            sinks.removeIf(SitePinInst::isRouted);
-            if (sinks.isEmpty()) {
+        List<SitePinInst> staticPins = netToPins.get(staticNet);
+        if (staticPins == null || staticPins.isEmpty()) {
+            if (staticNet.hasPIPs()) {
                 increaseNumPreservedStaticNets();
             } else {
-                addStaticNetRoutingTargets(staticNet, sinks);
+                increaseNumNotNeedingRouting();
             }
-
-        } else {// internally routed (sinks.size = 0)
-            increaseNumNotNeedingRouting();
+            return;
         }
+
+        addStaticNetRoutingTargets(staticNet, staticPins);
     }
 
     @Override

diff --git a/test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java b/test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java
@@ -107,7 +107,8 @@ public void testNonTimingDrivenPartialRouting() {
         String dcpPath = RapidWrightDCP.getString("picoblaze_partial.dcp");
         Design design = Design.readCheckpoint(dcpPath);
         DesignTools.createMissingSitePinInsts(design);
-        DesignTools.createPossiblePinsToStaticNets(design);
+        // FIXME:
+        // DesignTools.createPossiblePinsToStaticNets(design);
 
         List<SitePinInst> pinsToRoute = new ArrayList<>();
         for (Net net : design.getNets()) {