[GR-67907] Migrate polybench gates to tiers.

PullRequest: graal/21675

Author: DSouzaM

vm/ci/ci_common/common-bench.jsonnet

@@ -52,14 +52,14 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
       ENABLE_POLYBENCH_HPC: 'yes',
       POLYBENCH_HPC_EXTRA_HEADERS: '/cm/shared/apps/papi/papi-5.5.1/include',
       POLYBENCH_HPC_PAPI_LIB_DIR: '/cm/shared/apps/papi/papi-5.5.1/lib',
-    } + if !std.objectHasAll(self, 'machine_name') then {} else if self.machine_name  == 'e3' ||  self.machine_name  == 'e4_36_256' then {LIBPFM_FORCE_PMU: 'amd64'} else if self.machine_name == 'x52' then {} else {},
+    } + if !std.objectHasAll(self, 'machine_name') then {} else if std.count(['e3', 'e4_36_256', 'e4_8_64'], self.machine_name) > 0 then {LIBPFM_FORCE_PMU: 'amd64'} else if self.machine_name == 'x52' then {} else {},
   },
 
   vm_bench_polybenchmarks_base(env): {
     base_cmd:: ['mx', '--env', env, '--dy', 'polybenchmarks'],
   },
 
-  vm_bench_polybenchmarks_linux_build: common.deps.svm + common.deps.truffleruby + common.deps.graalpy + vm.custom_vm + vm.vm_java_Latest + self.polybench_hpc_linux_common(shape='e4_36_256') + self.vm_bench_polybenchmarks_base(env='polybench-${VM_ENV}') + {
+  vm_bench_polybenchmarks_linux_build: common.deps.svm + common.deps.truffleruby + common.deps.graalpy + vm.custom_vm + vm.vm_java_Latest + self.polybench_hpc_linux_common(shape='e4_8_64') + self.vm_bench_polybenchmarks_base(env='polybench-${VM_ENV}') + {
     setup+: [
       self.base_cmd + ['sforceimports'],
     ],
@@ -80,7 +80,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
   },
 
   # TODO (GR-60584): re-enable espresso polybench jobs once polybench is unchained
-  vm_bench_polybenchmarks_linux_common(vm_config='jvm', is_gate=false, suite='default:~r[.*jar]', shape=null): common.deps.svm + common.deps.truffleruby + vm.custom_vm + vm.vm_java_Latest + self.polybench_hpc_linux_common(shape=shape) + self.vm_bench_polybenchmarks_base(env='polybench-${VM_ENV}') {
+  vm_bench_polybenchmarks_linux_common(vm_config='jvm', is_gate=false, suite='default:~r[.*jar]', shape=null): common.deps.svm + common.deps.truffleruby + vm.custom_vm + vm.vm_java_Latest + self.polybench_hpc_linux_common(shape=shape) + self.vm_bench_polybenchmarks_base(env='polybench-${VM_ENV}') + (if is_gate then self.vm_bench_base(machine_name=null) else self.vm_bench_common) + {
     bench_cmd:: self.base_cmd + ['benchmark', '--results-file', self.result_file],
     setup+: [
       self.base_cmd + ['sforceimports'],
@@ -104,7 +104,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
     notify_emails+: if (is_gate) then [] else [ '[email protected]' ],
     teardown+:      if (is_gate) then [] else [ $.vm_bench_common.upload ],
     timelimit:      if (is_gate) then '1:00:00' else '1:30:00',
-  } + (if is_gate then self.vm_bench_base(machine_name=null) else self.vm_bench_common),
+  },
 
   vm_bench_polybench_linux_common(env='polybench-${VM_ENV}', fail_fast=false, skip_machine=false): (if skip_machine then self.vm_bench_base(machine_name=null) else self.vm_bench_common) + common.deps.svm + common.deps.truffleruby + common.deps.graalpy + common.deps.wasm + vm.custom_vm {
     base_cmd:: ['mx', '--env', env],
@@ -125,7 +125,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
     notify_groups:: ['polybench'],
   },
 
-  vm_bench_polybench_hpc_linux_common(env, metric, benchmarks='*', polybench_vm_config='native-interpreter'): self.polybench_hpc_linux_common(shape='e4_36_256') + self.vm_bench_polybench_linux_common(env=env, fail_fast=false, skip_machine=true) + {
+  vm_bench_polybench_hpc_linux_common(env, metric, benchmarks='*', polybench_vm_config='native-interpreter'): self.polybench_hpc_linux_common(shape='e4_8_64') + self.vm_bench_polybench_linux_common(env=env, fail_fast=false, skip_machine=true) + {
     machine_name_prefix:: "gate-",
     run+: [
       self.base_cmd + ['benchmark', 'polybench:'+benchmarks,
@@ -211,7 +211,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
       self.compiler_bench_cmd(vmConfig='native-standard') + ['--metric=partial-evaluation-time'],
       self.warmup_bench_cmd(vmConfig='native-standard') + ['--metric=one-shot'],
     ],
-    timelimit: '1:30:00',
+    timelimit: '1:00:00',
     notify_groups: ['polybench'],
   },
 
@@ -325,8 +325,8 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
       notify_groups:: ['javascript'],
     },
 
-    vm_common.vm_base('linux', 'amd64', 'gate') + self.vm_bench_polybenchmarks_linux_common(is_gate=true, shape='e4_36_256')    + {name: 'gate-vm-' + vm.vm_setup.short_name + '-polybenchmarks-' + utils.jdk_and_hardware(self)},
-    vm_common.vm_base('linux', 'amd64', 'gate') + self.vm_gate_polybench_linux + {name: 'gate-vm-' + vm.vm_setup.short_name + '-polybench-' + utils.jdk_and_hardware(self)},
+    vm_common.vm_base('linux', 'amd64', 'tier3') + self.vm_bench_polybenchmarks_linux_common(is_gate=true, shape='e4_8_64')    + {name: 'gate-vm-' + vm.vm_setup.short_name + '-polybenchmarks-' + utils.jdk_and_hardware(self)},
+    vm_common.vm_base('linux', 'amd64', 'tier3') + self.vm_gate_polybench_linux + {name: 'gate-vm-' + vm.vm_setup.short_name + '-polybench-' + utils.jdk_and_hardware(self)},
   ],
 
   builds: utils.add_defined_in(builds, std.thisFile),