Mercurial > hg > graal-jvmci-8
diff mx/sanitycheck.py @ 12769:99769479f9ce
s/commands/mx_graal/ in mx/sanitycheck.py
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 15 Nov 2013 11:20:18 +0100 |
parents | b038b643a3a4 |
children | 4cd7c6629841 |
line wrap: on
line diff
--- a/mx/sanitycheck.py Thu Nov 14 23:29:19 2013 +0100 +++ b/mx/sanitycheck.py Fri Nov 15 11:20:18 2013 +0100 @@ -24,7 +24,7 @@ # ---------------------------------------------------------------------------------------------------- from outputparser import OutputParser, ValuesMatcher -import re, mx, commands, os, sys, StringIO, subprocess +import re, mx, mx_graal, os, sys, StringIO, subprocess from os.path import isfile, join, exists gc = 'UseSerialGC' @@ -280,12 +280,12 @@ if vm == 'graal': args += ['-XX:+BootstrapGraal'] if mode >= CTWMode.NoInline: - if not commands.isGraalEnabled(vm): + if not mx_graal.isGraalEnabled(vm): args.append('-XX:-Inline') else: args.append('-G:-Inline') if mode >= CTWMode.NoComplex: - if commands.isGraalEnabled(vm): + if mx_graal.isGraalEnabled(vm): args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling', '-G:-NewMemoryAwareScheduling', '-G:-PartialEscapeAnalysis'] return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False) @@ -337,7 +337,7 @@ parser.addMatcher(ValuesMatcher(failureRE, {'failed' : '1'})) tee = Tee() - retcode = commands.vm(self.vmOpts + _noneAsEmptyList(extraVmOpts) + self.cmd, vm, nonZeroIsFatal=False, out=tee.eat, err=subprocess.STDOUT, cwd=cwd, vmbuild=vmbuild) + retcode = mx_graal.vm(self.vmOpts + _noneAsEmptyList(extraVmOpts) + self.cmd, vm, nonZeroIsFatal=False, out=tee.eat, err=subprocess.STDOUT, cwd=cwd, vmbuild=vmbuild) output = tee.output.getvalue() valueMaps = parser.parse(output) @@ -410,7 +410,7 @@ else: tee = Tee() mx.log(startDelim) - if commands.vm(self.vmOpts + _noneAsEmptyList(extraVmOpts) + self.cmd, vm, nonZeroIsFatal=False, out=tee.eat, err=subprocess.STDOUT, cwd=cwd, vmbuild=vmbuild) != 0: + if mx_graal.vm(self.vmOpts + _noneAsEmptyList(extraVmOpts) + self.cmd, vm, nonZeroIsFatal=False, out=tee.eat, err=subprocess.STDOUT, cwd=cwd, vmbuild=vmbuild) != 0: mx.abort("Benchmark failed (non-zero retcode)") mx.log(endDelim) output = tee.output.getvalue()