Skip to content

Commit

Permalink
[GR-18301] [GR-13817] [GR-33094] Upgrade dacapo suite and add JDK17 b…
Browse files Browse the repository at this point in the history 
…enchmarking.

PullRequest: graal/9519
  • Loading branch information
@farquet
farquet committed Aug 24, 2021
2 parents 80b7e87 + 76a1a72 commit df35048
Show file tree
Hide file tree
Showing 14 changed files with 545 additions and 244 deletions.
10 changes: 9 additions & 1 deletion bench-common.libsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
generated_name:: utils.hyphenize([self.job_prefix, self.suite, self.platform, utils.prefixed_jdk(self.jdk_version), self.os, self.arch, self.job_suffix]),
job_prefix:: null,
job_suffix:: null,
name: self.generated_name,
name:
if self.is_jdk_supported(self.jdk_version) then self.generated_name
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,
suite:: error "'suite' must be set to generate job name",
timelimit: error "build 'timelimit' is not set for "+ self.name +"!",
local ol8_image = self.ci_resources.infra.ol8_bench_image,
Expand All @@ -18,6 +20,12 @@
"mount_modules": true
},
should_use_hwloc:: std.objectHasAll(self, "is_numa") && self.is_numa && std.length(std.find("bench", self.targets)) > 0,
min_jdk_version:: null,
max_jdk_version:: null,
is_jdk_supported(jdk_version)::
if self.min_jdk_version != null && jdk_version < self.min_jdk_version then false
else if self.max_jdk_version != null && jdk_version > self.max_jdk_version then false
else true
},

bench_hw:: {
Expand Down
83 changes: 68 additions & 15 deletions compiler/ci_common/benchmark-builders.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,39 @@

local jdk8 = c.oraclejdk8,
local jdk11 = c.labsjdk11,
local jdk17 = c.labsjdk17,

local amd64_jdks = [jdk8, jdk11, jdk17],
local aarch64_jdks = [jdk11, jdk17],

local main_builds = [
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.dacapo,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.dacapo,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.dacapo,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.dacapo_size_variants,
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.dacapo_size_variants,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.dacapo_timing,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.dacapo_timing,
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.scala_dacapo,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo_size_variants,
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.scala_dacapo_size_variants,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.scala_dacapo_timing,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.scala_dacapo_timing,
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.renaissance,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.renaissance,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.specjvm2008,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.specjvm2008,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.specjvm2008,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2005,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2005,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2015,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2005,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.specjbb2015_full_machine,
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.specjbb2015_full_machine,
c.weekly + hw.x52 + jdk8 + cc.libgraal + bench.renaissance_0_10,
c.on_demand + hw.x52 + jdk8 + cc.jargraal + bench.renaissance_0_10,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.awfy,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.awfy,
c.post_merge + hw.x52 + jdk8 + cc.libgraal + bench.renaissance_legacy,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.renaissance_legacy,
c.daily + hw.x52 + jdk8 + cc.jargraal + bench.renaissance_legacy,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.micros_graal_whitebox,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.micros_graal_whitebox,
Expand All @@ -41,12 +49,17 @@
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.micros_misc_graal_dist,
c.daily + hw.x52 + jdk8 + cc.libgraal + bench.micros_shootout_graal_dist,
c.weekly + hw.x52 + jdk8 + cc.jargraal + bench.micros_shootout_graal_dist,
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.dacapo,

c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.dacapo,
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.dacapo,
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.dacapo_size_variants,
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.dacapo_size_variants,
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.dacapo_timing,
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.dacapo_timing,
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo,
c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo,
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo,
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo_size_variants,
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo_size_variants,
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo_timing,
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo_timing,
c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.renaissance,
Expand All @@ -56,7 +69,7 @@
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2005,
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2005,
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2015,
c.daily + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2015_full_machine,
c.on_demand + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015_full_machine,
c.weekly + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_0_10,
Expand All @@ -73,6 +86,41 @@
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.micros_misc_graal_dist,
c.daily + hw.x52 + jdk11 + cc.libgraal + bench.micros_shootout_graal_dist,
c.weekly + hw.x52 + jdk11 + cc.jargraal + bench.micros_shootout_graal_dist,

c.daily + hw.x52 + jdk17 + cc.libgraal + bench.dacapo,
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.dacapo,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.dacapo_size_variants,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.dacapo_size_variants,
c.weekly + hw.x52 + jdk17 + cc.libgraal + bench.dacapo_timing,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.dacapo_timing,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo,
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_size_variants,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_size_variants,
c.weekly + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_timing,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_timing,
#c.post_merge + hw.x52 + jdk17 + cc.libgraal + bench.renaissance,
#c.daily + hw.x52 + jdk17 + cc.jargraal + bench.renaissance,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.specjvm2008,
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.specjvm2008,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2005,
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2005,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2015,
c.weekly + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2015_full_machine,
c.on_demand + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2015_full_machine,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.awfy,
c.daily + hw.x52 + jdk17 + cc.jargraal + bench.awfy,
#c.post_merge + hw.x52 + jdk17 + cc.libgraal + bench.renaissance_legacy,
#c.daily + hw.x52 + jdk17 + cc.jargraal + bench.renaissance_legacy,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_graal_whitebox,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_graal_whitebox,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_graal_dist,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_graal_dist,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_misc_graal_dist,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_misc_graal_dist,
c.daily + hw.x52 + jdk17 + cc.libgraal + bench.micros_shootout_graal_dist,
c.weekly + hw.x52 + jdk17 + cc.jargraal + bench.micros_shootout_graal_dist
],

// JFR and async-profiler jobs
Expand All @@ -81,8 +129,9 @@
c.weekly + hw.x52 + jdk + cc.libgraal + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" },
c.weekly + hw.x52 + jdk + cc.jargraal + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" }
]
for jdk in [jdk8, jdk11]
for jdk in amd64_jdks
for suite in bench.groups.profiled_suites
if suite.is_jdk_supported(jdk.jdk_version)
]),

// Microservices
Expand All @@ -91,8 +140,9 @@
c.daily + hw.x52 + jdk + cc.libgraal + suite,
c.daily + hw.x52 + jdk + cc.jargraal + suite
]
for jdk in [jdk8, jdk11]
for jdk in amd64_jdks
for suite in bench.groups.microservice_suites
if suite.is_jdk_supported(jdk.jdk_version)
]),

// intensive weekly benchmarking
Expand All @@ -101,16 +151,19 @@
cc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.libgraal + suite),
cc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.jargraal + suite)
])
for jdk in [jdk8, jdk11]
for jdk in amd64_jdks
for suite in bench.groups.weekly_forks_suites
if suite.is_jdk_supported(jdk.jdk_version)
]),

local aarch64_builds = std.flattenArrays([
[
c.weekly + hw.xgene3 + jdk11 + cc.libgraal + suite,
c.weekly + hw.xgene3 + jdk11 + cc.jargraal + suite
c.weekly + hw.xgene3 + jdk + cc.libgraal + suite,
c.weekly + hw.xgene3 + jdk + cc.jargraal + suite
]
for jdk in aarch64_jdks
for suite in bench.groups.main_suites
if suite.is_jdk_supported(jdk.jdk_version)
]),

local all_builds = main_builds + weekly_forks_builds + profiling_builds + microservice_builds + aarch64_builds,
Expand Down
Loading

0 comments on commit df35048

Please sign in to comment.