From f4e1908bcf89b159ec316774205dee73e905b9f7 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 13 Sep 2022 12:02:08 +0200 Subject: [PATCH 1/5] Patch sulong gate name. --- sulong/ci.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sulong/ci.jsonnet b/sulong/ci.jsonnet index 4429f0cc955d..c597f28a8c4f 100644 --- a/sulong/ci.jsonnet +++ b/sulong/ci.jsonnet @@ -74,7 +74,7 @@ local sc = (import "ci_common/sulong-common.jsonnet"); sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-linux-aarch64", timelimit: "30:00" }, - sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMPDarwinAArch64 + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-jdk17-darwin-aarch64", timelimit: "30:00" }, + sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMPDarwinAArch64 + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-darwin-aarch64", timelimit: "30:00" }, sc.weekly + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + $.sulong_coverage { name: "weekly-sulong-coverage-jdk17-linux-amd64" }, ]], From 07cbda433a57295c4eaa565d8b04a581e553ac89 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 13 Sep 2022 12:16:26 +0200 Subject: [PATCH 2/5] Revert "Remove dumplicated env files and GraalVM configs." This reverts commit 11c84ea720895a6d0404c0cf90a454e34d9676a8. --- 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 insertions(+) create mode 100644 vm/mx.vm/ce-19 create mode 100644 vm/mx.vm/ce-aarch64-19 create mode 100644 vm/mx.vm/ce-darwin-19 create mode 100644 vm/mx.vm/ce-darwin-aarch64-19 create mode 100644 vm/mx.vm/ce-win-19 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-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-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-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-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/mx_vm.py b/vm/mx.vm/mx_vm.py index 400053e3747c..8946e2845040 100644 --- a/vm/mx.vm/mx_vm.py +++ b/vm/mx.vm/mx_vm.py @@ -178,10 +178,15 @@ 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 f3d7e7acdc090a230f946cc47a4294243212887c Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 13 Sep 2022 13:53:39 +0200 Subject: [PATCH 3/5] Revert "Do not use profiles on Windows (GR-40930)." This reverts commit 9fa4a803093c11f17d1c7685bc602665cd383570. --- vm/ci_common/common.jsonnet | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/vm/ci_common/common.jsonnet b/vm/ci_common/common.jsonnet index 278598a50097..fd3a78146a94 100644 --- a/vm/ci_common/common.jsonnet +++ b/vm/ci_common/common.jsonnet @@ -449,20 +449,10 @@ 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 @@ -607,12 +597,12 @@ local devkits = common_json.devkits; }, deploy_graalvm_base_windows_amd64(java_version): vm.check_structure + { - run: $.patch_env('windows', 'amd64', java_version) + $.build_base_graalvm_image_no_profiles + [ - $.mx_vm_common + $.record_file_sizes, + 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 + $.maven_deploy_sdk_base, + $.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_no_profiles("windows", "amd64", java_version), + ] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("windows", "amd64", java_version), notify_groups:: ['deploy'], timelimit: '1:30:00', }, From ce0371456a104d78d4675ccf123041c0d20ac803 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 13 Sep 2022 14:43:46 +0200 Subject: [PATCH 4/5] Update ProGuard libraries (GR-40983). --- graal-common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graal-common.json b/graal-common.json index 6abb7caf0df9..3e8fe3a930ad 100644 --- a/graal-common.json +++ b/graal-common.json @@ -4,5 +4,5 @@ "overlay": "b84cafb1bb9555b3b13443815280c85df77cfc75" }, - "mx_version" : "6.7.0" + "mx_version" : "6.9.1" } From 5723f303fa23a97b66e13f27e471b2bd84082395 Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Tue, 13 Sep 2022 15:05:37 +0200 Subject: [PATCH 5/5] Work around bug in sjsonnet regarding assertions. --- sulong/ci_common/sulong-common.jsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sulong/ci_common/sulong-common.jsonnet b/sulong/ci_common/sulong-common.jsonnet index 97373f246af2..7d368d5c3ddf 100644 --- a/sulong/ci_common/sulong-common.jsonnet +++ b/sulong/ci_common/sulong-common.jsonnet @@ -39,9 +39,9 @@ local sulong_deps = composable((import "../../common.json").sulong.deps); gen_name:: std.join("-", self.gen_name_componentes), }, - defBuild(b):: $.build_template + b + { + defBuild(b):: { assert self.gen_name == self.name : "Name error. expected '%s', actual '%s'" % [self.gen_name, self.name], - } + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {}, + } + $.build_template + b + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {}, linux_amd64:: linux_amd64 + sulong_deps.linux, linux_aarch64:: linux_aarch64 + sulong_deps.linux,