Skip to content

Commit

Permalink
Undo part of #636
Browse files Browse the repository at this point in the history
Signed-off-by: Eddie Hung <[email protected]>
  • Loading branch information
eddieh-xlnx committed May 3, 2023
1 parent 39aa81e commit 8765ac5
Showing 1 changed file with 1 addition and 32 deletions.
33 changes: 1 addition & 32 deletions src/com/xilinx/rapidwright/interchange/PhysNetlistReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -118,8 +119,6 @@ public static Design readPhysNetlist(String physNetlistFileName, EDIFNetlist net

readDesignProperties(physNetlist, design, allStrings);

postProcess(design);

return design;
}

Expand Down Expand Up @@ -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());
}
}
}
}
}
}

0 comments on commit 8765ac5

Please sign in to comment.