Skip to content

Commit ed15ac4

Browse files
author
Jaroslav Tulach
committed
Merging with master
2 parents 26af029 + 1bc5eca commit ed15ac4

File tree

705 files changed

+18926
-13225
lines changed

Some content is hidden

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

705 files changed

+18926
-13225
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎ci.hocon‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,3 @@ vm_subdir = "vm"
1818

1919
include "compiler/ci_common/bench.hocon"
2020

21-
# ------------------ SVM ----------------------
22-
include "substratevm/ci_includes/gate.hocon"
23-

‎ci.jsonnet‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ local regex = import 'regex/ci.jsonnet';
1313
# SDK
1414
local sdk = import 'sdk/ci.jsonnet';
1515

16+
# SubstrateVM
17+
local substratevm = import 'substratevm/ci.jsonnet';
18+
1619
# Sulong
1720
local sulong = import 'sulong/ci.jsonnet';
1821

@@ -47,6 +50,7 @@ local add_excludes_guard(build) = build + {
4750
espresso.builds +
4851
regex.builds +
4952
sdk.builds +
53+
substratevm.builds +
5054
sulong.builds +
5155
tools.builds +
5256
truffle.builds +

‎ci_includes/publish-javadoc.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646

4747
local all_builds = [
48-
common.post_merge + linux_amd64 + common.oraclejdk8 + javadoc_publisher,
48+
common.post_merge + linux_amd64 + common.labsjdk17 + javadoc_publisher,
4949
],
5050
// adds a "defined_in" field to all builds mentioning the location of this current file
5151
builds:: [{ defined_in: std.thisFile } + b for b in all_builds]

‎common.hocon‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ download-hsdis : {
2020
]
2121
}
2222

23-
oraclejdk8 : { downloads : { JAVA_HOME : ${jdks.oraclejdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
24-
oraclejdk8Only : { downloads : { JAVA_HOME : ${jdks.oraclejdk8} }}
25-
oraclejdk8Debug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
26-
oraclejdk8OnlyDebug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug} }}
27-
28-
openjdk8 : { downloads : { JAVA_HOME : ${jdks.openjdk8} }}
29-
3023
oraclejdk11 : { downloads : { JAVA_HOME : ${jdks.oraclejdk11} }}
3124
oraclejdk17 : { downloads : { JAVA_HOME : ${jdks.oraclejdk17} }}
3225
openjdk11 : { downloads : { JAVA_HOME : ${jdks.openjdk11} }}
@@ -125,18 +118,6 @@ svm-common-darwin: ${svm-common} ${svm.deps.darwin} ${darwin-amd64} {
125118
timelimit: "45:00"
126119
}
127120

128-
svm-common-windows-openjdk8: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-openjdk8} {
129-
packages : {
130-
}
131-
timelimit: "45:00"
132-
}
133-
134-
svm-common-windows-oraclejdk8: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-oraclejdk8} {
135-
packages : {
136-
}
137-
timelimit: "45:00"
138-
}
139-
140121
svm-common-windows-jdk11: ${svm-common} ${svm.deps.windows} ${windows-amd64} ${devkits.windows-jdk11} {
141122
timelimit: "45:00"
142123
}

‎common.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-22.0-b01", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u311+11-jvmci-22.0-b01", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u311+11-jvmci-22.0-b01-fastdebug", "platformspecific": true },
8-
95
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
106
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
117
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.13+8-jvmci-22.0-b02", "platformspecific": true },
@@ -24,8 +20,6 @@
2420

2521
"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)",
2622
"devkits": {
27-
"windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
28-
"windows-openjdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
2923
"windows-jdk11": { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
3024
"windows-jdk17": { "packages" : { "devkit:VS2019-16.9.3+1" : "==0" }}
3125
},

‎common.jsonnet‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,9 @@
7575
// JDK definitions
7676
// ***************
7777
# jdk_version is an hidden field that can be used to generate job names
78-
local jdk8 = { jdk_version:: 8},
7978
local jdk11 = { jdk_version:: 11},
8079
local jdk17 = { jdk_version:: 17},
8180

82-
oraclejdk8:: jdk8 + { downloads+: { JAVA_HOME : jdks.oraclejdk8, EXTRA_JAVA_HOMES : { pathlist :[ jdks["labsjdk-ee-11"] ]} }},
83-
oraclejdk8Only:: jdk8 + { downloads+: { JAVA_HOME : jdks.oraclejdk8 }},
84-
oraclejdk8Debug:: jdk8 + { downloads+: { JAVA_HOME : jdks.oraclejdk8Debug, EXTRA_JAVA_HOMES : { pathlist :[ jdks["labsjdk-ee-11"] ]} }},
85-
oraclejdk8OnlyDebug:: jdk8 + { downloads+: { JAVA_HOME : jdks.oraclejdk8Debug }},
86-
87-
openjdk8:: jdk8 + { downloads+: { JAVA_HOME : jdks.openjdk8 }},
88-
8981
oraclejdk11:: jdk11 + { downloads+: { JAVA_HOME : jdks.oraclejdk11 }},
9082
oraclejdk17:: jdk17 + { downloads+: { JAVA_HOME : jdks.oraclejdk17 }},
9183
openjdk11:: jdk11 + { downloads+: { JAVA_HOME : jdks.openjdk11 }},

‎compiler/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
This changelog summarizes newly introduced optimizations that may be relevant to other teams.
44

5+
## Version 22.1.0
6+
* (GR-36751): Removed the `DuplicateIrreducibleLoops` option. To disable irreducible loop handling, set
7+
`-Dgraal.MaxDuplicationFactor` to a value less than or equal to 1. For AOT compilations, the effort
8+
spent to handle irreducible loops is boosted to let Native Image support more programs with irreducible loops.
9+
510
## Version 22.0.0
611
* (GR-22707) (GR-30838): New, inner loops first, reverse post order and loop frequency calculations for the compiler.
712

‎compiler/ci_common/benchmark-suites.libsonnet‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,6 @@
243243
local hwlocBind_16C_16T = ["--hwloc-bind=--cpubind node:0.core:0-15.pu:0 --membind node:0"],
244244
local hwlocBind_16C_32T = ["--hwloc-bind=--cpubind node:0.core:0-15.pu:0-1 --membind node:0"],
245245
run+: [
246-
# JMeter
247-
self.benchmark_cmd + ["shopcart-jmeter:large"] + ["--"] + self.extra_vm_args + ["-Xmx8g"],
248-
bench_upload,
249-
self.benchmark_cmd + ["petclinic-jmeter:tiny"] + ["--"] + self.extra_vm_args + ["-Xmx8g"],
250-
bench_upload,
251246
# shopcart-wrk
252247
self.benchmark_cmd + ["shopcart-wrk:mixed-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms32m", "-Xmx112m", "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"],
253248
bench_upload,
@@ -259,20 +254,23 @@
259254
bench_upload,
260255
self.benchmark_cmd + ["shopcart-wrk:mixed-huge"] + hwlocBind_16C_32T + ["--"] + self.extra_vm_args + ["-Xms1024m", "-Xmx8192m", "-XX:ActiveProcessorCount=32", "-XX:MaxDirectMemorySize=8192m"],
261256
bench_upload,
257+
262258
# tika-wrk odt
263259
self.benchmark_cmd + ["tika-wrk:odt-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms32m", "-Xmx150m", "-XX:ActiveProcessorCount=1"],
264260
bench_upload,
265261
self.benchmark_cmd + ["tika-wrk:odt-small"] + hwlocBind_2C_2T + ["--"] + self.extra_vm_args + ["-Xms64m", "-Xmx250m", "-XX:ActiveProcessorCount=2"],
266262
bench_upload,
267263
self.benchmark_cmd + ["tika-wrk:odt-medium"] + hwlocBind_4C_4T + ["--"] + self.extra_vm_args + ["-Xms128m", "-Xmx600m", "-XX:ActiveProcessorCount=4"],
268264
bench_upload,
265+
269266
# tika-wrk pdf
270267
self.benchmark_cmd + ["tika-wrk:pdf-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms20m", "-Xmx80m", "-XX:ActiveProcessorCount=1"],
271268
bench_upload,
272269
self.benchmark_cmd + ["tika-wrk:pdf-small"] + hwlocBind_2C_2T + ["--"] + self.extra_vm_args + ["-Xms40m", "-Xmx200m", "-XX:ActiveProcessorCount=2"],
273270
bench_upload,
274271
self.benchmark_cmd + ["tika-wrk:pdf-medium"] + hwlocBind_4C_4T + ["--"] + self.extra_vm_args + ["-Xms80m", "-Xmx500m", "-XX:ActiveProcessorCount=4"],
275272
bench_upload,
273+
276274
# petclinic-wrk
277275
self.benchmark_cmd + ["petclinic-wrk:mixed-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms32m", "-Xmx100m", "-XX:ActiveProcessorCount=1"],
278276
bench_upload,
@@ -284,6 +282,7 @@
284282
bench_upload,
285283
self.benchmark_cmd + ["petclinic-wrk:mixed-huge"] + hwlocBind_16C_32T + ["--"] + self.extra_vm_args + ["-Xms640m", "-Xmx3072m", "-XX:ActiveProcessorCount=32"],
286284
bench_upload,
285+
287286
# helloworld-wrk
288287
self.benchmark_cmd + ["micronaut-helloworld-wrk:helloworld"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms8m", "-Xmx64m", "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"],
289288
bench_upload,

‎compiler/ci_common/gate.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111

112112
style:: c.eclipse + c.jdt + s.base("style,fullbuild,javadoc"),
113113

114-
x82_avx3:: {
115-
capabilities+: ["x82"],
114+
avx3:: {
115+
capabilities+: ["avx512"],
116116
environment+: {
117117
JVM_CONFIG: jvm_config + "-avx3"
118118
}

0 commit comments

Comments
 (0)