Skip to content

Commit f086f80

Browse files
committed
[GR-21590] update imports
PullRequest: graalpython/2240
2 parents 3291018 + 4fc1827 commit f086f80

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

bisect-benchmark.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ good = 1234cafebabe
3838
enterprise = true
3939

4040
# Which result parameter should be used for comparisons, one of BEST, WORST,
41-
# AVG (all runs), AVG (no warmup)
41+
# AVG (all runs), AVG (no warmup), WORKS (bench failures are treated as
42+
# regressions)
4243
benchmark_criterion = BEST

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "a3f5acbe1104349cce9ec62e9b39f0c5c8403d92" }
1+
{ "overlay": "d90fe739f07cf57e6e8779e31b2ee6e3d543ed50" }

mx.graalpython/mx_graalpython_bisect.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
22
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
#
44
# The Universal Permissive License (UPL), Version 1.0
@@ -238,7 +238,12 @@ def benchmark_callback(suite, commit):
238238
output = mx.OutputCapture()
239239
retcode = mx.run(shlex.split(args.benchmark_command), out=mx.TeeOutputCapture(output), nonZeroIsFatal=False)
240240
if retcode:
241-
raise RuntimeError("Failed to execute benchmark for {}".format(commit))
241+
if args.benchmark_criterion == 'WORKS':
242+
return sys.maxsize
243+
else:
244+
raise RuntimeError("Failed to execute benchmark for {}".format(commit))
245+
elif args.benchmark_criterion == 'WORKS':
246+
return 0
242247
match = re.search(r'{}.*duration: ([\d.]+)'.format(re.escape(args.benchmark_criterion)), output.data)
243248
if not match:
244249
raise RuntimeError("Failed to get result from the benchmark")

mx.graalpython/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@
4444
},
4545
{
4646
"name": "tools",
47-
"version": "ac0dc591736856f9df9fd12f603bec51bf6c3631",
47+
"version": "7d193aafe50a98d60f2b213ce82f9e53b9bedf68",
4848
"subdir": True,
4949
"urls": [
5050
{"url": "https://github.com/oracle/graal", "kind": "git"},
5151
],
5252
},
5353
{
5454
"name": "sulong",
55-
"version": "ac0dc591736856f9df9fd12f603bec51bf6c3631",
55+
"version": "7d193aafe50a98d60f2b213ce82f9e53b9bedf68",
5656
"subdir": True,
5757
"urls": [
5858
{"url": "https://github.com/oracle/graal", "kind": "git"},
5959
]
6060
},
6161
{
6262
"name": "regex",
63-
"version": "ac0dc591736856f9df9fd12f603bec51bf6c3631",
63+
"version": "7d193aafe50a98d60f2b213ce82f9e53b9bedf68",
6464
"subdir": True,
6565
"urls": [
6666
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)