Skip to content
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

[RapidWright] Pull in PhysNetlistWriter + RWRoute fixes #53

Merged
merged 6 commits into from
Dec 23, 2023
Merged

[RapidWright] Pull in PhysNetlistWriter + RWRoute fixes #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adc44d8
Update to latest RapidWright
eddieh-xlnx Dec 20, 2023
bde29e8
Switch over to temp URL
eddieh-xlnx Dec 20, 2023
705269c
Temporarily switch RapidWright over to 'physnetwriter_fix_static' branch
eddieh-xlnx Dec 22, 2023
9c5085e
Print GND/VCC stubs in GHA
eddieh-xlnx Dec 22, 2023
ab7c8ff
Fix net_printer workflow
eddieh-xlnx Dec 22, 2023
8d54f7c
Update RapidWright submodule
eddieh-xlnx Dec 23, 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
13 changes: 11 additions & 2 deletions .github/workflows/net_printer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,18 @@ jobs:
cache: 'pip'
- run:
make setup-net_printer download-benchmarks
- name: Print static nets
- name: Print GND net
run:
python3 net_printer/np.py ${{ matrix.benchmark }}_unrouted.phys GLOBAL_LOGIC0 GLOBAL_LOGIC1
python3 net_printer/np.py ${{ matrix.benchmark }}_unrouted.phys GLOBAL_LOGIC0 | tee gnd.physnet
- name: Print GND stubs
run: |
sed -n -e '/Stub: 0/,$p' gnd.physnet
- name: Print VCC net
run:
python3 net_printer/np.py ${{ matrix.benchmark }}_unrouted.phys GLOBAL_LOGIC1 | tee vcc.physnet
- name: Print VCC stubs
run: |
sed -n -e '/Stub: 0/,$p' vcc.physnet
- name: Print largest global net (corundum_25g)
if: matrix.benchmark == 'corundum_25g'
run:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BENCHMARKS ?= boom_med_pb \
ispd16_example2


BENCHMARKS_URL = https://github.com/Xilinx/fpga24_routing_contest/releases/latest/download/benchmarks.tar.gz
BENCHMARKS_URL = https://github.com/eddieh-xlnx/fpga24_routing_contest/releases/download/benchmarks/benchmarks.tar.gz

# Inherit proxy settings from the host if they exist
HTTPHOST=$(firstword $(subst :, ,$(subst http:,,$(subst /,,$(HTTP_PROXY)))))
Expand Down
2 changes: 1 addition & 1 deletion RapidWright
Open in desktop
Submodule RapidWright updated 22 files
+3 −0 build.gradle
+123 −9 src/com/xilinx/rapidwright/design/DesignTools.java
+12 −4 src/com/xilinx/rapidwright/design/tools/LUTTools.java
+133 −23 src/com/xilinx/rapidwright/eco/ECOTools.java
+16 −0 src/com/xilinx/rapidwright/edif/EDIFCellInst.java
+19 −0 src/com/xilinx/rapidwright/edif/EDIFPortInst.java
+3 −1 src/com/xilinx/rapidwright/edif/EDIFPropertyValue.java
+71 −21 src/com/xilinx/rapidwright/interchange/PhysNetlistWriter.java
+4 −0 src/com/xilinx/rapidwright/interchange/RouteBranchNode.java
+7 −3 src/com/xilinx/rapidwright/router/RouteThruHelper.java
+28 −9 src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java
+12 −5 src/com/xilinx/rapidwright/rwroute/PartialRouter.java
+11 −2 src/com/xilinx/rapidwright/rwroute/RWRoute.java
+5 −23 src/com/xilinx/rapidwright/rwroute/RouteNode.java
+9 −19 src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java
+16 −18 src/com/xilinx/rapidwright/rwroute/RouterHelper.java
+1 −1 src/com/xilinx/rapidwright/util/MakeBlackBox.java
+54 −0 test/src/com/xilinx/rapidwright/eco/TestECOTools.java
+50 −2 test/src/com/xilinx/rapidwright/interchange/TestPhysNetlistWriter.java
+12 −3 test/src/com/xilinx/rapidwright/router/TestRouteThruHelper.java
+1 −1 test/src/com/xilinx/rapidwright/rwroute/TestGlobalSignalRouting.java
+117 −28 test/src/com/xilinx/rapidwright/rwroute/TestRouterHelper.java