comparison mx/sanitycheck.py @ 9180:4e6df9021a59

Assemble the CTW bench in the same value, remove PEA from nocomplex
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 17 Apr 2013 18:30:41 +0200
parents 626bc0fac6d9
children ea24896c95c9
comparison
equal deleted inserted replaced
9179:11516ac4fbda 9180:4e6df9021a59
222 222
223 class CTWMode: 223 class CTWMode:
224 Full, NoInline, NoComplex = range(3) 224 Full, NoInline, NoComplex = range(3)
225 225
226 def getCTW(vm,mode): 226 def getCTW(vm,mode):
227
228 modeString = ''
229 if mode == CTWMode.Full:
230 modeString = 'Full'
231 elif mode == CTWMode.NoInline:
232 modeString = 'NoInline'
233 elif mode == CTWMode.NoComplex:
234 modeString = 'NoComplex'
235 else:
236 mx.abort("Unknown CTW mode")
237
238 time = re.compile(r"CompileTheWorld : Done \([0-9]+ classes, [0-9]+ methods, (?P<time>[0-9]+) ms\)") 227 time = re.compile(r"CompileTheWorld : Done \([0-9]+ classes, [0-9]+ methods, (?P<time>[0-9]+) ms\)")
239 scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : modeString + '-CompileTime', 'score' : '<time>'}) 228 scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : 'CompileTime', 'score' : '<time>'})
240 229
241 jre = os.environ.get('JAVA_HOME') 230 jre = os.environ.get('JAVA_HOME')
242 if exists(join(jre, 'jre')): 231 if exists(join(jre, 'jre')):
243 jre = join(jre, 'jre') 232 jre = join(jre, 'jre')
244 rtjar = join(jre, 'lib', 'rt.jar') 233 rtjar = join(jre, 'lib', 'rt.jar')
252 args.append('-XX:-Inline') 241 args.append('-XX:-Inline')
253 else: 242 else:
254 args.append('-G:-Inline') 243 args.append('-G:-Inline')
255 if mode >= CTWMode.NoComplex: 244 if mode >= CTWMode.NoComplex:
256 if not vm.endswith('-nograal'): 245 if not vm.endswith('-nograal'):
257 args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling'] 246 args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling', '-G:-PartialEscapeAnalysis']
258 247
259 return Test("CompileTheWorld-" + modeString, args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False) 248 return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False)
260 249
261 250
262 class Tee: 251 class Tee:
263 def __init__(self): 252 def __init__(self):
264 self.output = StringIO.StringIO() 253 self.output = StringIO.StringIO()