Skip to content

Commit 0a8e3d8

Browse files
author
Roman Kennke
committed
Merge branch 'master' into shenandoah
2 parents a72e752 + b39631a commit 0a8e3d8

File tree

2,539 files changed

+86816
-39321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,539 files changed

+86816
-39321
lines changed

Diff for: ‎THIRD_PARTY_LICENSE.txt

+7,471-1,114
Large diffs are not rendered by default.

Diff for: ‎bench-common.libsonnet

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
min_jdk_version:: null,
2424
max_jdk_version:: null,
2525
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
26+
if jdk_version == null then error "jdk_version cannot be null!" else
27+
if std.objectHasAll(self, "min_jdk_version") && self.min_jdk_version != null && jdk_version < self.min_jdk_version then false
28+
else if std.objectHasAll(self, "max_jdk_version") && self.max_jdk_version != null && jdk_version > self.max_jdk_version then false
2829
else true
2930
},
3031

Diff for: ‎ci-resources.libsonnet

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
ol8_bench_image: "<ol8_bench_image>",
55
benchmarking_config_repo: "<benchmarking_config_repo>",
66

7-
notify_nexus_deploy: "<notify_nexus_deploy>",
8-
notify_releaser_service: "<notify_releaser_service>"
7+
notify_nexus_deploy: ["<notify_nexus_deploy>"],
8+
notify_releaser_service: ["<notify_releaser_service>"],
9+
nexus_base_url: "<nexus_base_url>"
910
}
1011
}

Diff for: ‎ci.hocon

-25
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ labsjdk17: ${labsjdk-ce-17}
44

55
builds = []
66

7-
binaries-repository = "lafo"
8-
97
#Compiler
108
compiler-suite-root = "./compiler"
119
logPatterns = [
@@ -18,31 +16,8 @@ jvm-config.default = "graal-core"
1816
libgraal_env = "libgraal"
1917
vm_subdir = "vm"
2018

21-
include "compiler/ci_common/common.hocon"
22-
include "compiler/ci_common/gate.hocon"
23-
include "compiler/ci_common/gate_tasks.hocon"
24-
include "compiler/ci_common/gate_tasks_bootstrap.hocon"
25-
2619
include "compiler/ci_common/bench.hocon"
27-
include "compiler/ci_common/bench-hwloc.hocon"
28-
include "compiler/ci_common/bench-weekly.hocon"
29-
include "compiler/ci_common/x52.hocon"
30-
include "compiler/ci_common/x52-jfr.hocon"
31-
include "compiler/ci_common/x82.hocon"
32-
include "compiler/ci_common/bench-aarch64.hocon"
33-
34-
# C1 & C2 configs
35-
include "compiler/ci_includes/x52-c1.hocon"
36-
include "compiler/ci_includes/x52-c2.hocon"
37-
include "compiler/ci_includes/x52-c2-jfr.hocon"
38-
include "compiler/ci_includes/bench-aarch64-c2.hocon"
3920

4021
# ------------------ SVM ----------------------
4122
include "substratevm/ci_includes/gate.hocon"
4223

43-
# ------------------- VM ----------------------
44-
include "vm/ci_common/common.hocon"
45-
include "vm/ci_common/common-bench.hocon"
46-
include "vm/ci_includes/vm.hocon"
47-
include "vm/ci_includes/vm-native.hocon"
48-
include "vm/ci_includes/vm-bench.hocon"

Diff for: ‎ci.jsonnet

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ local truffle = import 'truffle/ci.jsonnet';
2525
# JavaDoc
2626
local javadoc = import "ci_includes/publish-javadoc.jsonnet";
2727

28+
# VM
29+
local vm = import 'vm/ci_includes/vm.jsonnet';
30+
2831
# Add a guard to `build` that prevents it from running in the gate
2932
# for a PR that only touches *.md files, the docs, are config files for GitHub.
3033
local add_excludes_guard(build) = build + {
@@ -47,6 +50,7 @@ local add_excludes_guard(build) = build + {
4750
sulong.builds +
4851
tools.builds +
4952
truffle.builds +
50-
javadoc.builds
53+
javadoc.builds +
54+
vm.builds
5155
)]
5256
}

Diff for: ‎ci_includes/publish-javadoc.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
local common = import '../common.jsonnet',
33
local utils = import '../common-utils.libsonnet',
4-
local linux_amd64 = common["linux-amd64"],
4+
local linux_amd64 = common.linux_amd64,
55

66
local javadoc_publisher = {
77
name: 'graal-publish-javadoc-' + utils.prefixed_jdk(self.jdk_version),

Diff for: ‎common.hocon

+8-33
Original file line numberDiff line numberDiff line change
@@ -97,38 +97,13 @@ darwin-deploy : ${darwin} ${maven-download-unix} {
9797
}
9898
}
9999

100-
svm-common: ${mx} {
101-
environment: {
102-
DEFAULT_VM: "server"
103-
LANG: "en_US.UTF-8"
104-
}
105-
logs: [
106-
"../.native-image/*/*/*/*.log"
107-
"../*/*/*.log"
108-
"*/*.log"
109-
"*/svmbuild/*.log"
110-
"*/svmbuild/images/*.log"
111-
"*/*/stripped/*.map"
112-
"*/callgrind.*"
113-
"*.bgv"
114-
"*.log"
115-
]
116-
}
100+
svm-common: ${mx} ${svm.deps.common}
117101

118-
svm-common-linux-amd64: ${svm-common} ${linux-amd64} {
119-
packages: {
120-
devtoolset: "==7" # GCC 7.3.1, make 4.2.1, binutils 2.28, valgrind 3.13.0
121-
binutils: ">=2.34"
122-
ruby: ">=2.1.0"
123-
}
102+
svm-common-linux-amd64: ${svm-common} ${svm.deps.linux_amd64} ${linux-amd64} {
124103
timelimit: "55:00"
125104
}
126105

127-
svm-common-linux-aarch64: ${svm-common} ${linux-aarch64} {
128-
packages: {
129-
devtoolset: "==7" # GCC 7.3.1, make 4.2.1, binutils 2.28, valgrind 3.13.0
130-
ruby: ">=2.1.0"
131-
}
106+
svm-common-linux-aarch64: ${svm-common} ${svm.deps.linux_aarch64} ${linux-aarch64} {
132107
timelimit: "55:00"
133108
}
134109

@@ -146,27 +121,27 @@ svm-capabilities-manycores : {
146121
capabilities : ${svm-capabilities} [manycores]
147122
}
148123

149-
svm-common-darwin: ${svm-common} ${darwin-amd64} {
124+
svm-common-darwin: ${svm-common} ${svm.deps.darwin} ${darwin-amd64} {
150125
timelimit: "45:00"
151126
}
152127

153-
svm-common-windows-openjdk8: ${svm-common} ${windows-amd64} ${devkits.windows-openjdk8} {
128+
svm-common-windows-openjdk8: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-openjdk8} {
154129
packages : {
155130
}
156131
timelimit: "45:00"
157132
}
158133

159-
svm-common-windows-oraclejdk8: ${svm-common} ${windows-amd64} ${devkits.windows-oraclejdk8} {
134+
svm-common-windows-oraclejdk8: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-oraclejdk8} {
160135
packages : {
161136
}
162137
timelimit: "45:00"
163138
}
164139

165-
svm-common-windows-jdk11: ${svm-common} ${windows-amd64} ${devkits.windows-jdk11} {
140+
svm-common-windows-jdk11: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-jdk11} {
166141
timelimit: "45:00"
167142
}
168143

169-
svm-common-windows-jdk17: ${svm-common} ${windows-amd64} ${devkits.windows-jdk17} {
144+
svm-common-windows-jdk17: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-jdk17} {
170145
timelimit: "45:00"
171146
}
172147

Diff for: ‎common.json

+46-10
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.14+9-jvmci-22.0-b05", "platformspecific": true },
12-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.14+9-jvmci-22.0-b05-sulong", "platformspecific": true },
13-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.14+8-jvmci-22.0-b05", "platformspecific": true },
14-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.14+8-jvmci-22.0-b05-sulong", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.13+8-jvmci-22.0-b02", "platformspecific": true },
12+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.14+7-jvmci-22.1-b00-sulong", "platformspecific": true },
13+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.14+5-jvmci-22.0-b02", "platformspecific": true },
14+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.14+6-jvmci-22.1-b00-sulong", "platformspecific": true },
1515

1616
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
17-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-22.0-b05", "platformspecific": true },
18-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-22.0-b05-debug", "platformspecific": true },
19-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-22.0-b05-sulong", "platformspecific": true },
20-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-22.0-b05", "platformspecific": true },
21-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-22.0-b05-debug", "platformspecific": true },
22-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-22.0-b05-sulong", "platformspecific": true }
17+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.2+5-jvmci-22.0-b02", "platformspecific": true },
18+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true },
19+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.2+6-jvmci-22.1-b00-sulong", "platformspecific": true },
20+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.2+5-jvmci-22.0-b02", "platformspecific": true },
21+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true },
22+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.2+6-jvmci-22.1-b00-sulong", "platformspecific": true }
2323
},
2424

2525
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
@@ -138,5 +138,41 @@
138138
},
139139
"darwin": {}
140140
}
141+
},
142+
"svm": {
143+
"deps": {
144+
"COMMENT.common": "graal/vm/ci_common/common.jsonnet hardcodes the properties of this object",
145+
"common": {
146+
"environment": {
147+
"DEFAULT_VM": "server",
148+
"LANG": "en_US.UTF-8"
149+
},
150+
"logs": [
151+
"../.native-image/*/*/*/*.log",
152+
"../*/*/*.log",
153+
"*/*.log",
154+
"*/svmbuild/*.log",
155+
"*/svmbuild/images/*.log",
156+
"*/*/stripped/*.map",
157+
"*/callgrind.*",
158+
"*.log"
159+
]
160+
},
161+
"linux_amd64": {
162+
"packages": {
163+
"devtoolset": "==7",
164+
"binutils": ">=2.34",
165+
"ruby": ">=2.1.0"
166+
}
167+
},
168+
"linux_aarch64": {
169+
"packages": {
170+
"devtoolset": "==7",
171+
"ruby": ">=2.1.0"
172+
}
173+
},
174+
"darwin": {},
175+
"windows": {}
176+
}
141177
}
142178
}

Diff for: ‎common.jsonnet

+28-34
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
local jdks = common_json.jdks,
88
local deps = common_json.deps,
99
local downloads = common_json.downloads,
10-
# This must always point to HEAD in the master branch but can be used to point
11-
# to another branch/commit in a Graal PR when mx changes are required for the PR.
10+
1211
mx:: {
1312
packages +: {
1413
mx: mx_version
@@ -17,6 +16,7 @@
1716

1817
eclipse:: downloads.eclipse,
1918
jdt:: downloads.jdt,
19+
devkits:: common_json.devkits,
2020

2121
build_base:: {
2222
// holds location of CI resources that can easily be overwritten in an overlay
@@ -37,6 +37,9 @@
3737
weekly:: {
3838
targets+: ["weekly"],
3939
},
40+
monthly:: {
41+
targets+: ["monthly"],
42+
},
4043

4144
// Heap settings
4245
// *************
@@ -89,55 +92,46 @@
8992

9093
"labsjdk-ce-11":: jdk11 + { downloads+: { JAVA_HOME : jdks["labsjdk-ce-11"] }},
9194
"labsjdk-ee-11":: jdk11 + { downloads+: { JAVA_HOME : jdks["labsjdk-ee-11"] }},
92-
labsjdk11:: self["labsjdk-" + repo_config.graalvm_edition + "-11"],
9395
"labsjdk-ce-17":: jdk17 + { downloads+: { JAVA_HOME : jdks["labsjdk-ce-17"] }},
9496
"labsjdk-ee-17":: jdk17 + { downloads+: { JAVA_HOME : jdks["labsjdk-ee-17"] }},
95-
labsjdk17:: self["labsjdk-" + repo_config.graalvm_edition + "-17"],
9697
"labsjdk-ce-17Debug":: jdk17 + { downloads+: { JAVA_HOME : jdks["labsjdk-ce-17Debug"] }},
9798
"labsjdk-ee-17Debug":: jdk17 + { downloads+: { JAVA_HOME : jdks["labsjdk-ee-17Debug"] }},
9899

100+
# Aliases to edition specific labsjdks
101+
labsjdk11:: self["labsjdk-" + repo_config.graalvm_edition + "-11"],
102+
labsjdk17:: self["labsjdk-" + repo_config.graalvm_edition + "-17"],
103+
labsjdk11Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-11Debug"],
104+
labsjdk17Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-17Debug"],
105+
99106

100107
// Hardware definitions
101108
// ********************
102109
common:: deps.common + self.mx + {
110+
local where = if std.objectHas(self, "name") then " in " + self.name else "",
103111
# enforce self.os (useful for generating job names)
104-
os:: error "self.os not set",
112+
os:: error "self.os not set" + where,
105113
# enforce self.arch (useful for generating job names)
106-
arch:: error "self.arch not set",
114+
arch:: error "self.arch not set" + where,
107115
capabilities +: [],
108116
catch_files +: common_json.catch_files,
109-
logs : [
117+
logs +: [
118+
"*.bgv",
119+
"./" + repo_config.compiler.compiler_suite + "/graal_dumps/*/*",
110120
"*/es-*.json"
111121
]
112122
},
113123

114-
linux:: deps.linux + self.common + {
115-
os::"linux",
116-
capabilities+: [self.os],
117-
},
124+
linux:: deps.linux + self.common + {os::"linux", capabilities+: [self.os]},
125+
darwin:: deps.darwin + self.common + {os::"darwin", capabilities+: [self.os]},
126+
windows:: deps.windows + self.common + {os::"windows", capabilities+: [self.os]},
127+
windows_server_2016:: self.windows + {capabilities+: ["windows_server_2016"]},
118128

119-
darwin:: deps.darwin + self.common + {
120-
os::"darwin",
121-
capabilities+: [self.os],
122-
},
123-
124-
windows:: deps.windows + self.common + {
125-
os::"windows",
126-
capabilities+: [self.os],
127-
},
128-
129-
amd64:: {
130-
arch::"amd64",
131-
capabilities+: [self.arch]
132-
},
133-
134-
aarch64:: {
135-
arch::"aarch64",
136-
capabilities+: [self.arch],
137-
},
129+
amd64:: { arch::"amd64", capabilities+: [self.arch]},
130+
aarch64:: { arch::"aarch64", capabilities+: [self.arch]},
138131

139-
"linux-amd64":: self.linux + self.amd64,
140-
"darwin-amd64":: self.darwin + self.amd64,
141-
"windows-amd64":: self.windows + self.amd64,
142-
"linux-aarch64":: self.linux + self.aarch64,
132+
linux_amd64:: self.linux + self.amd64,
133+
darwin_amd64:: self.darwin + self.amd64,
134+
windows_amd64:: self.windows + self.amd64,
135+
windows_server_2016_amd64:: self.windows_server_2016 + self.amd64,
136+
linux_aarch64:: self.linux + self.aarch64,
143137
}

Diff for: ‎compiler/ci.jsonnet

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
local graal = (import 'ci_includes/gate.jsonnet'),
3+
local graal_common = (import 'ci_common/gate.jsonnet'),
34
local graal_benchmarks = (import 'ci_common/benchmark-builders.jsonnet'),
45
local baseline_benchmarks = (import 'ci_includes/baseline-benchmarks.jsonnet'),
56
builds:
67
graal.builds +
8+
graal_common.builds +
79
graal_benchmarks.builds +
810
baseline_benchmarks.builds
911
}

Diff for: ‎compiler/ci_common/bench-aarch64.hocon

-19
This file was deleted.

0 commit comments

Comments
 (0)