comparison mx/sanitycheck.py @ 4335:0d661161fa24

Add possibility to run individual DaCapo & SPECjvm2008 benchmarks, small fix in success and score regular expressions for SPECjvm2008
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 26 Jan 2012 23:35:08 +0100
parents 0893aef10ed4
children be787de79394
comparison
equal deleted inserted replaced
4334:0893aef10ed4 4335:0d661161fa24
70 70
71 specjvm2008 = mx.get_env('SPECJVM2008') 71 specjvm2008 = mx.get_env('SPECJVM2008')
72 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): 72 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')):
73 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory') 73 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory')
74 74
75 score = re.compile(r"^(Score on|Noncompliant) (?P<benchmark>[a-zA-Z0-9\.\-]+)( result)?: (?P<score>[0-9]+(,|\.)[0-9]+)( SPECjvm2008 Base)? ops/m$") 75 score = re.compile(r"^(Score on|Noncompliant) (?P<benchmark>[a-zA-Z0-9\._]+)( result)?: (?P<score>[0-9]+(,|\.)[0-9]+)( SPECjvm2008 Base)? ops/m$")
76 error = re.compile(r"^Errors in benchmark: ") 76 error = re.compile(r"^Errors in benchmark: ")
77 # The ' ops/m' at the end of the success string is important : it's how you can tell valid and invalid runs apart 77 # The ' ops/m' at the end of the success string is important : it's how you can tell valid and invalid runs apart
78 success = re.compile(r"^(Noncompliant c|C)omposite result: [0-9]+,[0-9]+( SPECjvm2008 (Base|Peak))? ops/m$") 78 success = re.compile(r"^(Noncompliant c|C)omposite result: [0-9]+(,|\.)[0-9]+( SPECjvm2008 (Base|Peak))? ops/m$")
79 matcher = Matcher(score, {'const:name' : 'benchmark', 'const:score' : 'score'}, startNewLine=True) 79 matcher = Matcher(score, {'const:name' : 'benchmark', 'const:score' : 'score'}, startNewLine=True)
80 80
81 opts = [] 81 opts = []
82 if warmupTime is not None: 82 if warmupTime is not None:
83 opts += ['-wt', str(warmupTime)] 83 opts += ['-wt', str(warmupTime)]