comparison mx/sanitycheck.py @ 17378:d42e11af980d

mx: simplified ctw command
author Doug Simon <doug.simon@oracle.com>
date Thu, 09 Oct 2014 00:20:30 +0200
parents 03eef43d364f
children 6df10903c955
comparison
equal deleted inserted replaced
17377:58f45b63b802 17378:d42e11af980d
262 tests.append(Test("Bootstrap", ['-version'], successREs=[time], scoreMatchers=[scoreMatcher, methodMatcher], ignoredVMs=['client', 'server'], benchmarkCompilationRate=False)) 262 tests.append(Test("Bootstrap", ['-version'], successREs=[time], scoreMatchers=[scoreMatcher, methodMatcher], ignoredVMs=['client', 'server'], benchmarkCompilationRate=False))
263 tests.append(Test("Bootstrap-bigHeap", ['-version'], successREs=[time], scoreMatchers=[scoreMatcherBig, methodMatcherBig], vmOpts=['-Xms2g'], ignoredVMs=['client', 'server'], benchmarkCompilationRate=False)) 263 tests.append(Test("Bootstrap-bigHeap", ['-version'], successREs=[time], scoreMatchers=[scoreMatcherBig, methodMatcherBig], vmOpts=['-Xms2g'], ignoredVMs=['client', 'server'], benchmarkCompilationRate=False))
264 return tests 264 return tests
265 265
266 class CTWMode: 266 class CTWMode:
267 Full, NoInline, NoComplex = range(3) 267 Full, NoInline = range(2)
268 268
269 def getCTW(vm, mode): 269 def getCTW(vm, mode):
270 time = re.compile(r"CompileTheWorld : Done \([0-9]+ classes, [0-9]+ methods, (?P<time>[0-9]+) ms\)") 270 time = re.compile(r"CompileTheWorld : Done \([0-9]+ classes, [0-9]+ methods, (?P<time>[0-9]+) ms\)")
271 scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : 'CompileTime', 'score' : '<time>'}) 271 scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : 'CompileTime', 'score' : '<time>'})
272 272
281 args += ['-XX:+BootstrapGraal'] 281 args += ['-XX:+BootstrapGraal']
282 if mode >= CTWMode.NoInline: 282 if mode >= CTWMode.NoInline:
283 if not mx_graal.isGraalEnabled(vm): 283 if not mx_graal.isGraalEnabled(vm):
284 args.append('-XX:-Inline') 284 args.append('-XX:-Inline')
285 else: 285 else:
286 args.append('-G:-Inline') 286 args.append('-G:CompileTheWordConfig=-Inline')
287 if mode >= CTWMode.NoComplex:
288 if mx_graal.isGraalEnabled(vm):
289 args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling', '-G:-NewMemoryAwareScheduling', '-G:-PartialEscapeAnalysis']
290 287
291 return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False) 288 return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False)
292 289
293 290
294 class Tee: 291 class Tee: