Skip to content

Commit 0ef7d6b

Browse files
christianhaeublchristianhaeubl
committed
Merge with master.
2 parents cf6abce + 185f85c commit 0ef7d6b

File tree

285 files changed

+6109
-4066
lines changed

Some content is hidden

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

285 files changed

+6109
-4066
lines changed

‎ci/ci_common/common.jsonnet‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ common + common.frequencies + {
6161
labsjdk20Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-20Debug"],
6262
labsjdk20LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-20-llvm"],
6363

64+
labsjdk21:: self["labsjdk-" + repo_config.graalvm_edition + "-21"],
65+
labsjdk21Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-21Debug"],
66+
labsjdk21LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-21-llvm"],
67+
6468
// Hardware definitions
6569
// ********************
6670
local graal_common_extras = common.deps.pylint + {

‎ci/common.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ local common_json = import "../common.json";
2222
for name in ["oraclejdk20"] + variants("labsjdk-ce-20") + variants("labsjdk-ee-20")
2323
} + {
2424
[name]: common_json.jdks[name] + { jdk_version:: 21 }
25-
for name in ["oraclejdk21"]
25+
for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
2626
},
2727
assert std.assertEqual(std.objectFields(common_json.jdks), std.objectFields(jdks_data)),
2828

@@ -58,7 +58,7 @@ local common_json = import "../common.json";
5858
"windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
5959
"windows-jdk20": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
6060
"windows-jdk21": { packages+: { "devkit:VS2022-17.1.0+1": "==1" }},
61-
"linux-jdk17": { packages+: { "devkit:gcc10.3.0-OL6.4+1": "==0" }},
61+
"linux-jdk17": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
6262
"linux-jdk19": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
6363
"linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
6464
},

‎common.json‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.0-b10", "platformspecific": true },
1515
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.0-b10-debug", "platformspecific": true },
1616
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.0-b10-sulong", "platformspecific": true },
17-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.7+8-jvmci-23.0-b10", "platformspecific": true },
18-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.7+8-jvmci-23.0-b10-debug", "platformspecific": true },
19-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.7+8-jvmci-23.0-b10-sulong", "platformspecific": true },
17+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b01", "platformspecific": true },
18+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b01-debug", "platformspecific": true },
19+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b01-sulong", "platformspecific": true },
2020

2121
"oraclejdk19": {"name": "jpg-jdk", "version": "19", "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
2222
"labsjdk-ce-19": {"name": "labsjdk", "version": "ce-19.0.1+10-jvmci-23.0-b04", "platformspecific": true },
@@ -30,11 +30,18 @@
3030
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10", "platformspecific": true },
3131
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10-debug", "platformspecific": true },
3232
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10-sulong", "platformspecific": true },
33-
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.1+9-jvmci-23.0-b10", "platformspecific": true },
34-
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.1+9-jvmci-23.0-b10-debug", "platformspecific": true },
35-
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.1+9-jvmci-23.0-b10-sulong", "platformspecific": true },
33+
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b01", "platformspecific": true },
34+
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b01-debug", "platformspecific": true },
35+
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b01-sulong", "platformspecific": true },
36+
37+
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "15", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
38+
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b01", "platformspecific": true },
39+
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b01-debug", "platformspecific": true },
40+
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b01-sulong", "platformspecific": true },
41+
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b01", "platformspecific": true },
42+
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b01-debug", "platformspecific": true },
43+
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b01-sulong", "platformspecific": true }
3644

37-
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "15", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
3845
},
3946

4047
"eclipse": {

‎compiler/ci/ci_common/gate.jsonnet‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -192,35 +192,35 @@
192192
# Each value in this map is an object that overrides or extends the
193193
# fields of the denoted build.
194194
local gates = {
195-
"gate-compiler-test-labsjdk-20-linux-amd64": t("1:00:00") + c.mach5_target,
195+
"gate-compiler-test-labsjdk-21-linux-amd64": t("1:00:00") + c.mach5_target,
196196
"gate-compiler-test-labsjdk-17-linux-amd64": t("1:00:00"),
197-
"gate-compiler-test-labsjdk-20-linux-aarch64": t("1:50:00"),
198-
"gate-compiler-test-labsjdk-20-darwin-amd64": t("1:00:00") + c.mach5_target,
199-
"gate-compiler-test-labsjdk-20-darwin-aarch64": t("1:00:00"),
200-
"gate-compiler-test_zgc-labsjdk-20-linux-amd64": t("1:00:00") + c.mach5_target,
201-
"gate-compiler-test_zgc-labsjdk-20-linux-aarch64": t("1:50:00"),
202-
"gate-compiler-test_zgc-labsjdk-20-darwin-amd64": t("1:00:00") + c.mach5_target,
203-
"gate-compiler-test_zgc-labsjdk-20-darwin-aarch64": t("1:00:00"),
197+
"gate-compiler-test-labsjdk-21-linux-aarch64": t("1:50:00"),
198+
"gate-compiler-test-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target,
199+
"gate-compiler-test-labsjdk-21-darwin-aarch64": t("1:00:00"),
200+
"gate-compiler-test_zgc-labsjdk-21-linux-amd64": t("1:00:00") + c.mach5_target,
201+
"gate-compiler-test_zgc-labsjdk-21-linux-aarch64": t("1:50:00"),
202+
"gate-compiler-test_zgc-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target,
203+
"gate-compiler-test_zgc-labsjdk-21-darwin-aarch64": t("1:00:00"),
204204

205205
"gate-compiler-style-labsjdk-20-linux-amd64": t("45:00"),
206206

207-
"gate-compiler-ctw-labsjdk-20-linux-amd64": c.mach5_target,
208-
"gate-compiler-ctw-labsjdk-20-windows-amd64": t("1:50:00"),
209-
"gate-compiler-ctw_zgc-labsjdk-20-linux-amd64": c.mach5_target,
207+
"gate-compiler-ctw-labsjdk-21-linux-amd64": c.mach5_target,
208+
"gate-compiler-ctw-labsjdk-21-windows-amd64": t("1:50:00"),
209+
"gate-compiler-ctw_zgc-labsjdk-21-linux-amd64": c.mach5_target,
210210

211-
"gate-compiler-ctw_economy-labsjdk-20-linux-amd64": {},
212-
"gate-compiler-ctw_economy-labsjdk-20-windows-amd64": t("1:50:00"),
211+
"gate-compiler-ctw_economy-labsjdk-21-linux-amd64": {},
212+
"gate-compiler-ctw_economy-labsjdk-21-windows-amd64": t("1:50:00"),
213213

214-
"gate-compiler-benchmarktest-labsjdk-20-linux-amd64": {},
215-
"gate-compiler-benchmarktest_zgc-labsjdk-20-linux-amd64": {},
214+
"gate-compiler-benchmarktest-labsjdk-21-linux-amd64": {},
215+
"gate-compiler-benchmarktest_zgc-labsjdk-21-linux-amd64": {},
216216

217-
"gate-compiler-truffle_xcomp-labsjdk-20-linux-amd64": t("1:30:00"),
218-
"gate-compiler-truffle_xcomp_zgc-labsjdk-20-linux-amd64": t("1:30:00"),
217+
"gate-compiler-truffle_xcomp-labsjdk-21-linux-amd64": t("1:30:00"),
218+
"gate-compiler-truffle_xcomp_zgc-labsjdk-21-linux-amd64": t("1:30:00"),
219219

220-
"gate-compiler-bootstrap_lite-labsjdk-20-darwin-amd64": t("1:00:00") + c.mach5_target,
220+
"gate-compiler-bootstrap_lite-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target,
221221

222-
"gate-compiler-bootstrap_full-labsjdk-20-linux-amd64": s.many_cores + c.mach5_target,
223-
"gate-compiler-bootstrap_full_zgc-labsjdk-20-linux-amd64": s.many_cores + c.mach5_target
222+
"gate-compiler-bootstrap_full-labsjdk-21-linux-amd64": s.many_cores + c.mach5_target,
223+
"gate-compiler-bootstrap_full_zgc-labsjdk-21-linux-amd64": s.many_cores + c.mach5_target
224224
},
225225

226226
# This map defines the builders that run daily. Each key in this map
@@ -229,13 +229,13 @@
229229
# Each value in this map is an object that overrides or extends the
230230
# fields of the denoted build.
231231
local dailies = {
232-
"daily-compiler-ctw-labsjdk-20-linux-aarch64": {},
233-
"daily-compiler-ctw-labsjdk-20-darwin-amd64": {},
234-
"daily-compiler-ctw-labsjdk-20-darwin-aarch64": {},
232+
"daily-compiler-ctw-labsjdk-21-linux-aarch64": {},
233+
"daily-compiler-ctw-labsjdk-21-darwin-amd64": {},
234+
"daily-compiler-ctw-labsjdk-21-darwin-aarch64": {},
235235

236-
"daily-compiler-ctw_economy-labsjdk-20-linux-aarch64": {},
237-
"daily-compiler-ctw_economy-labsjdk-20-darwin-amd64": {},
238-
"daily-compiler-ctw_economy-labsjdk-20-darwin-aarch64": {},
236+
"daily-compiler-ctw_economy-labsjdk-21-linux-aarch64": {},
237+
"daily-compiler-ctw_economy-labsjdk-21-darwin-amd64": {},
238+
"daily-compiler-ctw_economy-labsjdk-21-darwin-aarch64": {},
239239
},
240240

241241
# This map defines the builders that run weekly. Each key in this map
@@ -244,7 +244,7 @@
244244
# Each value in this map is an object that overrides or extends the
245245
# fields of the denoted build.
246246
local weeklies = {
247-
"weekly-compiler-ctw_phaseplan_fuzzing-labsjdk-20-linux-amd64": {
247+
"weekly-compiler-ctw_phaseplan_fuzzing-labsjdk-21-linux-amd64": {
248248
notify_groups: [],
249249
notify_emails: ["[email protected]"],
250250
},
@@ -254,30 +254,30 @@
254254
"weekly-compiler-test-labsjdk-17-darwin-amd64": {},
255255
"weekly-compiler-test-labsjdk-17-darwin-aarch64": {},
256256

257-
"weekly-compiler-test_vec16-labsjdk-20-linux-amd64": {},
258-
"weekly-compiler-test_avx0-labsjdk-20-linux-amd64": {},
259-
"weekly-compiler-test_avx1-labsjdk-20-linux-amd64": {},
257+
"weekly-compiler-test_vec16-labsjdk-21-linux-amd64": {},
258+
"weekly-compiler-test_avx0-labsjdk-21-linux-amd64": {},
259+
"weekly-compiler-test_avx1-labsjdk-21-linux-amd64": {},
260260

261-
"weekly-compiler-test_jtt_phaseplan_fuzzing-labsjdk-20-linux-amd64": {
261+
"weekly-compiler-test_jtt_phaseplan_fuzzing-labsjdk-21-linux-amd64": {
262262
notify_groups: [],
263263
notify_emails: ["[email protected]"],
264264
},
265265

266266
"weekly-compiler-bootstrap_lite-labsjdk-17-darwin-amd64": t("1:00:00") + c.mach5_target,
267267

268-
"weekly-compiler-benchmarktest-labsjdk-20Debug-linux-amd64": t("3:00:00"),
268+
"weekly-compiler-benchmarktest-labsjdk-21Debug-linux-amd64": t("3:00:00"),
269269

270270
"weekly-compiler-coverage*": {},
271271

272-
"weekly-compiler-test-labsjdk-20Debug-linux-amd64": t("5:00:00"),
272+
"weekly-compiler-test-labsjdk-21Debug-linux-amd64": t("5:00:00"),
273273

274-
"weekly-compiler-test_serialgc-labsjdk-20-linux-amd64": t("1:00:00") + c.mach5_target,
275-
"weekly-compiler-test_serialgc-labsjdk-20-linux-aarch64": t("1:50:00"),
276-
"weekly-compiler-test_serialgc-labsjdk-20-darwin-amd64": t("1:00:00") + c.mach5_target,
277-
"weekly-compiler-test_serialgc-labsjdk-20-darwin-aarch64": t("1:00:00"),
274+
"weekly-compiler-test_serialgc-labsjdk-21-linux-amd64": t("1:00:00") + c.mach5_target,
275+
"weekly-compiler-test_serialgc-labsjdk-21-linux-aarch64": t("1:50:00"),
276+
"weekly-compiler-test_serialgc-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target,
277+
"weekly-compiler-test_serialgc-labsjdk-21-darwin-aarch64": t("1:00:00"),
278278

279-
"weekly-compiler-truffle_xcomp_serialgc-labsjdk-20-linux-amd64": t("1:30:00"),
280-
"weekly-compiler-truffle_xcomp_serialgc-labsjdk-20-linux-aarch64": t("1:30:00"),
279+
"weekly-compiler-truffle_xcomp_serialgc-labsjdk-21-linux-amd64": t("1:30:00"),
280+
"weekly-compiler-truffle_xcomp_serialgc-labsjdk-21-linux-aarch64": t("1:30:00"),
281281
},
282282

283283
# This map defines overrides and field extensions for monthly builds.
@@ -378,7 +378,7 @@
378378
local all_platforms_builds = [self.make_build(jdk, os_arch, task).build
379379
for jdk in [
380380
"17",
381-
"20"
381+
"21"
382382
]
383383
for os_arch in all_os_arches
384384
for task in [
@@ -399,7 +399,7 @@
399399
local all_zgc_builds = [self.make_build(jdk, os_arch, task).build
400400
for jdk in [
401401
"17",
402-
"20"
402+
"21"
403403
]
404404
for os_arch in [
405405
"linux-amd64",
@@ -417,7 +417,7 @@
417417
],
418418

419419
# Run unittests with SerialGC.
420-
local all_serialgc_builds = [self.make_build("20", os_arch, task).build
420+
local all_serialgc_builds = [self.make_build("21", os_arch, task).build
421421
for os_arch in [
422422
"linux-amd64",
423423
"linux-aarch64",
@@ -430,8 +430,8 @@
430430
]
431431
],
432432

433-
# Builds run on only on linux-amd64-jdk20
434-
local linux_amd64_jdk20_builds = [self.make_build("20", "linux-amd64", task).build
433+
# Builds run on only on linux-amd64-jdk21
434+
local linux_amd64_jdk21_builds = [self.make_build("21", "linux-amd64", task).build
435435
for task in [
436436
"ctw_phaseplan_fuzzing",
437437
"coverage_avx3",
@@ -440,20 +440,19 @@
440440
"test_avx1",
441441
"test_javabase",
442442
"test_jtt_phaseplan_fuzzing",
443-
"style"
444443
]
445444
],
446445

447-
# Builds run on only on jdk21
448-
local jdk21_builds = [self.make_build("21", os_arch, task, jdk_name="oraclejdk").build
446+
# Builds run on only on jdk21=0
447+
local jdk20_builds = [self.make_build("20", os_arch, task).build
449448
for os_arch in all_os_arches
450449
for task in [
451-
"test",
450+
"style"
452451
]
453452
],
454453

455-
# Builds run on only on linux-amd64-jdk20Debug
456-
local linux_amd64_jdk20Debug_builds = [self.make_build("20Debug", "linux-amd64", task).build
454+
# Builds run on only on linux-amd64-jdk21Debug
455+
local linux_amd64_jdk21Debug_builds = [self.make_build("21Debug", "linux-amd64", task).build
457456
for task in [
458457
"benchmarktest",
459458
"test"
@@ -465,9 +464,9 @@
465464
all_platforms_builds +
466465
all_zgc_builds +
467466
all_serialgc_builds +
468-
jdk21_builds +
469-
linux_amd64_jdk20_builds +
470-
linux_amd64_jdk20Debug_builds,
467+
jdk20_builds +
468+
linux_amd64_jdk21_builds +
469+
linux_amd64_jdk21Debug_builds,
471470

472471
builds: if
473472
self.check_manifest(gates, all_builds, std.thisFile, "gates").result &&

‎compiler/mx.compiler/mx_compiler.py‎

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
import shlex
6363
import json
6464

65-
from io import StringIO
66-
6765
_suite = mx.suite('compiler')
6866

6967
""" Prefix for running the VM. """
@@ -151,46 +149,6 @@ def _is_jvmci_enabled(vmargs):
151149
"""
152150
return _get_XX_option_value(vmargs, 'EnableJVMCI', mx_sdk_vm.jdk_enables_jvmci_by_default(jdk))
153151

154-
def _nodeCostDump(args, extraVMarguments=None):
155-
"""list the costs associated with each Node type"""
156-
parser = ArgumentParser(prog='mx nodecostdump')
157-
parser.add_argument('--regex', action='store', help="Node Name Regex", default=False, metavar='<regex>')
158-
parser.add_argument('--markdown', action='store_true', help="Format to Markdown table")
159-
args, vmargs = parser.parse_known_args(args)
160-
additionalPrimarySuiteClassPath = '-Dprimary.suite.cp=' + mx.primary_suite().dir
161-
vmargs.extend([additionalPrimarySuiteClassPath, '-cp', mx.classpath('org.graalvm.compiler.hotspot.test'), '-XX:-UseJVMCIClassLoader', 'org.graalvm.compiler.hotspot.test.NodeCostDumpUtil'])
162-
out = mx.OutputCapture()
163-
regex = ""
164-
if args.regex:
165-
regex = args.regex
166-
run_vm(vmargs + _remove_empty_entries(extraVMarguments) + [regex], out=out)
167-
if args.markdown:
168-
stringIO = StringIO(out.data)
169-
reader = csv.reader(stringIO, delimiter=';', lineterminator="\n")
170-
firstRow = True
171-
maxLen = 0
172-
for row in reader:
173-
for col in row:
174-
maxLen = max(maxLen, len(col))
175-
stringIO.seek(0)
176-
for row in reader:
177-
s = '|'
178-
if firstRow:
179-
firstRow = False
180-
nrOfCols = len(row)
181-
for col in row:
182-
s = s + col + "|"
183-
print(s)
184-
s = '|'
185-
for _ in range(nrOfCols):
186-
s = s + ('-' * maxLen) + '|'
187-
else:
188-
for col in row:
189-
s = s + col + "|"
190-
print(s)
191-
else:
192-
print(out.data)
193-
194152
def _ctw_jvmci_export_args(arg_prefix='--'):
195153
"""
196154
Gets the VM args needed to export JVMCI API required by CTW.
@@ -279,8 +237,10 @@ def run(self, suites, tasks, extraVMarguments=None, extraUnitTestArguments=None)
279237
extra_args = []
280238
if Task.tags is None or 'coverage' not in Task.tags: # pylint: disable=unsupported-membership-test
281239
# If this is a coverage execution, we want maximal coverage
282-
# and thus must not fail fast.
283-
extra_args += ['--fail-fast']
240+
# and thus must not fail fast. Otherwise, stop after the first 25
241+
# failures. This guards against systemic test failure while still
242+
# allowing a gate to reveal numerous failures.
243+
extra_args += ['--max-class-failures=25']
284244
if t:
285245
tags = {'task' : t.title}
286246
unittest(['--suite', suite] + extra_args + self.args +
@@ -1223,7 +1183,7 @@ def java_base_unittest(args):
12231183
if get_graaljdk().debug_args:
12241184
mx.warn('Ignoring Java debugger arguments because base JDK doesn\'t include jdwp')
12251185
with mx.DisableJavaDebugging():
1226-
mx_unittest.unittest(['--suite', 'compiler', '--fail-fast'] + extra_args + args)
1186+
mx_unittest.unittest(['--suite', 'compiler', '--max-class-failures=25'] + extra_args + args)
12271187

12281188
def javadoc(args):
12291189
# metadata package was deprecated, exclude it
@@ -1432,7 +1392,6 @@ def profdiff(args):
14321392
'vm': [run_vm_with_jvmci_compiler, '[-options] class [args...]'],
14331393
'collate-metrics': [collate_metrics, 'filename'],
14341394
'ctw': [ctw, '[-vmoptions|noinline|nocomplex|full]'],
1435-
'nodecostdump' : [_nodeCostDump, ''],
14361395
'java_base_unittest' : [java_base_unittest, 'Runs unittest on JDK java.base "only" module(s)'],
14371396
'updategraalinopenjdk' : [updategraalinopenjdk, '[options]'],
14381397
'renamegraalpackages' : [renamegraalpackages, '[options]'],

‎compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@
2727

2828
import org.graalvm.compiler.api.directives.GraalDirectives;
2929
import org.graalvm.compiler.core.test.GraalCompilerTest;
30+
import org.graalvm.compiler.debug.DebugOptions;
3031
import org.graalvm.compiler.debug.GraalError;
3132
import org.graalvm.compiler.graph.iterators.NodeIterable;
3233
import org.graalvm.compiler.nodes.StructuredGraph;
3334
import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
3435
import org.graalvm.compiler.nodes.extended.SwitchCaseProbabilityNode;
36+
import org.graalvm.compiler.options.OptionValues;
3537
import org.junit.Assert;
3638
import org.junit.Test;
3739

@@ -136,12 +138,14 @@ public static int incorrectTotalProbability(int x) {
136138

137139
@Test(expected = GraalError.class)
138140
public void testMissingProbability() {
139-
test("missingProbability", 1);
141+
OptionValues optionValues = new OptionValues(getInitialOptions(), DebugOptions.DumpOnError, false);
142+
test(optionValues, "missingProbability", 1);
140143
}
141144

142145
@Test(expected = GraalError.class)
143146
public void testIncorrectTotalProbability() {
144-
test("incorrectTotalProbability", 3);
147+
OptionValues optionValues = new OptionValues(getInitialOptions(), DebugOptions.DumpOnError, false);
148+
test(optionValues, "incorrectTotalProbability", 3);
145149
}
146150

147151
@Override

‎compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ public ProfilingInfoTest() {
196196

197197
@Test
198198
public void testExceptionSeen() {
199+
Assume.assumeTrue("GR-45918", Runtime.version().feature() < 21);
199200
// NullPointerException
200201
ProfilingInfo info = profile("nullPointerExceptionSnippet", 5);
201202
Assert.assertEquals(TriState.FALSE, info.getExceptionSeen(1));

0 commit comments

Comments
 (0)