Support for JDK 22.0.2 and migrate to Graal compiler 24.0.2

Makefile

@@ -4,23 +4,23 @@ all: build
 # make BACKEND=<comma_separated_backend_list>
 BACKEND ?= opencl
 
-build jdk21:
-	bin/compile --jdk jdk21 --backend $(BACKEND)
+build jdk22:
+	bin/compile --jdk jdk22 --backend $(BACKEND)
 
-rebuild-deps-jdk21:
-	bin/compile --jdk jdk21 --rebuild --backend $(BACKEND)
+rebuild-deps-jdk22:
+	bin/compile --jdk jdk22 --rebuild --backend $(BACKEND)
 
-graal-jdk-21:
-	bin/compile --jdk graal-jdk-21 --backend $(BACKEND)
+graal-jdk-22:
+	bin/compile --jdk graal-jdk-22 --backend $(BACKEND)
 
 polyglot:
-	bin/compile --jdk graal-jdk-21 --backend $(BACKEND) --polyglot
+	bin/compile --jdk graal-jdk-22 --backend $(BACKEND) --polyglot
 
 ptx:
-	bin/compile --jdk jdk21 --backend ptx,opencl
+	bin/compile --jdk jdk22 --backend ptx,opencl
 
 spirv:
-	bin/compile --jdk jdk21 --backend spirv,ptx,opencl
+	bin/compile --jdk jdk22 --backend spirv,ptx,opencl
 
 # 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>
@@ -42,15 +42,15 @@ 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-spirv-levelzero:

Makefile.mak

@@ -4,23 +4,23 @@ all: build
 # nmake BACKENDS="<comma_separated_backend_list>"
 BACKEND = opencl
 
-build jdk21:
-	python bin\compile --jdk jdk21 --backend $(BACKEND)
+build jdk22:
+	python bin\compile --jdk jdk22 --backend $(BACKEND)
 
 rebuild-deps:
-	python bin\compile --jdk graal-jdk-21 --rebuild --backend $(BACKEND)
+	python bin\compile --jdk graal-jdk-22 --rebuild --backend $(BACKEND)
 
-graal-jdk-21:
-	python bin\compile --jdk graal-jdk-21 --backend $(BACKEND)
+graal-jdk-22:
+	python bin\compile --jdk graal-jdk-22 --backend $(BACKEND)
 
 polyglot:
-	python bin\compile --jdk graal-jdk-21 --backend $(BACKEND) --polyglot
+	python bin\compile --jdk graal-jdk-22 --backend $(BACKEND) --polyglot
 
 ptx:
-	python bin\compile --jdk graal-jdk-21 --backend ptx,opencl
+	python bin\compile --jdk graal-jdk-22 --backend ptx,opencl
 
 spirv:
-	python bin\compile --jdk graal-jdk-21 --backend spirv,ptx,opencl
+	python bin\compile --jdk graal-jdk-22 --backend spirv,ptx,opencl
 
 # 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>
@@ -42,10 +42,31 @@ example:
 tests:
 	del /f tornado_unittests.log
 	python %TORNADO_SDK%\bin\tornado --devices
-	python %TORNADO_SDK%\bin\tornado-test --ea --verbose
-	python %TORNADO_SDK%\bin\tornado-test --ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	python %TORNADO_SDK%\bin\tornado-test --verbose
+	python %TORNADO_SDK%\bin\tornado-test -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
 	%TORNADO_SDK%\bin\test-native.cmd
 
+fast-tests:
+	del /f tornado_unittests.log
+	python %TORNADO_SDK%\bin\tornado --devices
+	python %TORNADO_SDK%\bin\tornado-test --verbose --quickPass
+	python %TORNADO_SDK%\bin\tornado-test -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	test-native.sh
+
+tests-spirv-levelzero:
+	del /f tornado_unittests.log
+	python %TORNADO_SDK%\bin\tornado --jvm="-Dtornado.spirv.dispatcher=levelzero" uk.ac.manchester.tornado.drivers.TornadoDeviceQuery --params="verbose"
+	python %TORNADO_SDK%\bin\tornado-test --jvm="-Dtornado.spirv.dispatcher=levelzero" --ea --verbose
+	python %TORNADO_SDK%\bin\tornado-test --jvm="-Dtornado.spirv.dispatcher=levelzero"--ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	test-native.sh
+
+tests-spirv-opencl:
+	del /f tornado_unittests.log
+	python %TORNADO_SDK%\bin\tornado --jvm="-Dtornado.spirv.dispatcher=opencl" uk.ac.manchester.tornado.drivers.TornadoDeviceQuery --params="verbose"
+	python %TORNADO_SDK%\bin\tornado-test --jvm="-Dtornado.spirv.dispatcher=opencl" --ea --verbose
+	python %TORNADO_SDK%\bin\tornado-test --jvm="-Dtornado.spirv.dispatcher=opencl"--ea -V -J"-Dtornado.device.memory=1MB" uk.ac.manchester.tornado.unittests.fails.HeapFail#test03
+	test-native.sh
+
 tests-opt:
 	python %TORNADO_SDK%\bin\tornado --devices
 	python %TORNADO_SDK%\bin\tornado-test -V --fast --ea --verbose -J"-Dtornado.spirv.loadstore=True" --printKernel

bin/compile

@@ -64,7 +64,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 == "jdk22" and "GraalVM" not in java_version_output
 
 
 def maven_cleanup():
@@ -334,7 +334,7 @@ def post_installation_actions(backend_profiles, mvn_build_result, jdk, graal_jar
         with open(backend_file_path, "w") as backend_file:
             backend_file.write(f"tornado.backends={backend_profiles}")
 
-        # Place the Graal jars in the TornadoVM distribution only if the JDK 21 rule is used
+        # Place the Graal jars in the TornadoVM distribution only if the JDK 22 rule is used
         if graal_jars_status:
             graal_jars_src_dir = os.path.join(os.getcwd(), "graalJars")
             graal_jars_dst_dir = os.path.join(f"{os.environ['TORNADO_SDK']}", "share", "java", "graalJars")
@@ -355,7 +355,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., jdk22, graal-jdk-22)"
     )
     parser.add_argument("--backend", help="e.g., opencl,ptx,spirv")
     parser.add_argument(

bin/installer_config.py

@@ -26,14 +26,14 @@
 __APPLE__ = "darwin"
 __WINDOWS__ = "windows"
 
-__JDK21__ = "jdk21"
-__GRAALVM21__ = "graalvm-jdk-21"
-__MANDREL21__ = "mandrel-jdk-21"
-__CORRETTO21__ = "corretto-jdk-21"
-__MICROSOFT21__ = "microsoft-jdk-21"
-__ZULU21__ = "zulu-jdk-21"
-__TEMURIN21__ = "temurin-jdk-21"
-__SAPMACHINE21__ = "sapmachine-jdk-21"
+__JDK22__ = "jdk22"
+__GRAALVM22__ = "graal-jdk-22"
+__MANDREL22__ = "mandrel-jdk-22"
+__CORRETTO22__ = "corretto-jdk-22"
+__MICROSOFT22__ = "microsoft-jdk-22"
+__ZULU22__ = "zulu-jdk-22"
+__TEMURIN22__ = "temurin-jdk-22"
+__SAPMACHINE22__ = "sapmachine-jdk-22"
 
 ## cmake
 CMAKE = {
@@ -69,115 +69,115 @@
 
 ## JDK
 JDK = {
-    __JDK21__: {
+    __JDK22__: {
         __LINUX__: {
-            __X86_64__: "https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz",
-            __ARM__: "https://download.oracle.com/java/21/latest/jdk-21_linux-aarch64_bin.tar.gz",
+            __X86_64__: "https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.tar.gz",
+            __ARM__: "https://download.oracle.com/java/22/latest/jdk-22_linux-aarch64_bin.tar.gz",
         },
         __APPLE__: {
-            __X86_64__: "https://download.oracle.com/java/21/latest/jdk-21_macos-x64_bin.tar.gz",
-            __ARM__: "https://download.oracle.com/java/21/latest/jdk-21_macos-aarch64_bin.tar.gz",
+            __X86_64__: "https://download.oracle.com/java/22/latest/jdk-22_macos-x64_bin.tar.gz",
+            __ARM__: "https://download.oracle.com/java/22/latest/jdk-22_macos-aarch64_bin.tar.gz",
         },
         __WINDOWS__: {
-            __X86_64__: "https://download.oracle.com/java/21/archive/jdk-21.0.1_windows-x64_bin.zip",
+            __X86_64__: "https://download.oracle.com/java/22/archive/jdk-22.0.2_windows-x64_bin.zip",
             __ARM__: None,
         },
     },
-    __GRAALVM21__: {
+    __GRAALVM22__: {
         __LINUX__: {
-            __X86_64__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz",
-            __ARM__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-aarch64_bin.tar.gz",
+            __X86_64__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-x64_bin.tar.gz",
+            __ARM__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-aarch64_bin.tar.gz",
         },
         __APPLE__: {
-            __X86_64__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-x64_bin.tar.gz",
-            __ARM__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-aarch64_bin.tar.gz",
+            __X86_64__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-x64_bin.tar.gz",
+            __ARM__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-aarch64_bin.tar.gz",
         },
         __WINDOWS__: {
-            __X86_64__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_windows-x64_bin.zip",
+            __X86_64__: "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_windows-x64_bin.zip",
             __ARM__: None,
         },
     },
-    __CORRETTO21__: {
+    __CORRETTO22__: {
         __LINUX__: {
-            __X86_64__: "https://corretto.aws/downloads/latest/amazon-corretto-21-x64-linux-jdk.tar.gz",
-            __ARM__: "https://corretto.aws/downloads/latest/amazon-corretto-21-aarch64-linux-jdk.tar.gz",
+            __X86_64__: "https://corretto.aws/downloads/latest/amazon-corretto-22-x64-linux-jdk.tar.gz",
+            __ARM__: "https://corretto.aws/downloads/latest/amazon-corretto-22-aarch64-linux-jdk.tar.gz",
         },
         __APPLE__: {
-            __X86_64__: "https://corretto.aws/downloads/latest/amazon-corretto-21-x64-macos-jdk.tar.gz",
-            __ARM__: "https://corretto.aws/downloads/latest/amazon-corretto-21-aarch64-macos-jdk.tar.gz",
+            __X86_64__: "https://corretto.aws/downloads/latest/amazon-corretto-22-x64-macos-jdk.tar.gz",
+            __ARM__: "https://corretto.aws/downloads/latest/amazon-corretto-22-aarch64-macos-jdk.tar.gz",
         },
         __WINDOWS__: {
-            __X86_64__: None,
+            __X86_64__: "https://corretto.aws/downloads/latest/amazon-corretto-22-x64-windows-jdk.zip",
             __ARM__: None,
         },
     },
-    __MANDREL21__: {
+    __MANDREL22__: {
         __LINUX__: {
-            __X86_64__: "https://github.com/graalvm/mandrel/releases/download/mandrel-23.1.0.0-Final/mandrel-java21-linux-amd64-23.1.0.0-Final.tar.gz",
-            __ARM__: "https://github.com/graalvm/mandrel/releases/download/mandrel-23.1.0.0-Final/mandrel-java21-linux-aarch64-23.1.0.0-Final.tar.gz",
+            __X86_64__: "https://github.com/graalvm/mandrel/releases/download/mandrel-24.0.2.0-Final/mandrel-java22-linux-amd64-24.0.2.0-Final.tar.gz",
+            __ARM__: "https://github.com/graalvm/mandrel/releases/download/mandrel-24.0.2.0-Final/mandrel-java22-linux-aarch64-24.0.2.0-Final.tar.gz",
         },
         __APPLE__: {
             __X86_64__: None,
-            __ARM__: None,
+            __ARM__: "https://github.com/graalvm/mandrel/releases/download/mandrel-24.0.2.0-Final/mandrel-java22-macos-aarch64-24.0.2.0-Final.tar.gz",
         },
         __WINDOWS__: {
-            __X86_64__: None,
+            __X86_64__: "https://github.com/graalvm/mandrel/releases/download/mandrel-24.0.2.0-Final/mandrel-java22-windows-amd64-24.0.2.0-Final.zip",
             __ARM__: None,
         },
     },
-    __MICROSOFT21__: {
+    __MICROSOFT22__: {
         __LINUX__: {
-            __X86_64__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-linux-x64.tar.gz",
-            __ARM__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-linux-aarch64.tar.gz",
+            __X86_64__: None,
+            __ARM__: None,
         },
         __APPLE__: {
-            __X86_64__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-macos-x64.tar.gz",
-            __ARM__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-macos-aarch64.tar.gz",
+            __X86_64__: None,
+            __ARM__: None,
         },
         __WINDOWS__: {
-            __X86_64__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-windows-x64.zip",
-            __ARM__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-windows-aarch64.zip",
+            __X86_64__: None,
+            __ARM__: None,
         },
     },
-    __ZULU21__: {
+    __ZULU22__: {
         __LINUX__: {
-            __X86_64__: "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz",
-            __ARM__: "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz",
+            __X86_64__: "https://cdn.azul.com/zulu/bin/zulu22.32.15-ca-jdk22.0.2-linux_x64.tar.gz",
+            __ARM__: "https://cdn.azul.com/zulu/bin/zulu22.32.15-ca-jdk22.0.2-linux_aarch64.tar.gz",
         },
         __APPLE__: {
-            __X86_64__: "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz",
-            __ARM__: "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz",
+            __X86_64__: "https://cdn.azul.com/zulu/bin/zulu22.32.15-ca-jdk22.0.2-macosx_x64.tar.gz",
+            __ARM__: "https://cdn.azul.com/zulu/bin/zulu22.32.15-ca-jdk22.0.2-macosx_aarch64.tar.gz",
         },
         __WINDOWS__: {
             __X86_64__: None,
             __ARM__: None,
         },
     },
-    __TEMURIN21__: {
+    __TEMURIN22__: {
         __LINUX__: {
-            __X86_64__: "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz",
-            __ARM__: "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz",
+            __X86_64__: "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz",
+            __ARM__: "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.1_8.tar.gz",
         },
         __APPLE__: {
-            __X86_64__: "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz",
-            __ARM__: "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz",
+            __X86_64__: "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_mac_hotspot_22.0.1_8.tar.gz",
+            __ARM__: "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.1_8.tar.gz",
         },
         __WINDOWS__: {
-            __X86_64__: "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_windows_hotspot_21.0.3_9.zip",
+            __X86_64__: "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_windows_hotspot_22.0.1_8.zip",
             __ARM__: None,
         },
     },
-    __SAPMACHINE21__: {
+    __SAPMACHINE22__: {
         __LINUX__: {
-            __X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_linux-x64_bin.tar.gz",
-            __ARM__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_linux-aarch64_bin.tar.gz",
+            __X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-22.0.2/sapmachine-jdk-22.0.2_linux-x64_bin.tar.gz",
+            __ARM__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-22.0.2/sapmachine-jdk-22.0.2_linux-aarch64_bin.tar.gz",
         },
         __APPLE__: {
-            __X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_macos-x64_bin.tar.gz",
-            __ARM__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_macos-aarch64_bin.tar.gz",
+            __X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-22.0.2/sapmachine-jdk-22.0.2_macos-x64_bin.tar.gz",
+            __ARM__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-22.0.2/sapmachine-jdk-22.0.2_macos-aarch64_bin.tar.gz",
         },
         __WINDOWS__: {
-            __X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_windows-x64_bin.zip",
+            __X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-22.0.2/sapmachine-jdk-22.0.2_windows-x64_bin.zip",
             __ARM__: None,
         },
     },

bin/pull_graal_jars.py

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