Update to RapidWright 2024.2.3, Java 21, extend nxroute area (Xilinx#100)

* Revert "[Actions] Downgrade to Java 17 (Xilinx#41)"

This reverts commit 2a11b91.

Signed-off-by: Eddie Hung <[email protected]>

* Update RapidWright to v2024.2.3

Signed-off-by: Eddie Hung <[email protected]>

* Update gradle to 8.14

Signed-off-by: Eddie Hung <[email protected]>

* Try bigger nxroute area

Signed-off-by: Eddie Hung <[email protected]>

* Grow nxroute area some more

Signed-off-by: Eddie Hung <[email protected]>

* Move RapidWright to 'rwroute_always_target' branch

Signed-off-by: Eddie Hung <[email protected]>

* Re-set RapidWright to rwroute_always_target

Signed-off-by: Eddie Hung <[email protected]>

* Pull back nxroute region

Signed-off-by: Eddie Hung <[email protected]>

* Move RapidWright back to master

Signed-off-by: Eddie Hung <[email protected]>

* Use 'python3 -m pip' instead

Signed-off-by: Eddie Hung <[email protected]>

---------

Signed-off-by: Eddie Hung <[email protected]>

Author: eddieh-xlnx

.github/workflows/make.yml

@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
       - if: matrix.router == 'nxroute-poc'
         uses: actions/setup-python@v5

.github/workflows/scoring_criteria.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: '3.12'
           check-latest: true
-          #cache: 'pip'
+          cache: 'pip'
       - run: |
           cd scoring_formula
           python3 -m unittest test_scoring_formula.py -v

Makefile

@@ -82,7 +82,7 @@ compile-java:
 	_JAVA_OPTIONS="$(JAVA_PROXY)" ./gradlew compileJava
 	_JAVA_OPTIONS="$(JAVA_PROXY)" RapidWright/bin/rapidwright Jython -c "FileTools.ensureDataFilesAreStaticInstallFriendly('xcvu3p')"
 install-python-deps:
-	pip install -q -r requirements.txt --pre --user
+	python3 -m pip install -q -r requirements.txt --pre --user
 else
 compile-java install-python-deps:
 	@echo "$@ target skipped since network disabled inside apptainer"

RapidWright

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -60,11 +60,11 @@ class NxRoutingGraph(nx.DiGraph):
         to graph node and edge to PIP lookups.
         """
 
-        # Clock Region X2Y1 (requires ~5GB RAM)
+        # Clock Region X2Y1:X4Y3 (requires <16GB RAM)
         MIN_X = 36
-        MAX_X = 56
+        MAX_X = 90
         MIN_Y = 60
-        MAX_Y = 119
+        MAX_Y = 239
 
         # Entire device (requires ~50GB RAM)
         # MIN_X = 0