Support for JDK25.0.2 and migrate Graal compiler version to 25.0.2

.github/workflows/build-test-jdk25.yml

@@ -0,0 +1,182 @@
+name: Build & Test JDK 25
+
+on:
+  push:
+    branches: [jdk25]
+  workflow_dispatch:
+
+jobs:
+  code-quality:
+    if: github.repository == 'beehive-lab/TornadoVM'
+    runs-on: [self-hosted, Linux, x64]
+    env:
+      JAVA_HOME: /opt/jenkins/jdks/jdk-25.0.2
+      MAVEN_HOME: /opt/maven
+    timeout-minutes: 5
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Checkstyle
+        run: |
+          export PATH=$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH
+          ./mvnw checkstyle:check
+
+  build-opencl:
+    if: github.repository == 'beehive-lab/TornadoVM'
+    runs-on: [self-hosted, Linux, x64]
+    needs: code-quality
+    timeout-minutes: 20
+    env:
+      JAVA_HOME: /opt/jenkins/jdks/jdk-25.0.2
+      CMAKE_ROOT: /opt/jenkins/cmake-3.25.2-linux-x86_64
+      MAVEN_HOME: /opt/maven
+      GRAAL_JARS: /opt/graal25Jars/
+      TORNADO_ROOT: ${{ github.workspace }}
+      TORNADOVM_HOME: ${{ github.workspace }}/bin/sdk
+      VENV_PATH: ${{ github.workspace }}/venv-opencl
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup environment
+        run: |
+          echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+          echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
+
+      - name: Setup Python venv
+        run: |
+          python3 -m venv $VENV_PATH
+          source $VENV_PATH/bin/activate
+          pip install --upgrade pip tqdm psutil
+
+      - name: Build TornadoVM (opencl)
+        run: |
+          mkdir -p graalJars && cp $GRAAL_JARS/* graalJars/
+          source $VENV_PATH/bin/activate
+          make jdk25 BACKEND=opencl
+
+      - name: Run opencl fast unit tests
+        run: |
+          source $VENV_PATH/bin/activate
+          source setvars.sh
+          tornado --devices
+          make fast-tests
+
+  build-ptx:
+    if: github.repository == 'beehive-lab/TornadoVM'
+    runs-on: [self-hosted, Linux, x64]
+    needs: build-opencl
+    timeout-minutes: 20
+    env:
+      JAVA_HOME: /opt/jenkins/jdks/jdk-25.0.2
+      CMAKE_ROOT: /opt/jenkins/cmake-3.25.2-linux-x86_64
+      MAVEN_HOME: /opt/maven
+      GRAAL_JARS: /opt/graal25Jars/
+      TORNADO_ROOT: ${{ github.workspace }}
+      TORNADOVM_HOME: ${{ github.workspace }}/bin/sdk
+      VENV_PATH: ${{ github.workspace }}/venv-ptx
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup environment
+        run: |
+          echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+          echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
+
+      - name: Setup Python venv
+        run: |
+          python3 -m venv $VENV_PATH
+          source $VENV_PATH/bin/activate
+          pip install --upgrade pip tqdm psutil
+
+      - name: Build TornadoVM (ptx)
+        run: |
+          mkdir -p graalJars && cp $GRAAL_JARS/* graalJars/
+          source $VENV_PATH/bin/activate
+          make jdk25 BACKEND=ptx
+
+      - name: Run ptx fast unit tests
+        run: |
+          source $VENV_PATH/bin/activate
+          source setvars.sh
+          make fast-tests
+
+  build-spirv:
+    if: github.repository == 'beehive-lab/TornadoVM'
+    runs-on: [self-hosted, Linux, x64]
+    needs: code-quality
+    timeout-minutes: 20
+    env:
+      JAVA_HOME: /opt/jenkins/jdks/jdk-25.0.2
+      CMAKE_ROOT: /opt/jenkins/cmake-3.25.2-linux-x86_64
+      MAVEN_HOME: /opt/maven
+      GRAAL_JARS: /opt/graal25Jars/
+      TORNADO_ROOT: ${{ github.workspace }}
+      TORNADOVM_HOME: ${{ github.workspace }}/bin/sdk
+      VENV_PATH: ${{ github.workspace }}/venv-spirv
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup environment
+        run: |
+          echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+          echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
+
+      - name: Setup Python venv
+        run: |
+          python3 -m venv $VENV_PATH
+          source $VENV_PATH/bin/activate
+          pip install --upgrade pip tqdm psutil
+
+      - name: Build TornadoVM (spirv)
+        run: |
+          mkdir -p graalJars && cp $GRAAL_JARS/* graalJars/
+          source $VENV_PATH/bin/activate
+          make jdk25 BACKEND=spirv
+
+      - name: Run spirv fast unit tests
+        run: |
+          source $VENV_PATH/bin/activate
+          source setvars.sh
+          make fast-tests
+
+  build-macOs-opencl:
+    if: github.repository == 'beehive-lab/TornadoVM'
+    runs-on: [self-hosted, macOS, arm64]
+    needs: code-quality
+    timeout-minutes: 45
+    env:
+      JAVA_HOME: /opt/jenkins/jdks/jdk-25.0.2.jdk/Contents/Home
+      TORNADO_ROOT: ${{ github.workspace }}
+      TORNADOVM_HOME: ${{ github.workspace }}/bin/sdk
+      VENV_PATH: ${{ github.workspace }}/venv-opencl
+      CMAKE_ROOT: /opt/homebrew/bin/cmake
+      MAVEN_HOME: /opt/homebrew/bin/mvn
+      GRAAL_JARS: /opt/graal25Jars
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup environment
+        run: |
+          echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+          echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
+
+      - name: Setup Python venv
+        run: |
+          python3 -m venv $VENV_PATH
+          source $VENV_PATH/bin/activate
+          pip install --upgrade pip tqdm psutil
+
+      - name: Build TornadoVM (opencl)
+        run: |
+          mkdir -p graalJars && cp $GRAAL_JARS/* graalJars/
+          source $VENV_PATH/bin/activate
+          make jdk25 BACKEND=opencl
+
+      - name: Run opencl fast unit tests
+        run: |
+          source $VENV_PATH/bin/activate
+          source setvars.sh
+          tornado --devices
+          make fast-tests

Makefile

@@ -4,35 +4,35 @@ all: build
 # make BACKEND=<comma_separated_backend_list>
 BACKEND ?= opencl
 
-build jdk21:
-	bin/compile --jdk jdk21 --backend $(BACKEND)
+build jdk25:
+	bin/compile --jdk jdk25 --backend $(BACKEND)
 
-rebuild-deps-jdk21:
-	bin/compile --jdk jdk21 --rebuild --backend $(BACKEND)
+rebuild-deps-jdk25:
+	bin/compile --jdk jdk25 --rebuild --backend $(BACKEND)
 
-graal-jdk-21:
-	bin/compile --jdk graal-jdk-21 --backend $(BACKEND)
+graal-jdk-25:
+	bin/compile --jdk graal-jdk-25 --backend $(BACKEND)
 
 polyglot:
-	bin/compile --jdk graal-jdk-21 --backend $(BACKEND) --polyglot
+	bin/compile --jdk graal-jdk-25 --backend $(BACKEND) --polyglot
 
-mvn-single-threaded-jdk21:
-	bin/compile --jdk jdk21 --backend $(BACKEND) --mvn_single_threaded
+mvn-single-threaded-jdk25:
+	bin/compile --jdk jdk25 --backend $(BACKEND) --mvn_single_threaded
 
-mvn-single-threaded-graal-jdk-21:
-	bin/compile --jdk graal-jdk-21 --backend $(BACKEND) --mvn_single_threaded
+mvn-single-threaded-graal-jdk-25:
+	bin/compile --jdk graal-jdk-25 --backend $(BACKEND) --mvn_single_threaded
 
 mvn-single-threaded-polyglot:
-	bin/compile --jdk graal-jdk-21 --backend $(BACKEND) --mvn_single_threaded --polyglot
+	bin/compile --jdk graal-jdk-25 --backend $(BACKEND) --mvn_single_threaded --polyglot
 
 ptx:
-	bin/compile --jdk jdk21 --backend ptx,opencl
+	bin/compile --jdk jdk25 --backend ptx,opencl
 
 spirv:
-	bin/compile --jdk jdk21 --backend spirv,ptx,opencl
+	bin/compile --jdk jdk25 --backend spirv,ptx,opencl
 
 sdk:
-	bin/compile --jdk jdk21 --sdk --backend $(BACKEND)
+	bin/compile --jdk jdk25 --sdk --backend $(BACKEND)
 
 # Variable passed for the preparation of the Xilinx FPGA emulated target device. The default device is `xilinx_u50_gen3x16_xdma_201920_3`.
 # make xilinx_emulation FPGA_PLATFORM=<platform_name> NUM_OF_FPGA_DEVICES=<number_of_devices>
@@ -54,43 +54,43 @@ example:
 tests:
 	rm -f tornado_unittests.log
 	tornado --devices
-	tornado-test --ea --verbose
-	tornado-test --ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	tornado-test --verbose
+	tornado-test -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	test-native.sh
 
 fast-tests:
 	rm -f tornado_unittests.log
 	tornado --devices
-	tornado-test --ea --verbose --quickPass
-	tornado-test --ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	tornado-test --verbose --quickPass
+	tornado-test -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	test-native.sh
 
 tests-uncompressed:
 	rm -f tornado_unittests.log
 	tornado --devices
-	tornado-test --ea --verbose --uncompressed
-	tornado-test --ea -V --uncompressed -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	tornado-test --verbose --uncompressed
+	tornado-test -V --uncompressed -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	test-native.sh
 
 fast-tests-uncompressed:
 	rm -f tornado_unittests.log
 	tornado --devices
-	tornado-test --ea --verbose --quickPass --uncompressed
-	tornado-test --ea -V --uncompressed -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	tornado-test --verbose --quickPass --uncompressed
+	tornado-test -V --uncompressed -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	test-native.sh	
 
 tests-spirv-levelzero:
 	rm -f tornado_unittests.log
 	tornado --jvm="-Dtornado.spirv.dispatcher=levelzero" uk.ac.manchester.tornado.drivers.TornadoDeviceQuery --params="verbose"
-	tornado-test --jvm="-Dtornado.spirv.dispatcher=levelzero" --ea --verbose
-	tornado-test --jvm="-Dtornado.spirv.dispatcher=levelzero"--ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	tornado-test --jvm="-Dtornado.spirv.dispatcher=levelzero" --verbose
+	tornado-test --jvm="-Dtornado.spirv.dispatcher=levelzero" -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	test-native.sh
 
 tests-spirv-opencl:
 	rm -f tornado_unittests.log
 	tornado --jvm="-Dtornado.spirv.dispatcher=opencl" uk.ac.manchester.tornado.drivers.TornadoDeviceQuery --params="verbose"
-	tornado-test --jvm="-Dtornado.spirv.dispatcher=opencl" --ea --verbose
-	tornado-test --jvm="-Dtornado.spirv.dispatcher=opencl"--ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	tornado-test --jvm="-Dtornado.spirv.dispatcher=opencl"  --verbose
+	tornado-test --jvm="-Dtornado.spirv.dispatcher=opencl" -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	test-native.sh
 
 test-slam:

bin/compile

@@ -74,7 +74,7 @@ def check_java_version():
         os.environ['JAVA_HOME']
         print("[OK]")
     except:
-        print("[ERROR] \n\t JAVA_HOME env variable not defined\n\n \t Suggestion (Linux and OSx): export JAVA_HOME=<path-to-jdk21>\n"),
+        print("[ERROR] \n\t JAVA_HOME env variable not defined\n\n \t Suggestion (Linux and OSx): export JAVA_HOME=<path-to-jdk25>\n"),
         sys.exit(-1)
 
     """
@@ -108,7 +108,7 @@ def pull_graal_jars_if_needed(graal_jars_status):
 
 def should_handle_graal_jars(jdk):
     java_version_output = check_java_version()
-    return jdk == "jdk21" and "GraalVM" not in java_version_output
+    return jdk == "jdk25" and "GraalVM" not in java_version_output
 
 
 def maven_cleanup():
@@ -515,7 +515,7 @@ def parse_args():
     """
     parser = argparse.ArgumentParser(description="Tool to compile TornadoVM")
     parser.add_argument(
-        "--jdk", help="JDK version (e.g., jdk21, graal-jdk-21)"
+        "--jdk", help="JDK version (e.g., jdk25, graal-jdk-25)"
     )
     parser.add_argument("--backend", help="e.g., opencl,ptx,spirv")
     parser.add_argument(
@@ -761,6 +761,8 @@ def main():
 
     graal_jars_status = should_handle_graal_jars(args.jdk)
 
+    print(f"graal_jars_status={graal_jars_status}")
+
     maven_cleanup()
 
     pull_graal_jars_if_needed(graal_jars_status)

bin/pull_graal_jars.py

@@ -26,7 +26,7 @@
 
 # Constants
 TARGET_DIR = "graalJars"
-VERSION = "23.1.0"
+VERSION = "25.0.2"
 BASE_URL = "https://repo1.maven.org/maven2/org/graalvm"
 GRAAL_JARS = [
     f"compiler/compiler/{VERSION}/compiler-{VERSION}.jar",