Mercurial > hg > truffle
diff mx/commands.py @ 4370:44e2e5cb37f3
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 27 Jan 2012 16:39:32 +0100 |
parents | b5c12b21879c |
children | 3b776fb6ffd9 |
line wrap: on
line diff
--- a/mx/commands.py Thu Jan 26 18:33:58 2012 +0100 +++ b/mx/commands.py Fri Jan 27 16:39:32 2012 +0100 @@ -538,12 +538,23 @@ #DaCapo if ('dacapo' in args or 'all' in args): benchmarks += sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark) + else: + dacapos = [a[7:] for a in args if a.startswith('dacapo:')] + for dacapo in dacapos: + if dacapo not in sanitycheck.dacapoSanityWarmup.keys(): + mx.abort('Unknown dacapo : ' + dacapo) + benchmarks += [sanitycheck.getDacapo(dacapo, sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark])] + #Bootstrap if ('bootstrap' in args or 'all' in args): benchmarks += sanitycheck.getBootstraps() #SPECjvm2008 if ('specjvm2008' in args or 'all' in args): - benchmarks += [sanitycheck.getSPECjvm2008(True, 120, 120)] + benchmarks += [sanitycheck.getSPECjvm2008([], True, 120, 120)] + else: + specjvms = [a[12:] for a in args if a.startswith('specjvm2008:')] + for specjvm in specjvms: + benchmarks += [sanitycheck.getSPECjvm2008([specjvm], True, 120, 120)] for test in benchmarks: if not results.has_key(test.group): @@ -555,7 +566,9 @@ f.write(json.dumps(results)) def specjvm2008(args): - sanitycheck.getSPECjvm2008().bench('-graal') + benchArgs = [a[1:] for a in args if a[0] == '@'] + vmArgs = [a for a in args if a[0] != '@'] + sanitycheck.getSPECjvm2008(benchArgs).bench('-graal', opts=vmArgs) def mx_init(): _vmbuild = 'product'