Skip to content

Commit 751f27a

Browse files
committed
[GR-53334] Refactor tags into tag groups.
PullRequest: graal/17539
2 parents f5d35bd + 6a1f001 commit 751f27a

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
4545
assert std.length(std.toString(import 'ci/ci_common/common.jsonnet')) > 0,
4646
ci_resources:: (import 'ci/ci_common/ci-resources.libsonnet'),
4747
overlay: graal_common.ci.overlay,
48-
specVersion: "3",
48+
specVersion: "4",
4949
builds: [common.add_excludes_guard(b) for b in (
5050
common.with_components(compiler.builds, ["compiler"]) +
5151
common.with_components(wasm.builds, ["wasm"]) +

ci/ci_common/bench-common.libsonnet

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@
120120
]
121121
},
122122

123+
generate_fork_tags(suite_obj):: if std.objectHasAll(suite_obj, "tags") && std.objectHasAll(suite_obj.tags, "opt_post_merge") then {
124+
tags: {opt_post_merge: [tag +"-many-forks" for tag in suite_obj.tags.opt_post_merge]},
125+
} else {
126+
tags: {}
127+
},
128+
123129
generate_fork_builds(suite_obj, subdir='compiler', forks_file_base_name=null)::
124130
/* based on a benchmark suite definition, generates the many forks version based on the hidden fields
125131
* 'forks_batches' that specifies the number of batches this job should be split into and the corresponding
@@ -134,13 +140,12 @@
134140
local batch_str = if suite_obj.forks_batches > 1 then "batch"+i else null,
135141
"job_prefix":: "bench-forks-" + subdir,
136142
"job_suffix":: batch_str,
137-
tags: if std.objectHasAll(suite_obj, "tags") then [tag +"-many-forks" for tag in suite_obj.tags] else [],
138143
"timelimit": suite_obj.forks_timelimit,
139144
local base_name = if forks_file_base_name != null then forks_file_base_name else suite_obj.suite,
140145
"environment" +: {
141146
FORK_COUNT_FILE: "${FORK_COUNTS_DIRECTORY}/" + subdir + "/" + base_name + "_forks" + (if batch_str != null then "_"+batch_str else "") + ".json"
142147
}
143-
}
148+
} + $.generate_fork_tags(suite_obj)
144149
for i in std.range(0, suite_obj.forks_batches - 1)]
145150
else
146151
[],

ci/common.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ local common_json = import "../common.json";
329329
},
330330
opt_post_merge: {
331331
targets+: ["opt-post-merge"],
332-
tags+: []
332+
tags+: {opt_post_merge +: []},
333333
},
334334
daily: {
335335
targets+: ["daily"],

compiler/ci/ci_common/compiler-common.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
local use_libgraal_profile = libgraal_profiling_only(config.compiler.use_libgraal_profile),
5656

5757
job_prefix:: "bench-compiler",
58-
tags+: ["bench-compiler"],
58+
tags+: {opt_post_merge+: ["bench-compiler"]},
5959
python_version : "3",
6060
packages+: common.deps.svm.packages,
6161
environment+: {

0 commit comments

Comments
 (0)