Mercurial > hg > truffle

comparison mx/sanitycheck.py @ 6296:89ed4e8c45c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update SPECjvm2008 bench regex
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 27 Aug 2012 14:50:03 +0200
parents 0e54d9bb922d
children 0a0d0dfd83bc
comparison
equal deleted inserted replaced
6284:e952911afd2f 6296:89ed4e8c45c4
113 113
114 specjvm2008 = mx.get_env('SPECJVM2008') 114 specjvm2008 = mx.get_env('SPECJVM2008')
115 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): 115 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')):
116 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory') 116 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory')
117 117
118 score = re.compile(r"^(Score on|Noncompliant) (?P<benchmark>[a-zA-Z0-9\._]+)( result)?: (?P<score>[0-9]+(,|\.)[0-9]+)( SPECjvm2008 Base)? ops/m$") 118 score = re.compile(r"^(Score on|Noncompliant) (?P<benchmark>[a-zA-Z0-9\._]+)( result)?: (?P<score>[0-9]+((,|\.)[0-9]+)?)( SPECjvm2008 Base)? ops/m$")
119 error = re.compile(r"^Errors in benchmark: ") 119 error = re.compile(r"^Errors in benchmark: ")
120 # The ' ops/m' at the end of the success string is important : it's how you can tell valid and invalid runs apart 120 # The ' ops/m' at the end of the success string is important : it's how you can tell valid and invalid runs apart
121 success = re.compile(r"^(Noncompliant c|C)omposite result: [0-9]+(,|\.)[0-9]+( SPECjvm2008 (Base|Peak))? ops/m$") 121 success = re.compile(r"^(Noncompliant c|C)omposite result: [0-9]+((,|\.)[0-9]+)?( SPECjvm2008 (Base|Peak))? ops/m$")
122 matcher = Matcher(score, {'const:group' : "const:SPECjvm2008", 'const:name' : 'benchmark', 'const:score' : 'score'}, startNewLine=True) 122 matcher = Matcher(score, {'const:group' : "const:SPECjvm2008", 'const:name' : 'benchmark', 'const:score' : 'score'}, startNewLine=True)
123 123
124 opts = [] 124 opts = []
125 if warmupTime is not None: 125 if warmupTime is not None:
126 opts += ['-wt', str(warmupTime)] 126 opts += ['-wt', str(warmupTime)]