Mercurial > hg > truffle
comparison mx/sanitycheck.py @ 7571:6078d41cecb2
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 30 Jan 2013 22:44:51 +0100 |
parents | 2025455e7d80 dea5423a9479 |
children | 641a4c6ac1ce |
comparison
equal
deleted
inserted
replaced
7570:2025455e7d80 | 7571:6078d41cecb2 |
---|---|
105 error = re.compile(r"VALIDATION ERROR") | 105 error = re.compile(r"VALIDATION ERROR") |
106 success = re.compile(r"^Valid run, Score is [0-9]+$", re.MULTILINE) | 106 success = re.compile(r"^Valid run, Score is [0-9]+$", re.MULTILINE) |
107 matcher = ValuesMatcher(score, {'group' : 'SPECjbb2005', 'name' : 'score', 'score' : '<score>'}) | 107 matcher = ValuesMatcher(score, {'group' : 'SPECjbb2005', 'name' : 'score', 'score' : '<score>'}) |
108 classpath = ['jbb.jar', 'check.jar'] | 108 classpath = ['jbb.jar', 'check.jar'] |
109 return Test("SPECjbb2005", ['spec.jbb.JBBmain', '-propfile', 'SPECjbb.props'] + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-cp', os.pathsep.join(classpath)], defaultCwd=specjbb2005) | 109 return Test("SPECjbb2005", ['spec.jbb.JBBmain', '-propfile', 'SPECjbb.props'] + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-cp', os.pathsep.join(classpath)], defaultCwd=specjbb2005) |
110 | |
111 def getSPECjbb2013(benchArgs = []): | |
112 | |
113 specjbb2013 = mx.get_env('SPECJBB2013') | |
114 if specjbb2013 is None or not exists(join(specjbb2013, 'specjbb2013.jar')): | |
115 mx.abort('Please set the SPECJBB2013 environment variable to a SPECjbb2013 directory') | |
116 | |
117 jops = re.compile(r"^RUN RESULT: hbIR \(max attempted\) = [0-9]+, hbIR \(settled\) = [0-9]+, max-jOPS = (?P<max>[0-9]+), critical-jOPS = (?P<critical>[0-9]+)$", re.MULTILINE) | |
118 #error? | |
119 success = re.compile(r"org.spec.jbb.controller: Run finished", re.MULTILINE) | |
120 matcherMax = ValuesMatcher(jops, {'group' : 'SPECjbb2013', 'name' : 'max', 'score' : '<max>'}) | |
121 matcherCritical = ValuesMatcher(jops, {'group' : 'SPECjbb2013', 'name' : 'critical', 'score' : '<critical>'}) | |
122 return Test("SPECjbb2013", ['-jar', 'specjbb2013.jar', '-m', 'composite'] + benchArgs, [success], [], [matcherCritical, matcherMax], vmOpts=['-Xms7g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-XX:CompileCommand=exclude,*.FastMath::slowLog'], defaultCwd=specjbb2013) | |
110 | 123 |
111 def getSPECjvm2008(benchArgs = [], skipCheck=False, skipKitValidation=False, warmupTime=None, iterationTime=None): | 124 def getSPECjvm2008(benchArgs = [], skipCheck=False, skipKitValidation=False, warmupTime=None, iterationTime=None): |
112 | 125 |
113 specjvm2008 = mx.get_env('SPECJVM2008') | 126 specjvm2008 = mx.get_env('SPECJVM2008') |
114 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): | 127 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): |