Mercurial > hg > graal-compiler
changeset 22954:debc2385369b
fixed mx_graal_bench for JDK9
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 06 Nov 2015 13:58:35 +0100 |
parents | 81fbb33e5d4b |
children | 60f01ca8f1bd 267fb5779338 |
files | mx.graal/mx_graal.py mx.graal/mx_graal_bench.py |
diffstat | 2 files changed, 11 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal.py Thu Nov 05 15:44:19 2015 -0800 +++ b/mx.graal/mx_graal.py Fri Nov 06 13:58:35 2015 +0100 @@ -27,17 +27,10 @@ import mx JDK9 = mx.get_jdk(tag='default').javaCompliance >= "1.9" -def get_vm(): - return _get_vm() - if JDK9: - import mx_graal_9 # pylint: disable=unused-import - from mx_graal_9 import mx_post_parse_cmd_line, run_vm, isJVMCIEnabled # pylint: disable=unused-import - from mx_graal_9 import get_vm as _get_vm # pylint: disable=unused-import + from mx_graal_9 import mx_post_parse_cmd_line, run_vm, get_vm, isJVMCIEnabled # pylint: disable=unused-import else: - import mx_graal_8 # pylint: disable=unused-import - from mx_graal_8 import mx_post_parse_cmd_line, run_vm, isJVMCIEnabled # pylint: disable=unused-import - from mx_graal_8 import get_vm as _get_vm # pylint: disable=unused-import + from mx_graal_8 import mx_post_parse_cmd_line, run_vm, get_vm, isJVMCIEnabled # pylint: disable=unused-import import mx_graal_bench # pylint: disable=unused-import
--- a/mx.graal/mx_graal_bench.py Thu Nov 05 15:44:19 2015 -0800 +++ b/mx.graal/mx_graal_bench.py Fri Nov 06 13:58:35 2015 +0100 @@ -29,8 +29,7 @@ import json import mx -from mx_jvmci import run_vm -from mx_graal import get_vm +import mx_graal def _run_benchmark(args, availableBenchmarks, runBenchmark): @@ -71,7 +70,7 @@ del args[0] for _ in range(count): - if not run_vm(['-XX:-TieredCompilation', '-XX:+DeoptimizeALot', '-XX:+VerifyOops'] + args + ['-version']) == 0: + if not mx_graal.run_vm(['-XX:-TieredCompilation', '-XX:+DeoptimizeALot', '-XX:+VerifyOops'] + args + ['-version']) == 0: mx.abort("Failed") def longtests(args): @@ -84,7 +83,7 @@ """run one or more DaCapo benchmarks""" def launcher(bm, harnessArgs, extraVmOpts): - return sanitycheck.getDacapo(bm, harnessArgs).test(get_vm(), extraVmOpts=extraVmOpts) + return sanitycheck.getDacapo(bm, harnessArgs).test(mx_graal.get_vm(), extraVmOpts=extraVmOpts) _run_benchmark(args, sanitycheck.dacapoSanityWarmup.keys(), launcher) @@ -92,7 +91,7 @@ """run one or more Scala DaCapo benchmarks""" def launcher(bm, harnessArgs, extraVmOpts): - return sanitycheck.getScalaDacapo(bm, harnessArgs).test(get_vm(), extraVmOpts=extraVmOpts) + return sanitycheck.getScalaDacapo(bm, harnessArgs).test(mx_graal.get_vm(), extraVmOpts=extraVmOpts) _run_benchmark(args, sanitycheck.dacapoScalaSanityWarmup.keys(), launcher) @@ -124,7 +123,7 @@ del args[index] else: mx.abort('-resultfilecsv must be followed by a file name') - vm = get_vm() + vm = mx_graal.get_vm() if len(args) is 0: args = ['all'] @@ -203,7 +202,7 @@ """run one or more SPECjvm2008 benchmarks""" def launcher(bm, harnessArgs, extraVmOpts): - return sanitycheck.getSPECjvm2008(harnessArgs + [bm]).bench(get_vm(), extraVmOpts=extraVmOpts) + return sanitycheck.getSPECjvm2008(harnessArgs + [bm]).bench(mx_graal.get_vm(), extraVmOpts=extraVmOpts) availableBenchmarks = set(sanitycheck.specjvm2008Names) if "all" not in args: @@ -222,7 +221,7 @@ def launcher(bm, harnessArgs, extraVmOpts): assert bm is None - return sanitycheck.getSPECjbb2013(harnessArgs).bench(get_vm(), extraVmOpts=extraVmOpts) + return sanitycheck.getSPECjbb2013(harnessArgs).bench(mx_graal.get_vm(), extraVmOpts=extraVmOpts) _run_benchmark(args, None, launcher) @@ -231,7 +230,7 @@ def launcher(bm, harnessArgs, extraVmOpts): assert bm is None - return sanitycheck.getSPECjbb2015(harnessArgs).bench(get_vm(), extraVmOpts=extraVmOpts) + return sanitycheck.getSPECjbb2015(harnessArgs).bench(mx_graal.get_vm(), extraVmOpts=extraVmOpts) _run_benchmark(args, None, launcher) @@ -240,7 +239,7 @@ def launcher(bm, harnessArgs, extraVmOpts): assert bm is None - return sanitycheck.getSPECjbb2005(harnessArgs).bench(get_vm(), extraVmOpts=extraVmOpts) + return sanitycheck.getSPECjbb2005(harnessArgs).bench(mx_graal.get_vm(), extraVmOpts=extraVmOpts) _run_benchmark(args, None, launcher)