Skip to content

Update RapidWright submodule #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 16, 2023
Merged

Update RapidWright submodule #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
051fd28
Update RapidWright to latest
eddieh-xlnx Nov 16, 2023
2719a64
PartialRouterPhysNetlist to call PartialRouter differently
eddieh-xlnx Nov 16, 2023
3092b05
python3 instead of python
eddieh-xlnx Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ fpga-interchange-schema/interchange/capnp/java.capnp:

.PHONY: score-$(ROUTER)
score-$(ROUTER): $(addsuffix _$(ROUTER).wirelength, $(BENCHMARKS)) $(addsuffix _$(ROUTER).check, $(BENCHMARKS))
python ./compute-score.py $(addsuffix _$(ROUTER), $(BENCHMARKS))
python3 ./compute-score.py $(addsuffix _$(ROUTER), $(BENCHMARKS))

.PRECIOUS: %.device
%.device: | compile-java
Expand Down
2 changes: 1 addition & 1 deletion RapidWright
Open in desktop
Submodule RapidWright updated 50 files
+2 −2 .classpath
+1 −1 .github/workflows/build.yml
+1 −1 CONTRIBUTING.md
+2 −2 Makefile
+59 −0 RELEASE_NOTES.TXT
+1 −0 build.gradle
+7 −7 interchange/README.md
+1 −1 python/setup.py
+1 −1 python/src/rapidwright/rapidwright.py
+82 −40 src/com/xilinx/rapidwright/design/DesignTools.java
+53 −7 src/com/xilinx/rapidwright/design/ModuleInst.java
+34 −40 src/com/xilinx/rapidwright/design/tools/RelocationTools.java
+305 −0 src/com/xilinx/rapidwright/eco/ECOPlacementHelper.java
+1,087 −0 src/com/xilinx/rapidwright/eco/ECOTools.java
+29 −5 src/com/xilinx/rapidwright/edif/EDIFNetlist.java
+26 −102 src/com/xilinx/rapidwright/examples/MultGenerator.java
+37 −30 src/com/xilinx/rapidwright/examples/PipelineGeneratorWithRouting.java
+56 −94 src/com/xilinx/rapidwright/examples/PolynomialGenerator.java
+16 −11 src/com/xilinx/rapidwright/gui/GUIModuleInst.java
+2 −3 src/com/xilinx/rapidwright/interchange/DcpToInterchange.java
+182 −10 src/com/xilinx/rapidwright/interchange/Interchange.java
+5 −1 src/com/xilinx/rapidwright/router/RouteNode.java
+70 −12 src/com/xilinx/rapidwright/router/RouteThruHelper.java
+5 −0 src/com/xilinx/rapidwright/router/UltraScaleClockRouting.java
+80 −47 src/com/xilinx/rapidwright/rwroute/PartialRouter.java
+109 −60 src/com/xilinx/rapidwright/rwroute/RWRoute.java
+51 −4 src/com/xilinx/rapidwright/rwroute/RWRouteConfig.java
+33 −25 src/com/xilinx/rapidwright/rwroute/RouterHelper.java
+1 −1 src/com/xilinx/rapidwright/rwroute/TimingAndWirelengthReport.java
+26 −7 src/com/xilinx/rapidwright/util/FileTools.java
+4 −3 src/com/xilinx/rapidwright/util/PerformanceExplorer.java
+1 −1 src/com/xilinx/rapidwright/util/ReportRouteStatusResult.java
+2 −1 src/com/xilinx/rapidwright/util/Utils.java
+46 −0 src/com/xilinx/rapidwright/util/VivadoTools.java
+1 −1 test/RapidWrightDCP
+2 −2 test/src/com/xilinx/rapidwright/design/TestDCPLoad.java
+25 −1 test/src/com/xilinx/rapidwright/design/TestDesign.java
+136 −0 test/src/com/xilinx/rapidwright/design/TestDesignTools.java
+42 −0 test/src/com/xilinx/rapidwright/design/TestModuleInst.java
+42 −35 test/src/com/xilinx/rapidwright/design/TestRelocationTools.java
+162 −0 test/src/com/xilinx/rapidwright/eco/TestECOPlacementHelper.java
+438 −0 test/src/com/xilinx/rapidwright/eco/TestECOTools.java
+25 −0 test/src/com/xilinx/rapidwright/edif/TestEDIFHierPortInst.java
+21 −0 test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java
+84 −0 test/src/com/xilinx/rapidwright/examples/TestPolynomialGenerator.java
+60 −0 test/src/com/xilinx/rapidwright/router/TestRouteNode.java
+89 −0 test/src/com/xilinx/rapidwright/router/TestRouteThruHelper.java
+83 −16 test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java
+42 −1 test/src/com/xilinx/rapidwright/rwroute/TestRouterHelper.java
+11 −0 test/src/com/xilinx/rapidwright/util/TestVivadoTools.java
18 changes: 17 additions & 1 deletion src/com/xilinx/fpga24_routing_contest/PartialRouterPhysNetlist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,27 @@ public static void main(String[] args) throws IOException {
continue;
}
if (!net.hasPIPs()) {
// Route only nets with no PIPs
pinsToRoute.addAll(net.getSinkPins());
}
}

boolean softPreserve = false;
PartialRouter.routeDesignPartialNonTimingDriven(design, pinsToRoute, softPreserve);
PartialRouter.routeDesignWithUserDefinedArguments(design, new String[] {
// Same options as PartialRouter.routeDesignPartialTimingDriven()
"--fixBoundingBox",
"--useUTurnNodes",
"--nonTimingDriven",
"--verbose",
// These options are set to their default value, a subset of which are duplicated here
// to ease modification; full documentation is available in RWRouteConfig.java
"--maxIterations", "100",
"--wirelengthWeight", "0.8",
"--initialPresentCongestionFactor", "0.5",
"--presentCongestionMultiplier", "2",
"--historicalCongestionFactor", "1",
},
pinsToRoute, softPreserve);

// Write routed result to new Physical Netlist
PhysNetlistWriter.writePhysNetlist(design, args[1]);
Expand Down