Mercurial > hg > truffle
comparison mx/commands.py @ 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 | e872562f95f8 |
children | 057620486c90 |
comparison
equal
deleted
inserted
replaced
4229:8074251d1e05 | 4230:b780ecb920c9 |
---|---|
177 | 177 |
178 # The remainder are VM options | 178 # The remainder are VM options |
179 vmOpts = [arg for arg in args if not arg.startswith('@')] | 179 vmOpts = [arg for arg in args if not arg.startswith('@')] |
180 | 180 |
181 failed = [] | 181 failed = [] |
182 print str(numTests) | |
183 for (test, n) in numTests.items(): | 182 for (test, n) in numTests.items(): |
184 if not sanitycheck.getDacapo(test, n, dacapoArgs).test('-graal', opts=vmOpts): | 183 if not sanitycheck.getDacapo(test, n, dacapoArgs).test('-graal', opts=vmOpts): |
185 failed.append(test) | 184 failed.append(test) |
186 | 185 |
187 if len(failed) != 0: | 186 if len(failed) != 0: |
564 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running unit tests...')) | 563 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running unit tests...')) |
565 unittest([]) | 564 unittest([]) |
566 | 565 |
567 # 8. Run selected DaCapo benchmarks | 566 # 8. Run selected DaCapo benchmarks |
568 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running DaCapo benchmarks...')) | 567 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running DaCapo benchmarks...')) |
569 dacapo(['eclipse']) | 568 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate): |
570 #dacapo(['tradesoap']) | 569 if not test.test('-graal'): |
571 dacapo(['batik']) | 570 mx.abort(test.group + ' ' + test.name + ' Failed') |
572 dacapo(['avrora']) | |
573 dacapo(['fop']) | |
574 | 571 |
575 duration = datetime.timedelta(seconds=time.time() - start) | 572 duration = datetime.timedelta(seconds=time.time() - start) |
576 mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')')) | 573 mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')')) |
577 | 574 |
578 def bench(args): | 575 def bench(args): |
579 results = {} | 576 results = {} |
580 #DaCapo | 577 #DaCapo |
581 benchmarks = sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark) | 578 benchmarks = sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark) |
582 #Bootstrap | 579 #Bootstrap |
583 benchmarks += sanitycheck.getBootstraps() | 580 benchmarks += sanitycheck.getBootstraps() |
581 #SPECjvm2008 | |
582 benchmarks += [sanitycheck.getSPECjvm2008(True, 60, 120)] | |
584 | 583 |
585 for test in benchmarks: | 584 for test in benchmarks: |
586 if not results.has_key(test.group): | 585 if not results.has_key(test.group): |
587 results[test.group] = {} | 586 results[test.group] = {} |
588 results[test.group].update(test.bench('-graal')) | 587 results[test.group].update(test.bench('-graal')) |