From 8765ac5ee6af82d517fb2c84d331792d26067d13 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 2 May 2023 17:42:00 -0700 Subject: [PATCH] Undo part of #636 Signed-off-by: Eddie Hung --- .../interchange/PhysNetlistReader.java | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/src/com/xilinx/rapidwright/interchange/PhysNetlistReader.java b/src/com/xilinx/rapidwright/interchange/PhysNetlistReader.java index 5481c5229..1a39cb52e 100644 --- a/src/com/xilinx/rapidwright/interchange/PhysNetlistReader.java +++ b/src/com/xilinx/rapidwright/interchange/PhysNetlistReader.java @@ -33,6 +33,7 @@ import java.util.Queue; import java.util.Set; +import com.xilinx.rapidwright.design.tools.LUTTools; import com.xilinx.rapidwright.device.Series; import com.xilinx.rapidwright.device.SitePIP; import org.capnproto.MessageReader; @@ -118,8 +119,6 @@ public static Design readPhysNetlist(String physNetlistFileName, EDIFNetlist net readDesignProperties(physNetlist, design, allStrings); - postProcess(design); - return design; } @@ -800,34 +799,4 @@ else if (isPlaced != isCellPlaced) { } } } - - private static void postProcess(Design design) { - final Series series = design.getDevice().getSeries(); - - if (series == Series.UltraScalePlus || series == Series.UltraScale) { - // To be consistent with Vivado DCPs, remove all intra-site routing for - // SRST* pins tied to ground on these series of devices. - // (Note: this condition is necessary for {@link DesignTools#createCeSrRstPinsToVCC()}) - String[] siteWires = new String[]{"RST_ABCDINV_OUT", "RST_EFGHINV_OUT"}; - for (SiteInst si : design.getSiteInsts()) { - if (!Utils.isSLICE(si)) { - continue; - } - for (String sw : siteWires) { - Net net = si.getNetFromSiteWire(sw); - if (net != null && net.getType() == NetType.GND) { - BELPin belPin = si.getSiteWirePins(sw)[0]; - assert(belPin.isOutput()); - BEL bel = belPin.getBEL(); - assert(bel.getBELClass() == BELClass.RBEL); - assert(bel.getInvertingPin() == bel.getNonInvertingPin()); - SitePIP sp = si.getSitePIP(belPin); - Net inputNet = si.getNetFromSiteWire(sp.getInputPin().getSiteWireName()); - assert(inputNet == null || inputNet.isStaticNet()); - si.unrouteIntraSiteNet(sp.getInputPin(), sp.getOutputPin()); - } - } - } - } - } }