Skip to content

Commit df35048

Browse files
farquetfarquet
committed
[GR-18301] [GR-13817] [GR-33094] Upgrade dacapo suite and add JDK17 benchmarking.
PullRequest: graal/9519
2 parents 80b7e87 + 76a1a72 commit df35048

File tree

14 files changed

+545
-244
lines changed

14 files changed

+545
-244
lines changed

‎bench-common.libsonnet‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
generated_name:: utils.hyphenize([self.job_prefix, self.suite, self.platform, utils.prefixed_jdk(self.jdk_version), self.os, self.arch, self.job_suffix]),
1010
job_prefix:: null,
1111
job_suffix:: null,
12-
name: self.generated_name,
12+
name:
13+
if self.is_jdk_supported(self.jdk_version) then self.generated_name
14+
else error "JDK" + self.jdk_version + " is not supported for " + self.generated_name + "! Suite is explicitly marked as working for JDK versions "+ self.min_jdk_version + " until " + self.max_jdk_version,
1315
suite:: error "'suite' must be set to generate job name",
1416
timelimit: error "build 'timelimit' is not set for "+ self.name +"!",
1517
local ol8_image = self.ci_resources.infra.ol8_bench_image,
@@ -18,6 +20,12 @@
1820
"mount_modules": true
1921
},
2022
should_use_hwloc:: std.objectHasAll(self, "is_numa") && self.is_numa && std.length(std.find("bench", self.targets)) > 0,
23+
min_jdk_version:: null,
24+
max_jdk_version:: null,
25+
is_jdk_supported(jdk_version)::
26+
if self.min_jdk_version != null && jdk_version < self.min_jdk_version then false
27+
else if self.max_jdk_version != null && jdk_version > self.max_jdk_version then false
28+
else true
2129
},
2230

2331
bench_hw:: {

‎compiler/ci_common/benchmark-builders.jsonnet‎

Lines changed: 68 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,39 @@
77

88
local jdk8 = c.oraclejdk8,
99
local jdk11 = c.labsjdk11,
10+
local jdk17 = c.labsjdk17,
11+
12+
local amd64_jdks = [jdk8, jdk11, jdk17],
13+
local aarch64_jdks = [jdk11, jdk17],
1014

1115
local main_builds = [
12-
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.dacapo,
16+
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.dacapo,
1317
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.dacapo,
18+
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.dacapo_size_variants,
19+
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.dacapo_size_variants,
1420
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.dacapo_timing,
1521
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.dacapo_timing,
16-
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo,
22+
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo,
1723
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.scala_dacapo,
24+
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo_size_variants,
25+
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.scala_dacapo_size_variants,
1826
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo_timing,
1927
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.scala_dacapo_timing,
2028
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.renaissance,
2129
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.renaissance,
2230
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.specjvm2008,
23-
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.specjvm2008,
31+
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.specjvm2008,
2432
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2005,
25-
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2005,
26-
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2015,
27-
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2015,
33+
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2005,
34+
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2015,
35+
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2015,
2836
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2015_full_machine,
2937
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2015_full_machine,
3038
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.renaissance_0_10,
3139
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.renaissance_0_10,
3240
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.awfy,
3341
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.awfy,
34-
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.renaissance_legacy,
42+
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.renaissance_legacy,
3543
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.renaissance_legacy,
3644
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.micros_graal_whitebox,
3745
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.micros_graal_whitebox,
@@ -41,12 +49,17 @@
4149
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.micros_misc_graal_dist,
4250
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.micros_shootout_graal_dist,
4351
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.micros_shootout_graal_dist,
44-
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.dacapo,
52+
53+
c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.dacapo,
4554
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.dacapo,
55+
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.dacapo_size_variants,
56+
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.dacapo_size_variants,
4657
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.dacapo_timing,
4758
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.dacapo_timing,
48-
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo,
59+
c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo,
4960
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo,
61+
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo_size_variants,
62+
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo_size_variants,
5063
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo_timing,
5164
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo_timing,
5265
c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.renaissance,
@@ -56,7 +69,7 @@
5669
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2005,
5770
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2005,
5871
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2015,
59-
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015,
72+
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015,
6073
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2015_full_machine,
6174
c.on_demand + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015_full_machine,
6275
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_0_10,
@@ -73,6 +86,41 @@
7386
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.micros_misc_graal_dist,
7487
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.micros_shootout_graal_dist,
7588
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.micros_shootout_graal_dist,
89+
90+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.dacapo,
91+
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.dacapo,
92+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.dacapo_size_variants,
93+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.dacapo_size_variants,
94+
c.weekly + hw.x52 + jdk17 + cc.libgraal + bench.dacapo_timing,
95+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.dacapo_timing,
96+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo,
97+
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo,
98+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_size_variants,
99+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_size_variants,
100+
c.weekly + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_timing,
101+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_timing,
102+
#c.post_merge + hw.x52 + jdk17 + cc.libgraal + bench.renaissance,
103+
#c.daily + hw.x52 + jdk17 + cc.jargraal + bench.renaissance,
104+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.specjvm2008,
105+
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.specjvm2008,
106+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2005,
107+
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2005,
108+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2015,
109+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2015,
110+
c.weekly + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2015_full_machine,
111+
c.on_demand + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2015_full_machine,
112+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.awfy,
113+
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.awfy,
114+
#c.post_merge + hw.x52 + jdk17 + cc.libgraal + bench.renaissance_legacy,
115+
#c.daily + hw.x52 + jdk17 + cc.jargraal + bench.renaissance_legacy,
116+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_graal_whitebox,
117+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_graal_whitebox,
118+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_graal_dist,
119+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_graal_dist,
120+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_misc_graal_dist,
121+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_misc_graal_dist,
122+
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_shootout_graal_dist,
123+
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_shootout_graal_dist
76124
],
77125

78126
// JFR and async-profiler jobs
@@ -81,8 +129,9 @@
81129
c.weekly + hw.x52 + jdk + cc.libgraal + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" },
82130
c.weekly + hw.x52 + jdk + cc.jargraal + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" }
83131
]
84-
for jdk in [jdk8, jdk11]
132+
for jdk in amd64_jdks
85133
for suite in bench.groups.profiled_suites
134+
if suite.is_jdk_supported(jdk.jdk_version)
86135
]),
87136

88137
// Microservices
@@ -91,8 +140,9 @@
91140
c.daily + hw.x52 + jdk + cc.libgraal + suite,
92141
c.daily + hw.x52 + jdk + cc.jargraal + suite
93142
]
94-
for jdk in [jdk8, jdk11]
143+
for jdk in amd64_jdks
95144
for suite in bench.groups.microservice_suites
145+
if suite.is_jdk_supported(jdk.jdk_version)
96146
]),
97147

98148
// intensive weekly benchmarking
@@ -101,16 +151,19 @@
101151
cc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.libgraal + suite),
102152
cc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.jargraal + suite)
103153
])
104-
for jdk in [jdk8, jdk11]
154+
for jdk in amd64_jdks
105155
for suite in bench.groups.weekly_forks_suites
156+
if suite.is_jdk_supported(jdk.jdk_version)
106157
]),
107158

108159
local aarch64_builds = std.flattenArrays([
109160
[
110-
c.weekly + hw.xgene3 + jdk11 + cc.libgraal + suite,
111-
c.weekly + hw.xgene3 + jdk11 + cc.jargraal + suite
161+
c.weekly + hw.xgene3 + jdk + cc.libgraal + suite,
162+
c.weekly + hw.xgene3 + jdk + cc.jargraal + suite
112163
]
164+
for jdk in aarch64_jdks
113165
for suite in bench.groups.main_suites
166+
if suite.is_jdk_supported(jdk.jdk_version)
114167
]),
115168

116169
local all_builds = main_builds + weekly_forks_builds + profiling_builds + microservice_builds + aarch64_builds,

0 commit comments

Comments
 (0)