comparison mx/sanitycheck.py @ 4329:4aacce9c9cb9

Add posibility to give arguments for a SPECjvm2008 run
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 26 Jan 2012 12:22:36 +0100
parents 76190108a9f2
children daaee28c65c6
comparison
equal deleted inserted replaced
4328:60c48d99c28b 4329:4aacce9c9cb9
65 } 65 }
66 66
67 class SanityCheckLevel: 67 class SanityCheckLevel:
68 Fast, Gate, Normal, Extensive, Benchmark = range(5) 68 Fast, Gate, Normal, Extensive, Benchmark = range(5)
69 69
70 def getSPECjvm2008(skipKitValidation=False, warmupTime=None, iterationTime=None): 70 def getSPECjvm2008(benchArgs = None, skipKitValidation=False, warmupTime=None, iterationTime=None):
71 71
72 specjvm2008 = mx.get_env('SPECJVM2008') 72 specjvm2008 = mx.get_env('SPECJVM2008')
73 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')): 73 if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')):
74 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory') 74 mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory')
75 75
85 if iterationTime is not None: 85 if iterationTime is not None:
86 opts += ['-it', str(iterationTime)] 86 opts += ['-it', str(iterationTime)]
87 if skipKitValidation: 87 if skipKitValidation:
88 opts += ['-ikv'] 88 opts += ['-ikv']
89 89
90 return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts, [success], [error], [matcher], vmOpts=['-Xms3g'], defaultCwd=specjvm2008) 90 return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g'], defaultCwd=specjvm2008)
91 91
92 def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]): 92 def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]):
93 checks = [] 93 checks = []
94 94
95 for (bench, ns) in dacapoSanityWarmup.items(): 95 for (bench, ns) in dacapoSanityWarmup.items():