Mercurial > hg > truffle
changeset 4308:cbed6f7e2d10
Merge
| author | Lukas Stadler <lukas.stadler@jku.at> |
|---|---|
| date | Tue, 17 Jan 2012 15:28:41 +0100 |
| parents | a21979dc80be (current diff) 152f3b514618 (diff) |
| children | 4a609a685fa4 |
| files | |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/sanitycheck.py Tue Jan 17 15:26:59 2012 +0100 +++ b/mx/sanitycheck.py Tue Jan 17 15:28:41 2012 +0100 @@ -31,20 +31,20 @@ from os.path import isfile, join, exists dacapoSanityWarmup = { - 'avrora': [0, 0, 3, 6, 10], + 'avrora': [0, 0, 3, 6, 13], 'batik': [0, 0, 5, 5, 20], - 'eclipse': [2, 4, 5, 10, 13], + 'eclipse': [2, 4, 5, 10, 16], 'fop': [4, 8, 10, 20, 30], - 'h2': [0, 0, 5, 5, 5], - 'jython': [0, 0, 5, 10, 10], + 'h2': [0, 0, 5, 5, 8], + 'jython': [0, 0, 5, 10, 13], 'luindex': [0, 0, 5, 10, 10], - 'lusearch': [0, 4, 5, 5, 5], - 'pmd': [0, 0, 5, 10, 10], + 'lusearch': [0, 4, 5, 5, 8], + 'pmd': [0, 0, 5, 10, 13], 'sunflow': [0, 0, 5, 10, 15], - 'tomcat': [0, 0, 5, 10, 10], - 'tradebeans': [0, 0, 5, 10, 10], - 'tradesoap': [2, 4, 5, 10, 10], - 'xalan': [0, 0, 5, 10, 15], + 'tomcat': [0, 0, 5, 10, 15], + 'tradebeans': [0, 0, 5, 10, 13], + 'tradesoap': [2, 4, 5, 10, 15], + 'xalan': [0, 0, 5, 10, 18], } dacapoGateBuildLevels = { @@ -87,7 +87,7 @@ if skipKitValidation: opts += ['-ikv'] - return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts, [success], [error], [matcher], vmOpts=['-Xms2g'], defaultCwd=specjvm2008) + return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts, [success], [error], [matcher], vmOpts=['-Xms3g'], defaultCwd=specjvm2008) def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]): checks = [] @@ -117,7 +117,7 @@ dacapoMatcher = Matcher(dacapoTime, {'const:name' : 'benchmark', 'const:score' : 'time'}) - return Test("DaCapo-" + name, "DaCapo", ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher], ['-Xms1g', '-Xmx2g', '-XX:MaxPermSize=256m']) + return Test("DaCapo-" + name, "DaCapo", ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher], ['-Xms2g', '-XX:MaxPermSize=256m']) def getBootstraps(): time = re.compile(r"Bootstrapping Graal\.+ in (?P<time>[0-9]+) ms")