Mercurial > hg > truffle
changeset 7658:e8a15d1f7571
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Fri, 01 Feb 2013 19:47:05 +0100 |
| parents | a103e28ce09a (current diff) 01aeaf194641 (diff) |
| children | 5a63675be8ca |
| files | |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java Fri Feb 01 19:46:52 2013 +0100 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java Fri Feb 01 19:47:05 2013 +0100 @@ -520,14 +520,14 @@ } if (info.getBranchTakenProbability(i) != -1) { - buf.append(String.format("branchProbability@%d: %.3f%s", i, info.getBranchTakenProbability(i), sep)); + buf.append(String.format("branchProbability@%d: %.6f%s", i, info.getBranchTakenProbability(i), sep)); } double[] switchProbabilities = info.getSwitchProbabilities(i); if (switchProbabilities != null) { buf.append(String.format("switchProbabilities@%d:", i)); for (int j = 0; j < switchProbabilities.length; j++) { - buf.append(String.format(" %.3f", switchProbabilities[j])); + buf.append(String.format(" %.6f", switchProbabilities[j])); } buf.append(sep); } @@ -543,9 +543,13 @@ buf.append(String.format("types@%d:", i)); for (int j = 0; j < ptypes.length; j++) { ProfiledType ptype = ptypes[j]; - buf.append(String.format(" %.3f (%s)%s", ptype.getProbability(), ptype.getType(), sep)); + buf.append(String.format(" %.6f (%s)%s", ptype.getProbability(), ptype.getType(), sep)); } - buf.append(String.format(" %.3f <not recorded>%s", typeProfile.getNotRecordedProbability(), sep)); + if (typeProfile.getNotRecordedProbability() != 0) { + buf.append(String.format(" %.6f <other types>%s", typeProfile.getNotRecordedProbability(), sep)); + } else { + buf.append(String.format(" <no other types>%s", sep)); + } } } }
--- a/mx/sanitycheck.py Fri Feb 01 19:46:52 2013 +0100 +++ b/mx/sanitycheck.py Fri Feb 01 19:47:05 2013 +0100 @@ -119,7 +119,7 @@ success = re.compile(r"org.spec.jbb.controller: Run finished", re.MULTILINE) matcherMax = ValuesMatcher(jops, {'group' : 'SPECjbb2013', 'name' : 'max', 'score' : '<max>'}) matcherCritical = ValuesMatcher(jops, {'group' : 'SPECjbb2013', 'name' : 'critical', 'score' : '<critical>'}) - return Test("SPECjbb2013", ['-jar', 'specjbb2013.jar', '-m', 'composite'] + benchArgs, [success], [], [matcherCritical, matcherMax], vmOpts=['-Xms7g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-XX:CompileCommand=exclude,*.FastMath::slowLog'], defaultCwd=specjbb2013) + return Test("SPECjbb2013", ['-jar', 'specjbb2013.jar', '-m', 'composite'] + benchArgs, [success], [], [matcherCritical, matcherMax], vmOpts=['-Xms7g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops'], defaultCwd=specjbb2013) def getSPECjvm2008(benchArgs = [], skipCheck=False, skipKitValidation=False, warmupTime=None, iterationTime=None): @@ -239,6 +239,8 @@ self.defaultCwd = defaultCwd self.ignoredVMs = ignoredVMs self.benchmarkCompilationRate = benchmarkCompilationRate + if benchmarkCompilationRate: + self.vmOpts = self.vmOpts + ['-XX:+CITime'] def __str__(self): return self.name @@ -303,7 +305,6 @@ parser.addMatcher(scoreMatcher) if self.benchmarkCompilationRate: - opts.append('-XX:+CITime') if vm == 'graal': bps = re.compile(r"ParsedBytecodesPerSecond@final: (?P<rate>[0-9]+)") ibps = re.compile(r"InlinedBytecodesPerSecond@final: (?P<rate>[0-9]+)")