Skip to content

Commit b74f74c

Browse files
committed
ignore return value of benchmark harness, collect all available results
1 parent 169fb8e commit b74f74c

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

mx.graalpython/mx_graalpython_python_benchmarks.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,11 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
316316
*bms,
317317
],
318318
cwd=workdir,
319+
nonZeroIsFatal=False,
319320
)
320321
shutil.copy(join(workdir, json_file), join(SUITE.dir, "raw_results.json"))
321-
return retcode, join(workdir, json_file)
322+
mx.log(f"Return code of benchmark harness: {retcode}")
323+
return 0, join(workdir, json_file)
322324

323325

324326
class PyPySuite(mx_benchmark.TemporaryWorkdirMixin, mx_benchmark.VmBenchmarkSuite):
@@ -387,9 +389,11 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
387389
*bms,
388390
],
389391
cwd=workdir,
392+
nonZeroIsFatal=False,
390393
)
391394
shutil.copy(join(workdir, json_file), join(SUITE.dir, "raw_results.json"))
392-
return retcode, join(workdir, json_file)
395+
mx.log(f"Return code of benchmark harness: {retcode}")
396+
return 0, join(workdir, json_file)
393397

394398

395399
class NumPySuite(mx_benchmark.TemporaryWorkdirMixin, mx_benchmark.VmBenchmarkSuite):
@@ -479,15 +483,17 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
479483
*bms,
480484
],
481485
cwd=benchdir,
486+
nonZeroIsFatal=False,
482487
)
483488

484489
json_file = glob.glob(join(benchdir, "results", "*", "*numpy*.json"))
490+
mx.log(f"Return code of benchmark harness: {retcode}")
485491
if json_file:
486492
json_file = json_file[0]
487493
shutil.copy(json_file, join(SUITE.dir, "raw_results.json"))
488-
return retcode, json_file
494+
return 0, json_file
489495
else:
490-
return retcode, ""
496+
return -1, ""
491497

492498

493499
def register_python_benchmarks():

0 commit comments

Comments
 (0)