Array Builder Automated Placement and Various Fixes

src/com/xilinx/rapidwright/design/DesignTools.java

@@ -2282,7 +2282,9 @@ public static List<SitePinInst> createMissingSitePinInsts(Design design, Net net
                     if (siteWireNet == null) {
                         if (isVersal && net.isStaticNet() && bel.isLUT()) {
                             siteWireNet = net;
-                            si.routeIntraSiteNet(net, belPin, belPin);
+                            synchronized (si) {
+                                si.routeIntraSiteNet(net, belPin, belPin);
+                            }
                         } else {
                             continue;
                         }
@@ -2299,16 +2301,19 @@ public static List<SitePinInst> createMissingSitePinInsts(Design design, Net net
                                     "'" + net.getName() + "'");
                         }
                     }
-                    String sitePinName = getRoutedSitePinFromPhysicalPin(c, siteWireNet, physPin);
-                    if (sitePinName == null) continue;
-                    SitePinInst newPin = si.getSitePinInst(sitePinName);
-                    if (newPin != null) continue;
-                    if (sitePinName.equals("IO") && Utils.isIOB(si)) {
-                        // Do not create a SitePinInst for the "IO" input site pin of any IOB site,
-                        // since the sitewire it drives is assumed to be driven by the IO PAD.
-                        continue;
+                    SitePinInst newPin;
+                    synchronized (si) {
+                        String sitePinName = getRoutedSitePinFromPhysicalPin(c, siteWireNet, physPin);
+                        if (sitePinName == null) continue;
+                        newPin = si.getSitePinInst(sitePinName);
+                        if (newPin != null) continue;
+                        if (sitePinName.equals("IO") && Utils.isIOB(si)) {
+                            // Do not create a SitePinInst for the "IO" input site pin of any IOB site,
+                            // since the sitewire it drives is assumed to be driven by the IO PAD.
+                            continue;
+                        }
+                        newPin = net.createPin(sitePinName, si);
                     }
-                    newPin = net.createPin(sitePinName, si);
                     if (newPin != null) newPins.add(newPin);
                 }
             }
@@ -2460,9 +2465,9 @@ public static List<String> getAllRoutedSitePinsFromPhysicalPin(Cell cell, Net ne
      */
     public static void createMissingSitePinInsts(Design design) {
         EDIFNetlist netlist = design.getNetlist();
-        for (Net net : design.getNets()) {
+        design.getNets().parallelStream().forEach((net) -> {
             if (net.isUsedNet()) {
-                continue;
+                return;
             }
             EDIFHierNet ehn = net.getLogicalHierNet();
             EDIFHierNet parentEhn = (ehn != null) ? netlist.getParentNet(ehn) : null;
@@ -2472,11 +2477,11 @@ public static void createMissingSitePinInsts(Design design) {
                     // 'net' is not a parent net (which normally causes createMissingSitePinInsts(Design, Net)
                     // to analyze its parent net) but that parent net also exist in the design and has been/
                     // will be analyzed in due course, so skip doing so here
-                    continue;
+                    return;
                 }
             }
             createMissingSitePinInsts(design,net);
-        }
+        });
     }
 
     private static HashSet<String> muxPins;
@@ -3308,7 +3313,7 @@ public static void printSiteInstInfo(SiteInst siteInst, PrintStream ps) {
     public static void makePhysNetNamesConsistent(Design design) {
         Map<EDIFHierNet, EDIFHierNet> netParentMap = design.getNetlist().getParentNetMap();
         EDIFNetlist netlist = design.getNetlist();
-        for (Net net : new ArrayList<>(design.getNets())) {
+        new ArrayList<>(design.getNets()).parallelStream().forEach((net) -> {
             Net parentPhysNet = null;
             if (net.isStaticNet()) {
                 if (net.getType() == NetType.GND) {
@@ -3319,19 +3324,19 @@ public static void makePhysNetNamesConsistent(Design design) {
                     throw new RuntimeException();
                 }
                 if (parentPhysNet == net) {
-                    continue;
+                    return;
                 }
             } else {
                 EDIFHierNet hierNet = netlist.getHierNetFromName(net.getName());
                 if (hierNet == null) {
                     // Likely an encrypted cell
-                    continue;
+                    return;
                 }
                 EDIFHierNet parentHierNet = netParentMap.get(hierNet);
                 if (parentHierNet == null) {
                     // System.out.println("WARNING: Couldn't find parent net for '" +
                     //         hierNet.getHierarchicalNetName() + "'");
-                    continue;
+                    return;
                 }
 
                 // Check to make sure net is not improperly categorized
@@ -3366,7 +3371,7 @@ public static void makePhysNetNamesConsistent(Design design) {
             if (parentPhysNet != null) {
                 design.movePinsToNewNetDeleteOldNet(net, parentPhysNet, true);
             }
-        }
+        });
     }
 
     public static void createPossiblePinsToStaticNets(Design design) {

src/com/xilinx/rapidwright/design/NetTools.java

@@ -284,13 +284,13 @@ public static List<Net> getNetsWithOverlappingNodes(Design design) {
         Map<Node, Net> used = new HashMap<>();
         for (Net net : design.getNets()) {
             for (PIP pip : net.getPIPs()) {
-                for (Node node : new Node[] { pip.getStartNode(), pip.getEndNode() }) {
+                for (Node node : new Node[]{pip.getStartNode(), pip.getEndNode()}) {
                     if (node == null)
                         continue;
                     Net existing = used.putIfAbsent(node, net);
                     if (existing != null && existing != net) {
                         for (PIP oldPip : new ArrayList<>(existing.getPIPs())) {
-                            for (Node oldNode : new Node[] { oldPip.getStartNode(), oldPip.getEndNode() }) {
+                            for (Node oldNode : new Node[]{oldPip.getStartNode(), oldPip.getEndNode()}) {
                                 used.remove(oldNode);
                             }
                         }