Mercurial > hg > truffle
comparison mx/sanitycheck.py @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:36:48 +0200 |
parents | c435184ca071 |
children |
comparison
equal
deleted
inserted
replaced
21558:d563baeca9df | 21559:be896a1983c0 |
---|---|
276 jre = join(jre, 'jre') | 276 jre = join(jre, 'jre') |
277 rtjar = join(jre, 'lib', 'rt.jar') | 277 rtjar = join(jre, 'lib', 'rt.jar') |
278 | 278 |
279 | 279 |
280 args = ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + rtjar] | 280 args = ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + rtjar] |
281 if vm == 'graal': | 281 if vm == 'jvmci': |
282 args += ['-XX:+BootstrapGraal'] | 282 args += ['-XX:+BootstrapGraal'] |
283 if mode >= CTWMode.NoInline: | 283 if mode >= CTWMode.NoInline: |
284 if not mx_graal.isGraalEnabled(vm): | 284 if not mx_graal.isJVMCIEnabled(vm): |
285 args.append('-XX:-Inline') | 285 args.append('-XX:-Inline') |
286 else: | 286 else: |
287 args.append('-G:CompileTheWordConfig=-Inline') | 287 args.append('-G:CompileTheWordConfig=-Inline') |
288 | 288 |
289 return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False) | 289 return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False) |
378 parser.addMatcher(ValuesMatcher(failureRE, {'failed' : '1'})) | 378 parser.addMatcher(ValuesMatcher(failureRE, {'failed' : '1'})) |
379 for scoreMatcher in self.scoreMatchers: | 379 for scoreMatcher in self.scoreMatchers: |
380 parser.addMatcher(scoreMatcher) | 380 parser.addMatcher(scoreMatcher) |
381 | 381 |
382 if self.benchmarkCompilationRate: | 382 if self.benchmarkCompilationRate: |
383 if vm == 'graal': | 383 if vm == 'jvmci': |
384 bps = re.compile(r"ParsedBytecodesPerSecond@final: (?P<rate>[0-9]+)") | 384 bps = re.compile(r"ParsedBytecodesPerSecond@final: (?P<rate>[0-9]+)") |
385 ibps = re.compile(r"InlinedBytecodesPerSecond@final: (?P<rate>[0-9]+)") | 385 ibps = re.compile(r"InlinedBytecodesPerSecond@final: (?P<rate>[0-9]+)") |
386 parser.addMatcher(ValuesMatcher(bps, {'group' : 'ParsedBytecodesPerSecond', 'name' : self.name, 'score' : '<rate>'})) | 386 parser.addMatcher(ValuesMatcher(bps, {'group' : 'ParsedBytecodesPerSecond', 'name' : self.name, 'score' : '<rate>'})) |
387 parser.addMatcher(ValuesMatcher(ibps, {'group' : 'InlinedBytecodesPerSecond', 'name' : self.name, 'score' : '<rate>'})) | 387 parser.addMatcher(ValuesMatcher(ibps, {'group' : 'InlinedBytecodesPerSecond', 'name' : self.name, 'score' : '<rate>'})) |
388 else: | 388 else: |