[RapidWright] Pull in PhysNetlistWriter + RWRoute fixes (Xilinx#53)

* Update to latest RapidWright Signed-off-by: Eddie Hung <[email protected]> * Switch over to temp URL Signed-off-by: Eddie Hung <[email protected]> * Temporarily switch RapidWright over to 'physnetwriter_fix_static' branch Signed-off-by: Eddie Hung <[email protected]> * Print GND/VCC stubs in GHA Signed-off-by: Eddie Hung <[email protected]> * Fix net_printer workflow Signed-off-by: Eddie Hung <[email protected]> * Update RapidWright submodule Signed-off-by: Eddie Hung <[email protected]> --------- Signed-off-by: Eddie Hung <[email protected]>
eddieh-xlnx · Dec 23, 2023 · f93f853 · f93f853
1 parent b418ed8
commit f93f853
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/net_printer.yml b/.github/workflows/net_printer.yml
@@ -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:

diff --git a/Makefile b/Makefile
@@ -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)))))

diff --git a/RapidWright b/RapidWright
+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