Fix test to realize spi removals. Add isAlias() check

Signed-off-by: Chris Lavin <chris.lavin@amd.com>

Author: clavin-xlnx

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

@@ -2712,7 +2712,7 @@ public static List<EDIFHierPortInst> getPortInstsFromSitePinInst(SitePinInst sit
                                 Cell c = siteInst.getCell(pin.getBEL());
                                 if (c != null) {
                                     EDIFHierPortInst portInst = getPortInstFromBELPin(siteInst, pin);
-                                    if (portInst != null && portInst.getHierarchicalNet()
+                                    if (portInst != null && sitePin.getNet() != null && portInst.getHierarchicalNet()
                                             .isAlias(sitePin.getNet().getLogicalHierNet())) {
                                         portInsts.add(portInst);
                                     }

src/com/xilinx/rapidwright/eco/ECOTools.java

@@ -442,6 +442,7 @@ public static void connectNet(Design design,
                         if (spi == null) {
                             continue;
                         }
+                        assert (spi.getNet() == null || spi.getNet().getLogicalHierNet().isAlias(ehn));
                         // Check that all port insts serviced by this SPI are on this net
                         List<EDIFHierPortInst> portInstsOnSpi = DesignTools.getPortInstsFromSitePinInst(spi);
                         assert(portInstsOnSpi.contains(ehpi));

src/com/xilinx/rapidwright/edif/EDIFTools.java

@@ -632,6 +632,7 @@ public static void connectPortInstsThruHier(EDIFHierPortInst src, EDIFHierPortIn
             }
         }
         // Make final connection in the common ancestor instance
+        assert (finalSrc.getNet().getParentCell().equals(finalSnk.getParentCell()));
         finalSrc.getNet().addPortInst(finalSnk.getPortInst());
     }
 

test/src/com/xilinx/rapidwright/eco/TestECOTools.java

@@ -211,6 +211,8 @@ public void testConnectNetSwapSinks() {
         }
         ECOTools.disconnectNet(design, disconnectPins, deferredRemovals);
         Assertions.assertEquals(14, deferredRemovals.size());
+        DesignTools.batchRemoveSitePins(deferredRemovals, true);
+        deferredRemovals.clear();
 
         // Re-connect those inputs to some other nets
         final Map<EDIFHierNet, List<EDIFHierPortInst>> netToPortInsts = new HashMap<>();