[GR-28917] Enable building LLVM runtime installable on Windows.

PullRequest: graal/12683

Author: rschatz

sulong/mx.sulong/mx_sulong.py

@@ -379,8 +379,8 @@ def __init__(self, name, dist, bootstrap_dist, tools, suite):
         self.llvm_binutil_tools = [tool.upper() for tool in ToolchainConfig._llvm_tool_map]
         self.suite = suite
         self.mx_command = self.name + '-toolchain'
-        self.tool_map = {tool: [_cmd_sub(alias.format(name=name)) for alias in aliases] for tool, aliases in ToolchainConfig._tool_map.items()}
-        self.path_map = {_cmd_sub(path): tool for tool, aliases in self.tool_map.items() for path in aliases}
+        self.tool_map = {tool: [_exe_sub(alias.format(name=name)) for alias in aliases] for tool, aliases in ToolchainConfig._tool_map.items()}
+        self.path_map = {_exe_sub(path): tool for tool, aliases in self.tool_map.items() for path in aliases}
         # register mx command
         mx.update_commands(_suite, {
             self.mx_command: [self._toolchain_helper, 'launch {} toolchain commands'.format(self.name)],
@@ -428,7 +428,11 @@ def _check_tool(self, tool):
 
     def get_toolchain_tool(self, tool):
         if tool in self._supported_tools():
-            return os.path.join(self.bootstrap_provider(), 'bin', self._tool_to_bin(tool))
+            ret = os.path.join(self.bootstrap_provider(), 'bin', self._tool_to_bin(tool))
+            if mx.is_windows() and ret.endswith('.exe') and not os.path.exists(ret):
+                # this might be a bootstrap toolchain without native-image, so we have to replace .exe with .cmd
+                ret = ret[:-4] + '.cmd'
+            return ret
         elif tool in self.llvm_binutil_tools:
             return os.path.join(self.bootstrap_provider(), 'bin', _cmd_sub(tool.lower()))
         else:

sulong/mx.sulong/mx_sulong_suite_constituents.py

@@ -334,9 +334,10 @@ def __init__(self, suite, name, deps, workingSets, theLicense, **kwArgs):
     def launchers(self):
         for tool in self.suite.toolchain._supported_tools():
             for exe in self.suite.toolchain._tool_to_aliases(tool):
+                cmd = exe
                 if mx.is_windows() and exe.endswith('.exe'):
-                    exe = exe[:-4] + ".cmd"
-                result = os.path.join(self.get_output_root(), exe)
+                    cmd = exe[:-4] + ".cmd"
+                result = os.path.join(self.get_output_root(), cmd)
                 yield result, tool, exe
 
     def ninja_toolchain_path(self):
@@ -346,7 +347,10 @@ def getArchivableResults(self, use_relpath=True, single=False):
         if single:
             raise ValueError("Cannot produce single result for BootstrapToolchainLauncherProject")
         for result, _, exe in self.launchers():
-            yield result, os.path.join('bin', exe)
+            cmd = exe
+            if mx.is_windows() and exe.endswith('.exe'):
+                cmd = exe[:-4] + ".cmd"
+            yield result, os.path.join('bin', cmd)
         toolchain_path = self.ninja_toolchain_path()
         yield toolchain_path, os.path.basename(toolchain_path)
 

vm/ce-release-artifacts.json

@@ -109,7 +109,7 @@
             {
                 "os": "windows",
                 "arch": "amd64",
-                "name_template": "{name}-{version}-macos-{arch}"
+                "name_template": "{name}-{version}-{os}-{arch}"
             }
 	]
     },
@@ -189,6 +189,10 @@
             {
                 "os": "darwin",
                 "arch": "aarch64"
+            },
+            {
+                "os": "windows",
+                "arch": "amd64"
             }
         ]
     },
@@ -212,6 +216,10 @@
             {
                 "os": "darwin",
                 "arch": "aarch64"
+            },
+            {
+                "os": "windows",
+                "arch": "amd64"
             }
         ]
     },
@@ -235,6 +243,10 @@
             {
                 "os": "darwin",
                 "arch": "aarch64"
+            },
+            {
+                "os": "windows",
+                "arch": "amd64"
             }
         ]
     },
@@ -258,6 +270,10 @@
             {
                 "os": "darwin",
                 "arch": "aarch64"
+            },
+            {
+                "os": "windows",
+                "arch": "amd64"
             }
         ]
     },
@@ -281,6 +297,10 @@
             {
                 "os": "darwin",
                 "arch": "aarch64"
+            },
+            {
+                "os": "windows",
+                "arch": "amd64"
             }
         ]
     },
@@ -304,6 +324,10 @@
             {
                 "os": "darwin",
                 "arch": "aarch64"
+            },
+            {
+                "os": "windows",
+                "arch": "amd64"
             }
         ]
     },

vm/ci_common/common.jsonnet

@@ -95,6 +95,7 @@ local devkits = common_json.devkits;
   sulong_linux: common_json.sulong.deps.common + common_json.sulong.deps.linux,
   sulong_darwin_amd64: common_json.sulong.deps.common + common_json.sulong.deps.darwin_amd64,
   sulong_darwin_aarch64: common_json.sulong.deps.common + common_json.sulong.deps.darwin_aarch64,
+  sulong_windows: common_json.sulong.deps.common + common_json.sulong.deps.windows,
 
   # TRUFFLERUBY, needs OpenSSL 1.0.2+, so OracleLinux 7+
   truffleruby_linux_amd64: self.sulong_linux + common_json.truffleruby.deps.common + common_json.truffleruby.deps.linux + graal_common.ol7,
@@ -665,11 +666,11 @@ local devkits = common_json.devkits;
 
   # Windows/AMD64
   deploy_vm_base_java11_windows_amd64: vm.vm_java_11 + self.svm_common_windows_amd64("11") + self.js_windows_jdk11 + self.deploy_daily_vm_windows_jdk11 + self.deploy_graalvm_base_windows_amd64("java11") + {name: 'daily-deploy-vm-base-java11-windows-amd64'},
-  deploy_vm_installable_java11_windows_amd64: vm.vm_java_11 + self.svm_common_windows_amd64("11") + self.js_windows_jdk11 + self.deploy_daily_vm_windows_jdk11 + self.deploy_graalvm_installables_windows_amd64("java11") + {name: 'daily-deploy-vm-installable-java11-windows-amd64', diskspace_required: "31GB"},
+  deploy_vm_installable_java11_windows_amd64: vm.vm_java_11 + self.svm_common_windows_amd64("11") + self.js_windows_jdk11 + self.sulong_windows + self.deploy_daily_vm_windows_jdk11 + self.deploy_graalvm_installables_windows_amd64("java11") + {name: 'daily-deploy-vm-installable-java11-windows-amd64', diskspace_required: "31GB"},
   deploy_vm_base_java17_windows_amd64: vm.vm_java_17 + self.svm_common_windows_amd64("17") + self.js_windows_jdk17 + self.deploy_daily_vm_windows_jdk17 + self.deploy_graalvm_base_windows_amd64("java17") + {name: 'daily-deploy-vm-base-java17-windows-amd64'},
-  deploy_vm_installable_java17_windows_amd64: vm.vm_java_17 + self.svm_common_windows_amd64("17") + self.js_windows_jdk17 + self.deploy_daily_vm_windows_jdk17 + self.deploy_graalvm_installables_windows_amd64("java17") + {name: 'daily-deploy-vm-installable-java17-windows-amd64', diskspace_required: "31GB"},
+  deploy_vm_installable_java17_windows_amd64: vm.vm_java_17 + self.svm_common_windows_amd64("17") + self.js_windows_jdk17 + self.sulong_windows + self.deploy_daily_vm_windows_jdk17 + self.deploy_graalvm_installables_windows_amd64("java17") + {name: 'daily-deploy-vm-installable-java17-windows-amd64', diskspace_required: "31GB"},
   deploy_vm_base_java19_windows_amd64: vm.vm_java_19 + self.svm_common_windows_amd64("19") + self.js_windows_jdk19 + self.deploy_daily_vm_windows_jdk19 + self.deploy_graalvm_base_windows_amd64("java19") + {name: 'daily-deploy-vm-base-java19-windows-amd64'},
-  deploy_vm_installable_java19_windows_amd64: vm.vm_java_19 + self.svm_common_windows_amd64("19") + self.js_windows_jdk19 + self.deploy_daily_vm_windows_jdk19 + self.deploy_graalvm_installables_windows_amd64("java19") + {name: 'daily-deploy-vm-installable-java19-windows-amd64', diskspace_required: "31GB"},
+  deploy_vm_installable_java19_windows_amd64: vm.vm_java_19 + self.svm_common_windows_amd64("19") + self.js_windows_jdk19 + self.sulong_windows + self.deploy_daily_vm_windows_jdk19 + self.deploy_graalvm_installables_windows_amd64("java19") + {name: 'daily-deploy-vm-installable-java19-windows-amd64', diskspace_required: "31GB"},
 
   #
   # Deploy the GraalVM Ruby image (GraalVM Base + ruby - js)

vm/mx.vm/ce-win-19-complete

@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/tools,/truffle,/wasm
-COMPONENTS=cmp,cov,dap,gu,gvm,gwa,icu4j,ins,insight,insightheap,js,lg,lsp,nfi-libffi,ni,nic,nil,njs,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm
-NATIVE_IMAGES=gu,lib:jsvm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image,wasm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm
+COMPONENTS=cmp,cov,dap,gu,gvm,gwa,icu4j,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,wasm
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-win-complete

@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/tools,/truffle,/wasm
-COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,lg,lsp,nfi-libffi,ni,nic,nil,njs,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm
-NATIVE_IMAGES=gu,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image,wasm
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm
+COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,wasm
 DISABLE_INSTALLABLES=False

vm/mx.vm/mx_vm.py

@@ -162,10 +162,10 @@
 
 # pylint: disable=line-too-long
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm']
-ce_win_19_complete_components = ['bnative-image-configure', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'gwa', 'icu4j', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'ni', 'nic', 'nil', 'njs', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svmsl', 'tfl', 'tflm', 'vvm']
+ce_win_19_complete_components = ['bnative-image-configure', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'gwa', 'icu4j', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi-libffi', 'nfi', 'ni', 'nic', 'nil', 'njs', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svmsl', 'tfl', 'tflm', 'vvm']
 ce_win_complete_components = ce_win_19_complete_components + ['ejvm', 'java']
-ce_aarch64_19_complete_components = ce_win_19_complete_components + ['llp', 'llrc', 'llrl', 'llrn', 'pyn', 'pynl', 'rby', 'rbyl', 'svml']
-ce_aarch64_complete_components = ce_win_complete_components + ['llp', 'llrc', 'llrl', 'llrn', 'pyn', 'pynl', 'rby', 'rbyl', 'svml']
+ce_aarch64_19_complete_components = ce_win_19_complete_components + ['pyn', 'pynl', 'rby', 'rbyl', 'svml']
+ce_aarch64_complete_components = ce_win_complete_components + ['pyn', 'pynl', 'rby', 'rbyl', 'svml']
 ce_19_complete_components = ce_aarch64_19_complete_components + ['R', 'bRMain']
 ce_complete_components = ce_aarch64_complete_components + ['ellvm', 'R', 'bRMain']
 ce_darwin_aarch64_complete_components = list(ce_aarch64_complete_components)