From cdfe55cc5ca8f7e30b144b7c259aecfc8e861771 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Wed, 17 Aug 2022 17:26:58 +0200 Subject: [PATCH 01/11] Deploy JDK19-based GraalVM images. --- common.jsonnet | 3 +- vm/ci_common/common.jsonnet | 118 +++++++++++++++++-------- vm/ci_includes/vm.jsonnet | 24 +++-- vm/mx.vm/ce-19 | 4 + vm/mx.vm/ce-19-complete | 4 + vm/mx.vm/ce-aarch64-19 | 4 + vm/mx.vm/ce-aarch64-19-complete | 4 + vm/mx.vm/ce-darwin-19 | 4 + vm/mx.vm/ce-darwin-19-complete | 4 + vm/mx.vm/ce-darwin-aarch64-19 | 4 + vm/mx.vm/ce-darwin-aarch64-19-complete | 4 + vm/mx.vm/ce-win-19 | 4 + vm/mx.vm/ce-win-19-complete | 4 + 13 files changed, 140 insertions(+), 45 deletions(-) create mode 100644 vm/mx.vm/ce-19 create mode 100644 vm/mx.vm/ce-19-complete create mode 100644 vm/mx.vm/ce-aarch64-19 create mode 100644 vm/mx.vm/ce-aarch64-19-complete create mode 100644 vm/mx.vm/ce-darwin-19 create mode 100644 vm/mx.vm/ce-darwin-19-complete create mode 100644 vm/mx.vm/ce-darwin-aarch64-19 create mode 100644 vm/mx.vm/ce-darwin-aarch64-19-complete create mode 100644 vm/mx.vm/ce-win-19 create mode 100644 vm/mx.vm/ce-win-19-complete diff --git a/common.jsonnet b/common.jsonnet index 7b3940bda39c..b5583b2ca949 100644 --- a/common.jsonnet +++ b/common.jsonnet @@ -32,7 +32,7 @@ local add_jdk_version(name) = local version = find_first_integer(jdk.version); // santity check that the parsed version is also included in the name assert std.length(std.findSubstr(std.toString(version), name)) == 1 : "Cannot find version %d in name %s" % [version, name]; - { jdk_version:: version} + { jdk_version: version} ; { @@ -117,6 +117,7 @@ local add_jdk_version(name) = labsjdk17Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-17Debug"], labsjdk11LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-11-llvm"], labsjdk17LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-17-llvm"], + labsjdk19LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-19-llvm"], // Hardware definitions diff --git a/vm/ci_common/common.jsonnet b/vm/ci_common/common.jsonnet index ebbf4e61097e..85548ac1e3f7 100644 --- a/vm/ci_common/common.jsonnet +++ b/vm/ci_common/common.jsonnet @@ -51,23 +51,9 @@ local devkits = common_json.devkits; }, }, - common_vm_windows_jdk11: self.common_vm + devkits['windows-jdk11'] + { - downloads+: { - MAVEN_HOME: {name: 'maven', version: '3.3.9', platformspecific: false}, - }, - environment+: { - PATH: '$MAVEN_HOME\\bin;$JAVA_HOME\\bin;$PATH', - }, - }, - - common_vm_windows_jdk17: self.common_vm + devkits['windows-jdk17'] + { - downloads+: { - MAVEN_HOME: {name: 'maven', version: '3.3.9', platformspecific: false}, - }, - environment+: { - PATH: '$MAVEN_HOME\\bin;$JAVA_HOME\\bin;$PATH', - }, - }, + common_vm_windows_jdk11: self.common_vm_windows + devkits['windows-jdk11'], + common_vm_windows_jdk17: self.common_vm_windows + devkits['windows-jdk17'], + common_vm_windows_jdk19: self.common_vm_windows + devkits['windows-jdk19'], # JS js_windows_common: { @@ -94,6 +80,8 @@ local devkits = common_json.devkits; ], }, + js_windows_jdk19: self.js_windows_jdk17, + js_windows: self.js_windows_common + { setup+: [ # Keep in sync with the 'devkits' object defined in the top level common.json file. @@ -215,10 +203,9 @@ local devkits = common_json.devkits; }, vm_windows: self.common_vm_windows + graal_common.windows_server_2016_amd64, - vm_windows_jdk11: self.common_vm_windows_jdk11 + graal_common.windows_server_2016_amd64, - vm_windows_jdk17: self.common_vm_windows_jdk17 + graal_common.windows_server_2016_amd64, + vm_windows_jdk19: self.common_vm_windows_jdk19 + graal_common.windows_server_2016_amd64, gate_vm_linux_amd64: self.vm_linux_amd64 + { targets+: ['gate'] @@ -301,6 +288,10 @@ local devkits = common_json.devkits; targets+: ['daily', 'deploy'], }, + deploy_daily_vm_windows_jdk19: self.vm_windows_jdk19 + { + targets+: ['daily', 'deploy'], + }, + postmerge_vm_linux_amd64: self.vm_linux_amd64 + { targets+: ['post-merge'], }, @@ -402,6 +393,7 @@ local devkits = common_json.devkits; svm_common_darwin_amd64: { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.darwin_amd64, svm_common_darwin_aarch64: { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.darwin_aarch64, svm_common_windows_amd64(jdk): { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.windows + common_json.devkits["windows-jdk" + jdk], + svm_common_windows_jdk19: { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.windows + common_json.devkits['windows-jdk19'], maven_deploy_sdk: ['--suite', 'sdk', 'maven-deploy', '--validate', 'none', '--all-distribution-types', '--with-suite-revisions-metadata'], maven_deploy_sdk_base: self.maven_deploy_sdk + ['--tags', 'graalvm', vm.binaries_repository], @@ -462,8 +454,61 @@ local devkits = common_json.devkits; ['set-export', 'GRAALVM_DIST', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + vm.vm_profiles + ['graalvm-dist-name']]] ] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version), + patch_env(os, arch, java_version): + # linux + if (os == 'linux') then + if (arch == 'amd64') then + if (java_version == 'java11') then [ + # default + ] else if (java_version == 'java17') then [ + # default + ] else if (java_version == 'java19') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-19'], + ] else error "java_version not found: " + java_version + else if (arch == 'aarch64') then + if (java_version == 'java11') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-aarch64'], + ] else if (java_version == 'java17') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-aarch64'], + ] else if (java_version == 'java19') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-aarch64-19'], + ] else error "java_version not found: " + java_version + else error "arch not found: " + arch + # darwin + else if (os == 'darwin') then + if (arch == 'amd64') then + if (java_version == 'java11') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-darwin'], + ] else if (java_version == 'java17') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-darwin'], + ] else if (java_version == 'java19') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-darwin-19'], + ] else error "java_version not found: " + java_version + else if (arch == 'aarch64') then + # GR-34811: `ce-darwin-aarch64` can be removed once svml builds + if (java_version == 'java11') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-darwin-aarch64'], + ] else if (java_version == 'java17') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-darwin-aarch64'], + ] else if (java_version == 'java19') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-darwin-aarch64-19'], + ] else error "java_version not found: " + java_version + else error "arch not found: " + arch + # windows + else if (os == 'windows') then + if (arch == 'amd64') then + if (java_version == 'java11') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-win'], + ] else if (java_version == 'java17') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-win'], + ] else if (java_version == 'java19') then [ + ['set-export', 'VM_ENV', '${VM_ENV}-win-19'], + ] else error "java_version not found: " + java_version + else error "arch not found: " + arch + else error "os not found: " + os, + deploy_graalvm_linux_amd64(java_version): vm.check_structure + { - run: [ + run: $.patch_env('linux', 'amd64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], @@ -483,8 +528,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_linux_aarch64(java_version): vm.check_structure + { - run: [ - ['set-export', 'VM_ENV', '${VM_ENV}-aarch64'], + run: $.patch_env('linux', 'aarch64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], @@ -503,9 +547,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_base_darwin_amd64(java_version): vm.check_structure + { - run: [ - ['set-export', 'VM_ENV', "${VM_ENV}-darwin"], - ] + vm.collect_profiles() + $.build_base_graalvm_image + [ + run: $.patch_env('darwin', 'amd64', java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, @@ -516,8 +558,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_installables_darwin_amd64(java_version): vm.check_structure + { - run: [ - ['set-export', 'VM_ENV', "${VM_ENV}-darwin"], + run: $.patch_env('darwin', 'amd64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], @@ -531,10 +572,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_base_darwin_aarch64(java_version): vm.check_structure + { - run: [ - # GR-34811: `ce-darwin-aarch64` can be removed once svml builds - ['set-export', 'VM_ENV', '${VM_ENV}-darwin-aarch64'], - ] + vm.collect_profiles() + $.build_base_graalvm_image + [ + run: $.patch_env('darwin', 'aarch64', java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, @@ -545,8 +583,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_installables_darwin_aarch64(java_version): vm.check_structure + { - run: [ - ['set-export', 'VM_ENV', "${VM_ENV}-darwin-aarch64"], + run: $.patch_env('darwin', 'aarch64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], @@ -560,9 +597,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_base_windows_amd64(java_version): vm.check_structure + { - run: [ - ['set-export', 'VM_ENV', "${VM_ENV}-win"], - ] + vm.collect_profiles() + $.build_base_graalvm_image + [ + run: $.patch_env('windows', 'amd64', java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, @@ -573,8 +608,7 @@ local devkits = common_json.devkits; }, deploy_graalvm_installables_windows_amd64(java_version): vm.check_structure + { - run: [ - ['set-export', 'VM_ENV', "${VM_ENV}-win"], + run: $.patch_env('windows', 'amd64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], @@ -606,28 +640,36 @@ local devkits = common_json.devkits; # Linux/AMD64 deploy_vm_java11_linux_amd64: vm.vm_java_11_llvm + self.full_vm_build_linux + self.linux_deploy + self.deploy_vm_linux_amd64 + self.deploy_graalvm_linux_amd64("java11") + {name: 'post-merge-deploy-vm-java11-linux-amd64', diskspace_required: vm.diskspace_required.java11_linux_mad64}, deploy_vm_java17_linux_amd64: vm.vm_java_17_llvm + self.full_vm_build_linux + self.linux_deploy + self.deploy_vm_linux_amd64 + self.deploy_graalvm_linux_amd64("java17") + {name: 'post-merge-deploy-vm-java17-linux-amd64', diskspace_required: vm.diskspace_required.java17_linux_mad64}, + deploy_vm_java19_linux_amd64: vm.vm_java_19_llvm + self.full_vm_build_linux + self.linux_deploy + self.deploy_vm_linux_amd64 + self.deploy_graalvm_linux_amd64("java19") + {name: 'post-merge-deploy-vm-java19-linux-amd64', diskspace_required: vm.diskspace_required.java19_linux_mad64}, # Linux/AARCH64 deploy_vm_java11_linux_aarch64: vm.vm_java_11 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_daily_vm_linux_aarch64 + self.deploy_graalvm_linux_aarch64("java11") + {name: 'daily-deploy-vm-java11-linux-aarch64'}, deploy_vm_java17_linux_aarch64: vm.vm_java_17 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_daily_vm_linux_aarch64 + self.deploy_graalvm_linux_aarch64("java17") + {name: 'daily-deploy-vm-java17-linux-aarch64'}, + deploy_vm_java19_linux_aarch64: vm.vm_java_19 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_daily_vm_linux_aarch64 + self.deploy_graalvm_linux_aarch64("java19") + {name: 'daily-deploy-vm-java19-linux-aarch64'}, # Darwin/AMD64 deploy_vm_base_java11_darwin_amd64: vm.vm_java_11_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_base_darwin_amd64("java11") + {name: 'daily-deploy-vm-base-java11-darwin-amd64'}, deploy_vm_installable_java11_darwin_amd64: vm.vm_java_11_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_installables_darwin_amd64("java11") + {name: 'daily-deploy-vm-installable-java11-darwin-amd64', diskspace_required: "31GB"}, deploy_vm_base_java17_darwin_amd64: vm.vm_java_17_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_base_darwin_amd64("java17") + {name: 'daily-deploy-vm-base-java17-darwin-amd64'}, deploy_vm_installable_java17_darwin_amd64: vm.vm_java_17_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_installables_darwin_amd64("java17") + {name: 'daily-deploy-vm-installable-java17-darwin-amd64', diskspace_required: "31GB"}, + deploy_vm_base_java19_darwin_amd64: vm.vm_java_19_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_base_darwin_amd64("java19") + {name: 'daily-deploy-vm-base-java19-darwin-amd64'}, + deploy_vm_installable_java19_darwin_amd64: vm.vm_java_19_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_installables_darwin_amd64("java19") + {name: 'daily-deploy-vm-installable-java19-darwin-amd64', diskspace_required: "31GB"}, # Darwin/AARCH64 deploy_vm_base_java11_darwin_aarch64: vm.vm_java_11 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_base_darwin_aarch64("java11") + {name: 'daily-deploy-vm-base-java11-darwin-aarch64'}, deploy_vm_installable_java11_darwin_aarch64: vm.vm_java_11 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_installables_darwin_aarch64("java11") + {name: 'daily-deploy-vm-installable-java11-darwin-aarch64', diskspace_required: "31GB"}, deploy_vm_base_java17_darwin_aarch64: vm.vm_java_17 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_base_darwin_aarch64("java17") + {name: 'daily-deploy-vm-base-java17-darwin-aarch64'}, deploy_vm_installable_java17_darwin_aarch64: vm.vm_java_17 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_installables_darwin_aarch64("java17") + {name: 'daily-deploy-vm-installable-java17-darwin-aarch64', diskspace_required: "31GB"}, + deploy_vm_base_java19_darwin_aarch64: vm.vm_java_19 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_base_darwin_aarch64("java19") + {name: 'daily-deploy-vm-base-java19-darwin-aarch64'}, + deploy_vm_installable_java19_darwin_aarch64: vm.vm_java_19 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_installables_darwin_aarch64("java19") + {name: 'daily-deploy-vm-installable-java19-darwin-aarch64', diskspace_required: "31GB"}, # 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_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_base_java19_windows_amd64: vm.vm_java_19 + self.svm_common_windows_jdk19 + 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_jdk19 + 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 the GraalVM Ruby image (GraalVM Base + ruby - js) diff --git a/vm/ci_includes/vm.jsonnet b/vm/ci_includes/vm.jsonnet index 7045c4e8288a..9fb52ec9cae0 100644 --- a/vm/ci_includes/vm.jsonnet +++ b/vm/ci_includes/vm.jsonnet @@ -15,12 +15,7 @@ local jdks = common_json.jdks; vm_java_11_llvm:: self.vm_java_11 + graal_common['labsjdk-ce-11-llvm'], vm_java_17_llvm:: self.vm_java_17 + graal_common['labsjdk-ce-17-llvm'], - - vm_java_19_llvm:: self.vm_java_19 + { - downloads+: { - LLVM_JAVA_HOME: jdks['labsjdk-ce-19-llvm'], - }, - }, + vm_java_19_llvm:: self.vm_java_19 + graal_common['labsjdk-ce-19-llvm'], binaries_repository: 'lafo', svm_suite:: '/substratevm', @@ -79,20 +74,28 @@ local jdks = common_json.jdks; requireArtifacts: [ {name: 'post-merge-deploy-vm-java11-linux-amd64'}, {name: 'post-merge-deploy-vm-java17-linux-amd64'}, + {name: 'post-merge-deploy-vm-java19-linux-amd64'}, {name: 'daily-deploy-vm-java11-linux-aarch64'}, {name: 'daily-deploy-vm-java17-linux-aarch64'}, + {name: 'daily-deploy-vm-java19-linux-aarch64'}, {name: 'daily-deploy-vm-base-java11-darwin-amd64'}, {name: 'daily-deploy-vm-installable-java11-darwin-amd64'}, {name: 'daily-deploy-vm-base-java17-darwin-amd64'}, + {name: 'daily-deploy-vm-installable-java19-darwin-amd64'}, + {name: 'daily-deploy-vm-base-java19-darwin-amd64'}, {name: 'daily-deploy-vm-installable-java17-darwin-amd64'}, {name: 'daily-deploy-vm-base-java11-darwin-aarch64'}, {name: 'daily-deploy-vm-installable-java11-darwin-aarch64'}, {name: 'daily-deploy-vm-base-java17-darwin-aarch64'}, {name: 'daily-deploy-vm-installable-java17-darwin-aarch64'}, + {name: 'daily-deploy-vm-base-java19-darwin-aarch64'}, + {name: 'daily-deploy-vm-installable-java19-darwin-aarch64'}, {name: 'daily-deploy-vm-base-java11-windows-amd64'}, {name: 'daily-deploy-vm-installable-java11-windows-amd64'}, {name: 'daily-deploy-vm-base-java17-windows-amd64'}, {name: 'daily-deploy-vm-installable-java17-windows-amd64'}, + {name: 'daily-deploy-vm-base-java19-windows-amd64'}, + {name: 'daily-deploy-vm-installable-java19-windows-amd64'}, {name: 'daily-deploy-vm-ruby-java11-linux-amd64'}, {name: 'daily-deploy-vm-ruby-java11-darwin-amd64'}, {name: 'daily-deploy-vm-ruby-java11-darwin-aarch64'}, @@ -112,6 +115,7 @@ local jdks = common_json.jdks; diskspace_required: { java11_linux_mad64: "30GB", java17_linux_mad64: "30GB", + java19_linux_mad64: "30GB", }, local builds = [ @@ -234,28 +238,36 @@ local jdks = common_json.jdks; # Linux/AMD64 self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_java11_linux_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_java17_linux_amd64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_java19_linux_amd64), # Linux/AARCH64 self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_java11_linux_aarch64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_java17_linux_aarch64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_java19_linux_aarch64), # Darwin/AMD64 self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java11_darwin_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java11_darwin_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java17_darwin_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java17_darwin_amd64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java19_darwin_amd64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java19_darwin_amd64), # Darwin/AARCH64 self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java11_darwin_aarch64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java11_darwin_aarch64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java17_darwin_aarch64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java17_darwin_aarch64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java19_darwin_aarch64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java19_darwin_aarch64), # Windows/AMD64 self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java11_windows_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java11_windows_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java17_windows_amd64), self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java17_windows_amd64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_base_java19_windows_amd64), + self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_installable_java19_windows_amd64), # # Deploy the GraalVM Ruby image (GraalVM Base + ruby - js) diff --git a/vm/mx.vm/ce-19 b/vm/mx.vm/ce-19 new file mode 100644 index 000000000000..ecfacea7b889 --- /dev/null +++ b/vm/mx.vm/ce-19 @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle +COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm +NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler +DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-19-complete b/vm/mx.vm/ce-19-complete new file mode 100644 index 000000000000..d898f22d35f9 --- /dev/null +++ b/vm/mx.vm/ce-19-complete @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby +COMPONENTS=cmp,cov,dap,ellvm,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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-aarch64-19 b/vm/mx.vm/ce-aarch64-19 new file mode 100644 index 000000000000..ecfacea7b889 --- /dev/null +++ b/vm/mx.vm/ce-aarch64-19 @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle +COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm +NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler +DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-aarch64-19-complete b/vm/mx.vm/ce-aarch64-19-complete new file mode 100644 index 000000000000..0f3592ad4ac5 --- /dev/null +++ b/vm/mx.vm/ce-aarch64-19-complete @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython,truffleruby +COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-19 b/vm/mx.vm/ce-darwin-19 new file mode 100644 index 000000000000..ecfacea7b889 --- /dev/null +++ b/vm/mx.vm/ce-darwin-19 @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle +COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm +NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler +DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-19-complete b/vm/mx.vm/ce-darwin-19-complete new file mode 100644 index 000000000000..d898f22d35f9 --- /dev/null +++ b/vm/mx.vm/ce-darwin-19-complete @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby +COMPONENTS=cmp,cov,dap,ellvm,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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-darwin-aarch64-19 b/vm/mx.vm/ce-darwin-aarch64-19 new file mode 100644 index 000000000000..ecfacea7b889 --- /dev/null +++ b/vm/mx.vm/ce-darwin-aarch64-19 @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle +COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm +NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler +DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-aarch64-19-complete b/vm/mx.vm/ce-darwin-aarch64-19-complete new file mode 100644 index 000000000000..314253520f50 --- /dev/null +++ b/vm/mx.vm/ce-darwin-aarch64-19-complete @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,graalpython,truffleruby +COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,icu4j,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:javavm,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,lib:rubyvm +DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-win-19 b/vm/mx.vm/ce-win-19 new file mode 100644 index 000000000000..2c6fe3d5e1ab --- /dev/null +++ b/vm/mx.vm/ce-win-19 @@ -0,0 +1,4 @@ +DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle +COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm +NATIVE_IMAGES=gu,lib:jvmcicompiler +DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-win-19-complete b/vm/mx.vm/ce-win-19-complete new file mode 100644 index 000000000000..eed984fec539 --- /dev/null +++ b/vm/mx.vm/ce-win-19-complete @@ -0,0 +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 +DISABLE_INSTALLABLES=False From c786d00c7c3e50e2ebc0b29da1876ed959eb9624 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Wed, 17 Aug 2022 18:01:39 +0200 Subject: [PATCH 02/11] Register GraalVM configs. --- vm/mx.vm/mx_vm.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py index d25d31d88d82..b15796ed175c 100644 --- a/vm/mx.vm/mx_vm.py +++ b/vm/mx.vm/mx_vm.py @@ -174,19 +174,29 @@ ce_no_native_components = ['bgu', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'lsp', 'nfi-libffi', 'nfi', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm', 'libpoly', 'poly'] mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm'], _suite, env_file='ce-win') +mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm'], _suite, env_file='ce-win-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64') +mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin') +mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64') +mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite) +mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-19') mx_sdk_vm.register_vm_config('ce', ce_components + ['js'], _suite, dist_name='ce-js', env_file='ce-js') mx_sdk_vm.register_vm_config('ce', ce_components + ['js', 'njs', 'sjsvm'], _suite, dist_name='ce', env_file='ce-nodejs') mx_sdk_vm.register_vm_config('ce', ce_components + ['llrn', 'llp', 'llrc', 'llrl'], _suite, env_file='ce-llvm') mx_sdk_vm.register_vm_config('ce', ce_ruby_components, _suite, dist_name='ce-ruby', env_file='ce-ruby') mx_sdk_vm.register_vm_config('ce', ce_win_complete_components, _suite, dist_name='ce-win-complete') +mx_sdk_vm.register_vm_config('ce', ce_win_complete_components, _suite, dist_name='ce-win-complete', env_file='ce-win-19-complete') mx_sdk_vm.register_vm_config('ce', ce_aarch64_complete_components, _suite, dist_name='ce-aarch64-complete') +mx_sdk_vm.register_vm_config('ce', ce_aarch64_complete_components, _suite, dist_name='ce-aarch64-complete', env_file='ce-aarch64-19-complete') mx_sdk_vm.register_vm_config('ce', ce_darwin_aarch64_complete_components, _suite, dist_name='ce-darwin-aarch64-complete') +mx_sdk_vm.register_vm_config('ce', ce_darwin_aarch64_complete_components, _suite, dist_name='ce-darwin-aarch64-complete', env_file='ce-darwin-aarch64-19-complete') mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete') +mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete', env_file='ce-19-complete') mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete', env_file='ce-darwin-complete') +mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete', env_file='ce-darwin-19-complete') mx_sdk_vm.register_vm_config('ce-python', ce_python_components, _suite) mx_sdk_vm.register_vm_config('ce-fastr', ce_fastr_components, _suite) mx_sdk_vm.register_vm_config('ce-no_native', ce_no_native_components, _suite) From a1b2f97daff7950b98d3af7c12e05f36b7a830d3 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Thu, 18 Aug 2022 13:18:41 +0200 Subject: [PATCH 03/11] Espresso does not support JDK 19 (GR-40518). --- vm/mx.vm/ce-19-complete | 6 +++--- vm/mx.vm/ce-aarch64-19-complete | 6 +++--- vm/mx.vm/ce-darwin-19-complete | 6 +++--- vm/mx.vm/ce-darwin-aarch64-19-complete | 6 +++--- vm/mx.vm/ce-win-19-complete | 6 +++--- vm/mx.vm/mx_vm.py | 16 ++++++++++------ 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/vm/mx.vm/ce-19-complete b/vm/mx.vm/ce-19-complete index d898f22d35f9..647637366bc0 100644 --- a/vm/mx.vm/ce-19-complete +++ b/vm/mx.vm/ce-19-complete @@ -1,4 +1,4 @@ -DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby -COMPONENTS=cmp,cov,dap,ellvm,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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby +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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-aarch64-19-complete b/vm/mx.vm/ce-aarch64-19-complete index 0f3592ad4ac5..7f55596a4097 100644 --- a/vm/mx.vm/ce-aarch64-19-complete +++ b/vm/mx.vm/ce-aarch64-19-complete @@ -1,4 +1,4 @@ -DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython,truffleruby -COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython,truffleruby +COMPONENTS=cmp,cov,dap,gu,gvm,gwa,icu4j,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-19-complete b/vm/mx.vm/ce-darwin-19-complete index d898f22d35f9..647637366bc0 100644 --- a/vm/mx.vm/ce-darwin-19-complete +++ b/vm/mx.vm/ce-darwin-19-complete @@ -1,4 +1,4 @@ -DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby -COMPONENTS=cmp,cov,dap,ellvm,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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby +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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-darwin-aarch64-19-complete b/vm/mx.vm/ce-darwin-aarch64-19-complete index 314253520f50..36f911520b2f 100644 --- a/vm/mx.vm/ce-darwin-aarch64-19-complete +++ b/vm/mx.vm/ce-darwin-aarch64-19-complete @@ -1,4 +1,4 @@ -DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,graalpython,truffleruby -COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,icu4j,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:javavm,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,lib:rubyvm +DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,graalpython,truffleruby +COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm +NATIVE_IMAGES=graalpy,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,lib:rubyvm DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-win-19-complete b/vm/mx.vm/ce-win-19-complete index eed984fec539..cc692e565423 100644 --- a/vm/mx.vm/ce-win-19-complete +++ b/vm/mx.vm/ce-win-19-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,/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 DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py index b15796ed175c..8946e2845040 100644 --- a/vm/mx.vm/mx_vm.py +++ b/vm/mx.vm/mx_vm.py @@ -162,9 +162,13 @@ # 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_complete_components = ['bnative-image-configure', 'bpolyglot', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'icu4j', 'ins', 'insight', 'insightheap', 'java', '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', '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_19_complete_components = ce_aarch64_19_complete_components + ['R', 'bRMain'] ce_complete_components = ce_aarch64_complete_components + ['ellvm', 'R', 'bRMain'] +ce_darwin_aarch64_19_complete_components = ['bnative-image-configure', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'nfi-libffi', 'ni', 'nic', 'nil', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svmsl', 'tfl', 'tflm', 'vvm'] ce_darwin_aarch64_complete_components = list(ce_aarch64_complete_components) ce_darwin_aarch64_complete_components.remove('gwa') # GR-39032 ce_darwin_aarch64_complete_components.remove('svml') # GR-34811 / GR-40147 @@ -188,15 +192,15 @@ mx_sdk_vm.register_vm_config('ce', ce_components + ['llrn', 'llp', 'llrc', 'llrl'], _suite, env_file='ce-llvm') mx_sdk_vm.register_vm_config('ce', ce_ruby_components, _suite, dist_name='ce-ruby', env_file='ce-ruby') mx_sdk_vm.register_vm_config('ce', ce_win_complete_components, _suite, dist_name='ce-win-complete') -mx_sdk_vm.register_vm_config('ce', ce_win_complete_components, _suite, dist_name='ce-win-complete', env_file='ce-win-19-complete') +mx_sdk_vm.register_vm_config('ce', ce_win_19_complete_components, _suite, dist_name='ce-win-complete', env_file='ce-win-19-complete') mx_sdk_vm.register_vm_config('ce', ce_aarch64_complete_components, _suite, dist_name='ce-aarch64-complete') -mx_sdk_vm.register_vm_config('ce', ce_aarch64_complete_components, _suite, dist_name='ce-aarch64-complete', env_file='ce-aarch64-19-complete') +mx_sdk_vm.register_vm_config('ce', ce_aarch64_19_complete_components, _suite, dist_name='ce-aarch64-complete', env_file='ce-aarch64-19-complete') mx_sdk_vm.register_vm_config('ce', ce_darwin_aarch64_complete_components, _suite, dist_name='ce-darwin-aarch64-complete') -mx_sdk_vm.register_vm_config('ce', ce_darwin_aarch64_complete_components, _suite, dist_name='ce-darwin-aarch64-complete', env_file='ce-darwin-aarch64-19-complete') +mx_sdk_vm.register_vm_config('ce', ce_darwin_aarch64_19_complete_components, _suite, dist_name='ce-darwin-aarch64-complete', env_file='ce-darwin-aarch64-19-complete') mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete') -mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete', env_file='ce-19-complete') +mx_sdk_vm.register_vm_config('ce', ce_19_complete_components, _suite, dist_name='ce-complete', env_file='ce-19-complete') mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete', env_file='ce-darwin-complete') -mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete', env_file='ce-darwin-19-complete') +mx_sdk_vm.register_vm_config('ce', ce_19_complete_components, _suite, dist_name='ce-complete', env_file='ce-darwin-19-complete') mx_sdk_vm.register_vm_config('ce-python', ce_python_components, _suite) mx_sdk_vm.register_vm_config('ce-fastr', ce_fastr_components, _suite) mx_sdk_vm.register_vm_config('ce-no_native', ce_no_native_components, _suite) From 8f904f6eaa100f2de9c68a9d427913bdcaad4c1a Mon Sep 17 00:00:00 2001 From: Imane Mamri Date: Fri, 2 Sep 2022 17:45:37 +0100 Subject: [PATCH 04/11] move structure checks to the end of linux deploy builds --- vm/ci_common/common.jsonnet | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vm/ci_common/common.jsonnet b/vm/ci_common/common.jsonnet index 85548ac1e3f7..66f132956a6d 100644 --- a/vm/ci_common/common.jsonnet +++ b/vm/ci_common/common.jsonnet @@ -516,13 +516,13 @@ local devkits = common_json.devkits; $.mx_vm_installables + $.maven_deploy_sdk_components, $.mx_vm_installables + $.record_file_sizes, $.upload_file_sizes, - ] + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "amd64", java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ + ] + vm.collect_profiles() + $.build_base_graalvm_image + [ $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, self.ci_resources.infra.notify_nexus_deploy, ['set-export', 'GRAALVM_HOME', $.mx_vm_common + ['--quiet', '--no-warning', 'graalvm-home']], - ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "amd64", java_version) , + ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "amd64", java_version) + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "amd64", java_version), notify_groups:: ['deploy'], timelimit: "1:30:00" }, @@ -536,12 +536,12 @@ local devkits = common_json.devkits; $.mx_vm_installables + $.maven_deploy_sdk_components, $.mx_vm_installables + $.record_file_sizes, $.upload_file_sizes, - ] + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "aarch64", java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ + ] + vm.collect_profiles() + $.build_base_graalvm_image + [ $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, self.ci_resources.infra.notify_nexus_deploy, - ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "aarch64", java_version), + ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "aarch64", java_version) + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "aarch64", java_version), notify_groups:: ['deploy'], timelimit: '1:30:00', }, From 26e15240ee506930a334f73df384151b3cbbbd0c Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 5 Sep 2022 18:07:14 +0200 Subject: [PATCH 05/11] Move also the setting of the $GRAALVM_HOME env var. --- vm/ci_common/common.jsonnet | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vm/ci_common/common.jsonnet b/vm/ci_common/common.jsonnet index 66f132956a6d..962d1013e237 100644 --- a/vm/ci_common/common.jsonnet +++ b/vm/ci_common/common.jsonnet @@ -511,18 +511,18 @@ local devkits = common_json.devkits; run: $.patch_env('linux', 'amd64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], - ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], - ] + [ $.mx_vm_installables + $.maven_deploy_sdk_components, $.mx_vm_installables + $.record_file_sizes, $.upload_file_sizes, - ] + vm.collect_profiles() + $.build_base_graalvm_image + [ + ] + vm.collect_profiles() + $.build_base_graalvm_image + [ $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, self.ci_resources.infra.notify_nexus_deploy, ['set-export', 'GRAALVM_HOME', $.mx_vm_common + ['--quiet', '--no-warning', 'graalvm-home']], - ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "amd64", java_version) + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "amd64", java_version), + ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "amd64", java_version) + [ + ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], + ] + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "amd64", java_version), notify_groups:: ['deploy'], timelimit: "1:30:00" }, @@ -531,7 +531,6 @@ local devkits = common_json.devkits; run: $.patch_env('linux', 'aarch64', java_version) + [ $.mx_vm_installables + ['graalvm-show'], $.mx_vm_installables + ['build'], - ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], ] + [ $.mx_vm_installables + $.maven_deploy_sdk_components, $.mx_vm_installables + $.record_file_sizes, @@ -541,7 +540,9 @@ local devkits = common_json.devkits; $.upload_file_sizes, $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, self.ci_resources.infra.notify_nexus_deploy, - ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "aarch64", java_version) + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "aarch64", java_version), + ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("linux", "aarch64", java_version) + [ + ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], + ] + vm.check_graalvm_complete_build($.mx_vm_installables, "linux", "aarch64", java_version), notify_groups:: ['deploy'], timelimit: '1:30:00', }, From 7ce36945a466fcf6a68cd2bb70955b24e9131d05 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 6 Sep 2022 16:01:20 +0200 Subject: [PATCH 06/11] Update graalvm configs (lli launcher replaced with libllvmvm). --- vm/mx.vm/ce-19-complete | 2 +- vm/mx.vm/ce-aarch64-19-complete | 2 +- vm/mx.vm/ce-darwin-19-complete | 2 +- vm/mx.vm/ce-darwin-aarch64-19-complete | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vm/mx.vm/ce-19-complete b/vm/mx.vm/ce-19-complete index 647637366bc0..b44c30ab8717 100644 --- a/vm/mx.vm/ce-19-complete +++ b/vm/mx.vm/ce-19-complete @@ -1,4 +1,4 @@ DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby 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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +NATIVE_IMAGES=graalpy,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,lib:rubyvm,wasm DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-aarch64-19-complete b/vm/mx.vm/ce-aarch64-19-complete index 7f55596a4097..4a8118d7aef9 100644 --- a/vm/mx.vm/ce-aarch64-19-complete +++ b/vm/mx.vm/ce-aarch64-19-complete @@ -1,4 +1,4 @@ DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython,truffleruby COMPONENTS=cmp,cov,dap,gu,gvm,gwa,icu4j,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +NATIVE_IMAGES=graalpy,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,lib:rubyvm,wasm DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-19-complete b/vm/mx.vm/ce-darwin-19-complete index 647637366bc0..b44c30ab8717 100644 --- a/vm/mx.vm/ce-darwin-19-complete +++ b/vm/mx.vm/ce-darwin-19-complete @@ -1,4 +1,4 @@ DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby 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,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,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,lli,native-image,lib:rubyvm,wasm +NATIVE_IMAGES=graalpy,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,lib:rubyvm,wasm DISABLE_INSTALLABLES=false diff --git a/vm/mx.vm/ce-darwin-aarch64-19-complete b/vm/mx.vm/ce-darwin-aarch64-19-complete index 36f911520b2f..b6e6e605b30f 100644 --- a/vm/mx.vm/ce-darwin-aarch64-19-complete +++ b/vm/mx.vm/ce-darwin-aarch64-19-complete @@ -1,4 +1,4 @@ DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,graalpython,truffleruby COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm,vvm -NATIVE_IMAGES=graalpy,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,lib:rubyvm +NATIVE_IMAGES=graalpy,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jsvm,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,lib:rubyvm DISABLE_INSTALLABLES=false From 9fa4a803093c11f17d1c7685bc602665cd383570 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Fri, 9 Sep 2022 16:12:26 +0200 Subject: [PATCH 07/11] Do not use profiles on Windows (GR-40930). --- vm/ci_common/common.jsonnet | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/vm/ci_common/common.jsonnet b/vm/ci_common/common.jsonnet index 962d1013e237..f1b8f730e3cc 100644 --- a/vm/ci_common/common.jsonnet +++ b/vm/ci_common/common.jsonnet @@ -450,10 +450,20 @@ local devkits = common_json.devkits; ['set-export', 'GRAALVM_HOME', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'graalvm-home']], ], + build_base_graalvm_image_no_profiles: [ + $.mx_vm_common + ['graalvm-show'], + $.mx_vm_common + ['build'], + ['set-export', 'GRAALVM_HOME', $.mx_vm_common + ['--quiet', '--no-warning', 'graalvm-home']], + ], + check_base_graalvm_image(os, arch, java_version): [ ['set-export', 'GRAALVM_DIST', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + vm.vm_profiles + ['graalvm-dist-name']]] ] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version), + check_base_graalvm_image_no_profiles(os, arch, java_version): [ + ['set-export', 'GRAALVM_DIST', $.mx_vm_common + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + ['graalvm-dist-name']]] + ] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version), + patch_env(os, arch, java_version): # linux if (os == 'linux') then @@ -598,12 +608,12 @@ local devkits = common_json.devkits; }, deploy_graalvm_base_windows_amd64(java_version): vm.check_structure + { - run: $.patch_env('windows', 'amd64', java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ - $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, + run: $.patch_env('windows', 'amd64', java_version) + $.build_base_graalvm_image_no_profiles + [ + $.mx_vm_common + $.record_file_sizes, $.upload_file_sizes, - $.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base, + $.mx_vm_common + $.maven_deploy_sdk_base, self.ci_resources.infra.notify_nexus_deploy, - ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("windows", "amd64", java_version), + ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image_no_profiles("windows", "amd64", java_version), notify_groups:: ['deploy'], timelimit: '1:30:00', }, From 373a88fdc7d3866755dc0c5fd576b054990320fc Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 12 Sep 2022 16:46:45 +0200 Subject: [PATCH 08/11] Release JDK19 CE artefacts. --- vm/ce-release-artifacts.json | 265 +++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/vm/ce-release-artifacts.json b/vm/ce-release-artifacts.json index bf9937aa5834..7e43d13550ba 100644 --- a/vm/ce-release-artifacts.json +++ b/vm/ce-release-artifacts.json @@ -53,6 +53,33 @@ } ] }, + { + "name": "graalvm-ce-java19", + "core": true, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + }, + { + "os": "windows", + "arch": "amd64" + } + ] + }, { "name": "js-standalone-svm-java11", "core": true, @@ -188,6 +215,29 @@ } ] }, + { + "name": "llvm-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + } + ] + }, { "name": "llvm-toolchain-installable-java11", "core": false, @@ -234,6 +284,29 @@ } ] }, + { + "name": "llvm-toolchain-installable-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + } + ] + }, { "name": "native-image-installable-svm-java11", "core": false, @@ -288,6 +361,33 @@ } ] }, + { + "name": "native-image-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + }, + { + "os": "windows", + "arch": "amd64" + } + ] + }, { "name": "python-installable-svm-java11", "core": false, @@ -334,6 +434,29 @@ } ] }, + { + "name": "python-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + } + ] + }, { "name": "r-installable-java11", "core": false, @@ -364,6 +487,21 @@ } ] }, + { + "name": "r-installable-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "amd64" + } + ] + }, { "name": "ruby-installable-svm-java11", "core": false, @@ -410,6 +548,29 @@ } ] }, + { + "name": "ruby-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + } + ] + }, { "name": "wasm-installable-svm-java11", "core": false, @@ -456,6 +617,29 @@ } ] }, + { + "name": "wasm-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "windows", + "arch": "amd64" + } + ] + }, { "name": "espresso-installable-svm-java11", "core": false, @@ -594,6 +778,33 @@ } ] }, + { + "name": "nodejs-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + }, + { + "os": "windows", + "arch": "amd64" + } + ] + }, { "name": "js-installable-svm-java11", "core": false, @@ -648,6 +859,33 @@ } ] }, + { + "name": "js-installable-svm-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + }, + { + "os": "windows", + "arch": "amd64" + } + ] + }, { "name": "visualvm-installable-ce-java11", "core": false, @@ -701,5 +939,32 @@ "arch": "amd64" } ] + }, + { + "name": "visualvm-installable-ce-java19", + "core": false, + "jdk": "jdk_19", + "artifacts": [ + { + "os": "linux", + "arch": "amd64" + }, + { + "os": "linux", + "arch": "aarch64" + }, + { + "os": "darwin", + "arch": "amd64" + }, + { + "os": "darwin", + "arch": "aarch64" + }, + { + "os": "windows", + "arch": "amd64" + } + ] } ] From 11c84ea720895a6d0404c0cf90a454e34d9676a8 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 12 Sep 2022 17:14:31 +0200 Subject: [PATCH 09/11] Remove dumplicated env files and GraalVM configs. --- vm/mx.vm/ce-19 | 4 ---- vm/mx.vm/ce-aarch64-19 | 4 ---- vm/mx.vm/ce-darwin-19 | 4 ---- vm/mx.vm/ce-darwin-aarch64-19 | 4 ---- vm/mx.vm/ce-win-19 | 4 ---- vm/mx.vm/mx_vm.py | 5 ----- 6 files changed, 25 deletions(-) delete mode 100644 vm/mx.vm/ce-19 delete mode 100644 vm/mx.vm/ce-aarch64-19 delete mode 100644 vm/mx.vm/ce-darwin-19 delete mode 100644 vm/mx.vm/ce-darwin-aarch64-19 delete mode 100644 vm/mx.vm/ce-win-19 diff --git a/vm/mx.vm/ce-19 b/vm/mx.vm/ce-19 deleted file mode 100644 index ecfacea7b889..000000000000 --- a/vm/mx.vm/ce-19 +++ /dev/null @@ -1,4 +0,0 @@ -DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle -COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm -NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler -DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-aarch64-19 b/vm/mx.vm/ce-aarch64-19 deleted file mode 100644 index ecfacea7b889..000000000000 --- a/vm/mx.vm/ce-aarch64-19 +++ /dev/null @@ -1,4 +0,0 @@ -DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle -COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm -NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler -DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-19 b/vm/mx.vm/ce-darwin-19 deleted file mode 100644 index ecfacea7b889..000000000000 --- a/vm/mx.vm/ce-darwin-19 +++ /dev/null @@ -1,4 +0,0 @@ -DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle -COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm -NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler -DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-darwin-aarch64-19 b/vm/mx.vm/ce-darwin-aarch64-19 deleted file mode 100644 index ecfacea7b889..000000000000 --- a/vm/mx.vm/ce-darwin-aarch64-19 +++ /dev/null @@ -1,4 +0,0 @@ -DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle -COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm -NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler -DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/ce-win-19 b/vm/mx.vm/ce-win-19 deleted file mode 100644 index 2c6fe3d5e1ab..000000000000 --- a/vm/mx.vm/ce-win-19 +++ /dev/null @@ -1,4 +0,0 @@ -DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle -COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm -NATIVE_IMAGES=gu,lib:jvmcicompiler -DISABLE_INSTALLABLES=False diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py index 8946e2845040..400053e3747c 100644 --- a/vm/mx.vm/mx_vm.py +++ b/vm/mx.vm/mx_vm.py @@ -178,15 +178,10 @@ ce_no_native_components = ['bgu', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'lsp', 'nfi-libffi', 'nfi', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm', 'libpoly', 'poly'] mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm'], _suite, env_file='ce-win') -mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm'], _suite, env_file='ce-win-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64') -mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin') -mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64') -mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64-19') mx_sdk_vm.register_vm_config('ce', ce_components, _suite) -mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-19') mx_sdk_vm.register_vm_config('ce', ce_components + ['js'], _suite, dist_name='ce-js', env_file='ce-js') mx_sdk_vm.register_vm_config('ce', ce_components + ['js', 'njs', 'sjsvm'], _suite, dist_name='ce', env_file='ce-nodejs') mx_sdk_vm.register_vm_config('ce', ce_components + ['llrn', 'llp', 'llrc', 'llrl'], _suite, env_file='ce-llvm') From c353a89ec7c29016c2652c217ccbac7f312e6444 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 12 Sep 2022 17:24:22 +0200 Subject: [PATCH 10/11] Fix unintentional change. --- common.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.jsonnet b/common.jsonnet index b5583b2ca949..595ea27fd9f2 100644 --- a/common.jsonnet +++ b/common.jsonnet @@ -32,7 +32,7 @@ local add_jdk_version(name) = local version = find_first_integer(jdk.version); // santity check that the parsed version is also included in the name assert std.length(std.findSubstr(std.toString(version), name)) == 1 : "Cannot find version %d in name %s" % [version, name]; - { jdk_version: version} + { jdk_version:: version} ; { From f8120aca1c90827e92562968e176bd2a6ace2a43 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 12 Sep 2022 17:39:06 +0200 Subject: [PATCH 11/11] Reduce code duplication. --- vm/ci_common/common.jsonnet | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vm/ci_common/common.jsonnet b/vm/ci_common/common.jsonnet index f1b8f730e3cc..278598a50097 100644 --- a/vm/ci_common/common.jsonnet +++ b/vm/ci_common/common.jsonnet @@ -393,7 +393,6 @@ local devkits = common_json.devkits; svm_common_darwin_amd64: { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.darwin_amd64, svm_common_darwin_aarch64: { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.darwin_aarch64, svm_common_windows_amd64(jdk): { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.windows + common_json.devkits["windows-jdk" + jdk], - svm_common_windows_jdk19: { environment+: graal_common.svm_deps.common.environment, logs+: graal_common.svm_deps.common.logs} + graal_common.svm_deps.windows + common_json.devkits['windows-jdk19'], maven_deploy_sdk: ['--suite', 'sdk', 'maven-deploy', '--validate', 'none', '--all-distribution-types', '--with-suite-revisions-metadata'], maven_deploy_sdk_base: self.maven_deploy_sdk + ['--tags', 'graalvm', vm.binaries_repository], @@ -679,8 +678,8 @@ local devkits = common_json.devkits; 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_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_base_java19_windows_amd64: vm.vm_java_19 + self.svm_common_windows_jdk19 + 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_jdk19 + 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_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 the GraalVM Ruby image (GraalVM Base + ruby - js)