Skip to content

Commit c07c1f3

Browse files
committed
meso suite benchmark parameters for remainder of benchmarks
1 parent 1b167c3 commit c07c1f3

File tree

2 files changed

+7
-32
lines changed

2 files changed

+7
-32
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -278,38 +278,12 @@ class GraalPythonTags(object):
278278
unittest = 'python-unittest'
279279
cpyext = 'python-cpyext'
280280
svmunit = 'python-svm-unittest'
281-
benchmarks = 'python-benchmarks'
282281
downstream = 'python-downstream'
283282
graalvm = 'python-graalvm'
284283
apptests = 'python-apptests'
285284
license = 'python-license'
286285

287286

288-
python_test_benchmarks = {
289-
'binarytrees3': '12',
290-
'fannkuchredux3': '9',
291-
'fasta3': '250000',
292-
'mandelbrot3': '600',
293-
'meteor3': '2098',
294-
'nbody3': '100000',
295-
'spectralnorm3': '500',
296-
'richards3': '3',
297-
'bm-ai': '0',
298-
'pidigits': '0',
299-
'pypy-go': '1',
300-
}
301-
302-
303-
def _gate_python_benchmarks_tests(name, iterations):
304-
run_java = mx.run_java
305-
vmargs += ['-cp', mx.classpath(["com.oracle.graal.python"]), "com.oracle.graal.python.shell.GraalPythonMain", name, str(iterations)]
306-
success_pattern = re.compile(r"^(?P<benchmark>[a-zA-Z0-9.\-]+): (?P<score>[0-9]+(\.[0-9]+)?$)")
307-
out = mx.OutputCapture()
308-
run_java(vmargs, out=mx.TeeOutputCapture(out), err=subprocess.STDOUT)
309-
if not re.search(success_pattern, out.data, re.MULTILINE):
310-
mx.abort('Benchmark "' + name + '" doesn\'t match success pattern: ' + str(success_pattern))
311-
312-
313287
def python_gate(args):
314288
if not os.environ.get("JDT"):
315289
find_jdt()
@@ -453,11 +427,6 @@ def is_included(path):
453427
if success not in out.data:
454428
mx.abort('Output from generated SVM image "' + svm_image + '" did not match success pattern:\n' + success)
455429

456-
for name, iterations in sorted(python_test_benchmarks.iteritems()):
457-
with Task('PythonBenchmarksTest:' + name, tasks, tags=[GraalPythonTags.benchmarks]) as task:
458-
if task:
459-
_gate_python_benchmarks_tests("graalpython/benchmarks/src/benchmarks/" + name + ".py", iterations)
460-
461430

462431
mx_gate.add_gate_runner(_suite, graalpython_gate_runner)
463432

mx.graalpython/mx_graalpython_bench_param.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
'ai-nqueen': ITER_10 + ['10'],
100100
'pads-eratosthenes': ITER_10 + ['100000'],
101101
'pads-integerpartitions': ITER_10 + ['700'],
102-
# 'pads-lyndon': ITER_10 + ['100000000'], # very slow benchmark compared to the others in this group ~180s / iter
102+
'pads-bipartite': ITER_10 + ['10000'],
103+
'pads-lyndon': ITER_10 + ['10000000'],
103104
# -------------------------------------------------------
104105
# object benchmarks
105106
# -------------------------------------------------------
@@ -117,6 +118,11 @@
117118
'spectralnorm3': ITER_10 + ['3000'],
118119
'pidigits': ITER_10 + [],
119120
'sieve': ITER_25 + ['100000'],
121+
'image-magix': ITER_10 + ['10000'],
122+
'parrot-b2': ITER_10 + ['200'],
123+
# 'threadring': ITER_10 + ['100'], # TODO: provide itertools cycle implementation
124+
# 'regexdna': ITER_10 + [], # TODO: provide proper input for this benchmark
125+
# 'knucleotide': ITER_10 + [], # TODO: provide proper input for this benchmark
120126
}
121127

122128

0 commit comments

Comments
 (0)