Mercurial > hg > truffle
changeset 4230:b780ecb920c9
Add SPECjvm2008 to benchmarks, use dacapos defined in sanitycheck for the gate
author | Gilles Duboscq <gilles.m.duboscq@gmail.com> |
---|---|
date | Thu, 05 Jan 2012 20:15:45 +0100 |
parents | 8074251d1e05 |
children | d713eaf4d288 |
files | mx/commands.py mx/sanitycheck.py |
diffstat | 2 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Thu Jan 05 17:25:28 2012 +0100 +++ b/mx/commands.py Thu Jan 05 20:15:45 2012 +0100 @@ -179,7 +179,6 @@ vmOpts = [arg for arg in args if not arg.startswith('@')] failed = [] - print str(numTests) for (test, n) in numTests.items(): if not sanitycheck.getDacapo(test, n, dacapoArgs).test('-graal', opts=vmOpts): failed.append(test) @@ -566,11 +565,9 @@ # 8. Run selected DaCapo benchmarks mx.log(time.strftime('%d %b %Y %H:%M:%S - Running DaCapo benchmarks...')) - dacapo(['eclipse']) - #dacapo(['tradesoap']) - dacapo(['batik']) - dacapo(['avrora']) - dacapo(['fop']) + for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate): + if not test.test('-graal'): + mx.abort(test.group + ' ' + test.name + ' Failed') duration = datetime.timedelta(seconds=time.time() - start) mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')')) @@ -581,6 +578,8 @@ benchmarks = sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark) #Bootstrap benchmarks += sanitycheck.getBootstraps() + #SPECjvm2008 + benchmarks += [sanitycheck.getSPECjvm2008(True, 60, 120)] for test in benchmarks: if not results.has_key(test.group):
--- a/mx/sanitycheck.py Thu Jan 05 17:25:28 2012 +0100 +++ b/mx/sanitycheck.py Thu Jan 05 20:15:45 2012 +0100 @@ -64,9 +64,9 @@ opts = [] if warmupTime is not None: - opts +0 ['-wt', str(warmupTime)] + opts += ['-wt', str(warmupTime)] if iterationTime is not None: - opts +0 ['-it', str(iterationTime)] + opts += ['-it', str(iterationTime)] if skipKitValidation: opts += ['-ikv'] @@ -101,8 +101,8 @@ time = re.compile(r"Bootstrapping Graal............... in (?P<time>[0-9]+) ms") scoreMatcher = Matcher(time, {'const:name' : 'const:BootstrapTime', 'const:score' : 'time'}) tests = [] - tests.append(Test("Bootstrap", "Bootstrap", ['-version'], succesREs=[time], scoreMatchers=[scoreMatcher])) - tests.append(Test("Bootstrap-bigHeap", "Bootstrap-bigHeap", ['-version'], succesREs=[time], scoreMatchers=[scoreMatcher], vmOpts=['-Xms2g'])) + tests.append(Test("Bootstrap", "Bootstrap", ['-version'], successREs=[time], scoreMatchers=[scoreMatcher])) + tests.append(Test("Bootstrap-bigHeap", "Bootstrap-bigHeap", ['-version'], successREs=[time], scoreMatchers=[scoreMatcher], vmOpts=['-Xms2g'])) return tests """