[GR-65874] Add G1 variant of espresso standalone.

PullRequest: graal/21092

Author: gilles-duboscq

espresso/mx.espresso/mx_espresso.py

@@ -567,12 +567,19 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
         }, None, True, None, platforms='local', ignore=ignore_msg))
 
     register_espresso_runtime_resources(register_project, register_distribution, _suite)
+    deliverable_variant = mx.get_env('ESPRESSO_DELIVERABLE_VARIANT')
+    if deliverable_variant:
+        suffix = '-' + deliverable_variant.lower()
+        dist_suffix = '_' + deliverable_variant.upper()
+    else:
+        suffix = ''
+        dist_suffix = ''
     register_distribution(DeliverableStandaloneArchive(_suite,
         standalone_dist='ESPRESSO_NATIVE_STANDALONE',
-        community_archive_name=f"espresso-community-java{java_home_dep.major_version}",
-        enterprise_archive_name=f"espresso-java{java_home_dep.major_version}",
-        community_dist_name=f'GRAALVM_ESPRESSO_COMMUNITY_JAVA{java_home_dep.major_version}',
-        enterprise_dist_name=f'GRAALVM_ESPRESSO_JAVA{java_home_dep.major_version}'))
+        community_archive_name=f"espresso-community-java{java_home_dep.major_version}{suffix}",
+        enterprise_archive_name=f"espresso-java{java_home_dep.major_version}{suffix}",
+        community_dist_name=f'GRAALVM_ESPRESSO_COMMUNITY_JAVA{java_home_dep.major_version}{dist_suffix}',
+        enterprise_dist_name=f'GRAALVM_ESPRESSO_JAVA{java_home_dep.major_version}{dist_suffix}'))
 
 
 def espresso_resources_suite():

vm/ci/ci_common/common-runspec.jsonnet

@@ -195,17 +195,18 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
     },
   } else {})),
 
-  local deploy_graalvm_espresso = svm_common + common_os_deploy + espresso_name + task_spec({
+  local deploy_graalvm_espresso(with_g1=false) = svm_common + common_os_deploy + espresso_name + task_spec({
     notify_groups:: ['deploy'],
   }) + build_base_graalvm_image(with_profiles=false) + task_spec({
-    espresso_standalone_dist:: if vm.edition == 'ce' then 'GRAALVM_ESPRESSO_COMMUNITY_JAVA21' else 'GRAALVM_ESPRESSO_JAVA21',
+    espresso_standalone_dist:: (if vm.edition == 'ce' then 'GRAALVM_ESPRESSO_COMMUNITY_JAVA21' else 'GRAALVM_ESPRESSO_JAVA21') +
+      (if with_g1 then '_G1' else ''),
     mx_vm_espresso:: vm.mx_cmd_base_no_env + ['--env', self.mx_env_espresso] + self.mx_vm_cmd_suffix,
-    run +:[
+    run +: (if with_g1 then [['set-export', 'ESPRESSO_DELIVERABLE_VARIANT', 'G1']] else []) + [
       # $GRAALVM_HOME was built and set by build_base_graalvm_image
       # Build the espresso standalone with this GraalVM
       ['set-export', 'BOOTSTRAP_GRAALVM', '$GRAALVM_HOME'],
       ['set-export', 'VM_ENV', self.mx_env_espresso],
-      self.mx_vm_espresso + ['build', '--targets=' + self.espresso_standalone_dist],
+      self.mx_vm_espresso + (if with_g1 then ['--extra-image-builder-argument=--gc=G1'] else []) + ['build', '--targets=' + self.espresso_standalone_dist],
       # Smoke test the built stabndalone
       ['set-export', 'ESPRESSO_STANDALONE', self.mx_vm_espresso + ['--quiet', '--no-warning', 'path', '--output', 'ESPRESSO_NATIVE_STANDALONE']],
       ['set-export', 'DACAPO_JAR', self.mx_vm_espresso + ['--quiet', '--no-warning', 'paths', '--download', 'DACAPO_MR1_2baec49']],
@@ -235,14 +236,19 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
     #
     # Deploy the GraalVM Espresso artifact (GraalVM Base + espresso - native image)
     #
-    "vm-espresso": mx_env + deploy_graalvm_espresso + espresso_java_home(21) + default_os_arch_jdk_mixin + platform_spec(no_jobs) + (
+    "vm-espresso": mx_env + deploy_graalvm_espresso() + espresso_java_home(21) + default_os_arch_jdk_mixin + platform_spec(no_jobs) + (
     if vm.deploy_espress_standalone then platform_spec({
-      "linux:amd64:jdk-latest": weekly,
+      "linux:amd64:jdk-latest": daily,
       "linux:aarch64:jdk-latest": weekly,
       "darwin:amd64:jdk-latest": weekly,
       "darwin:aarch64:jdk-latest": weekly,
       "windows:amd64:jdk-latest": weekly,
     }) else {}),
+    "vm-espresso-g1": mx_env + deploy_graalvm_espresso(with_g1=true) + espresso_java_home(21) + default_os_arch_jdk_mixin + platform_spec(no_jobs) + (
+    if vm.deploy_espress_standalone && vm.edition == 'ee' then platform_spec({
+      "linux:amd64:jdk-latest": daily,
+      "linux:aarch64:jdk-latest": weekly,
+    }) else {}),
   },
 
   builds: utils.add_defined_in(std.flattenArrays([run_spec.process(task_dict).list for task_dict in [