Skip to content

Commit a5b832b

Browse files
committed
[GR-44242] Report the benchmark runs as part of the compiler suite for the testing dashboard.
PullRequest: graal/13793
2 parents ec2a3d5 + 162ba43 commit a5b832b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

compiler/mx.compiler/mx_compiler.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVM
525525
if t:
526526
phaseplan_fuzz_jtt_tests([], extraVMarguments=_remove_empty_entries(extraVMarguments), extraUnitTestArguments=_remove_empty_entries(extraUnitTestArguments))
527527

528-
def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
528+
def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix='', task_report_component='compiler'):
529529
# run DaCapo benchmarks #
530530
#########################
531531

@@ -549,11 +549,11 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
549549
dacapo_gate_iterations.update({'tradesoap': -1})
550550
for name in dacapo_suite.benchmarkList(bmSuiteArgs):
551551
iterations = dacapo_gate_iterations.get(name, -1)
552-
with Task(prefix + 'DaCapo:' + name, tasks, tags=GraalTags.benchmarktest, report=True) as t:
552+
with Task(prefix + 'DaCapo:' + name, tasks, tags=GraalTags.benchmarktest, report=task_report_component) as t:
553553
if t: _gate_dacapo(name, iterations, benchVmArgs + ['-Dgraal.TrackNodeSourcePosition=true'] + dacapo_esa)
554554

555555
# ensure we can also run on C2
556-
with Task(prefix + 'DaCapo_C2:fop', tasks, tags=GraalTags.test, report=True) as t:
556+
with Task(prefix + 'DaCapo_C2:fop', tasks, tags=GraalTags.test, report=task_report_component) as t:
557557
if t:
558558
# Strip JVMCI args from C2 execution which uses -XX:-EnableJVMCI
559559
c2BenchVmArgs = [a for a in benchVmArgs if 'JVMCI' not in a]
@@ -567,13 +567,13 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
567567
}
568568
for name in scala_dacapo_suite.benchmarkList(bmSuiteArgs):
569569
iterations = scala_dacapo_gate_iterations.get(name, -1)
570-
with Task(prefix + 'ScalaDaCapo:' + name, tasks, tags=GraalTags.benchmarktest, report=True) as t:
570+
with Task(prefix + 'ScalaDaCapo:' + name, tasks, tags=GraalTags.benchmarktest, report=task_report_component) as t:
571571
if t: _gate_scala_dacapo(name, iterations, benchVmArgs + ['-Dgraal.TrackNodeSourcePosition=true'] + dacapo_esa)
572572

573573
# run benchmark with non default setup #
574574
########################################
575575
# ensure -Xbatch still works
576-
with Task(prefix + 'DaCapo_pmd:BatchMode', tasks, tags=GraalTags.test, report=True) as t:
576+
with Task(prefix + 'DaCapo_pmd:BatchMode', tasks, tags=GraalTags.test, report=task_report_component) as t:
577577
if t: _gate_dacapo('pmd', 1, benchVmArgs + ['-Xbatch'])
578578

579579
# Ensure benchmark counters still work but omit this test on
@@ -583,7 +583,7 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
583583
out = mx.OutputCapture()
584584
mx.run([jdk.java, '-version'], err=subprocess.STDOUT, out=out)
585585
if 'fastdebug' not in out.data and '-XX:+UseJVMCINativeLibrary' not in (extraVMarguments or []):
586-
with Task(prefix + 'DaCapo_pmd:BenchmarkCounters', tasks, tags=GraalTags.test, report=True) as t:
586+
with Task(prefix + 'DaCapo_pmd:BenchmarkCounters', tasks, tags=GraalTags.test, report=task_report_component) as t:
587587
if t:
588588
fd, logFile = tempfile.mkstemp()
589589
os.close(fd) # Don't leak file descriptors
@@ -604,11 +604,11 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
604604
os.remove(logFile)
605605

606606
# ensure -Xcomp still works
607-
with Task(prefix + 'XCompMode:product', tasks, tags=GraalTags.test, report=True) as t:
607+
with Task(prefix + 'XCompMode:product', tasks, tags=GraalTags.test, report=task_report_component) as t:
608608
if t: run_vm(_remove_empty_entries(extraVMarguments) + ['-XX:+UseJVMCICompiler', '-Xcomp', '-version'])
609609

610610
# ensure -XX:+PreserveFramePointer still works
611-
with Task(prefix + 'DaCapo_pmd:PreserveFramePointer', tasks, tags=GraalTags.test, report=True) as t:
611+
with Task(prefix + 'DaCapo_pmd:PreserveFramePointer', tasks, tags=GraalTags.test, report=task_report_component) as t:
612612
if t: _gate_dacapo('pmd', default_iterations, benchVmArgs + ['-Xmx256M', '-XX:+PreserveFramePointer'], threads=4, force_serial_gc=False, set_start_heap_size=False)
613613

614614
graal_unit_test_runs = [
@@ -647,7 +647,7 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
647647

648648
def _graal_gate_runner(args, tasks):
649649
compiler_gate_runner(['compiler', 'truffle'], graal_unit_test_runs, graal_bootstrap_tests, tasks, args.extra_vm_argument, args.extra_unittest_argument)
650-
compiler_gate_benchmark_runner(tasks, args.extra_vm_argument)
650+
compiler_gate_benchmark_runner(tasks, args.extra_vm_argument, task_report_component='compiler')
651651

652652
class ShellEscapedStringAction(argparse.Action):
653653
"""Turns a shell-escaped string into a list of arguments.

0 commit comments

Comments
 (0)