Mercurial > hg > truffle
diff mx/sanitycheck.py @ 21578:a880844225e4
Merge with f41409c6ff26923655747d1a36ac51892b1153ac
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Thu, 28 May 2015 21:11:28 -0700 |
parents | be896a1983c0 |
children |
line wrap: on
line diff
--- a/mx/sanitycheck.py Thu May 28 15:10:18 2015 -0700 +++ b/mx/sanitycheck.py Thu May 28 21:11:28 2015 -0700 @@ -278,10 +278,10 @@ args = ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + rtjar] - if vm == 'graal': + if vm == 'jvmci': args += ['-XX:+BootstrapGraal'] if mode >= CTWMode.NoInline: - if not mx_graal.isGraalEnabled(vm): + if not mx_graal.isJVMCIEnabled(vm): args.append('-XX:-Inline') else: args.append('-G:CompileTheWordConfig=-Inline') @@ -380,7 +380,7 @@ parser.addMatcher(scoreMatcher) if self.benchmarkCompilationRate: - if vm == 'graal': + if vm == 'jvmci': bps = re.compile(r"ParsedBytecodesPerSecond@final: (?P<rate>[0-9]+)") ibps = re.compile(r"InlinedBytecodesPerSecond@final: (?P<rate>[0-9]+)") parser.addMatcher(ValuesMatcher(bps, {'group' : 'ParsedBytecodesPerSecond', 'name' : self.name, 'score' : '<rate>'}))