Mercurial > hg > graal-compiler
changeset 23074:6bbdf92109e6
PartialEscapeBench: extend GraalBenchmark.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Tue, 24 Nov 2015 15:24:20 +0100 |
parents | d6a2b901dced |
children | a741fb43974b |
files | graal/com.oracle.graal.virtual.bench/src/com/oracle/graal/virtual/bench/PartialEscapeBench.java mx.graal/mx_graal_8.py mx.graal/mx_graal_9.py mx.graal/suite.py |
diffstat | 4 files changed, 4 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.virtual.bench/src/com/oracle/graal/virtual/bench/PartialEscapeBench.java Tue Nov 24 15:15:53 2015 +0100 +++ b/graal/com.oracle.graal.virtual.bench/src/com/oracle/graal/virtual/bench/PartialEscapeBench.java Tue Nov 24 15:24:20 2015 +0100 @@ -27,7 +27,9 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; -public class PartialEscapeBench { +import com.oracle.graal.microbenchmarks.graal.GraalBenchmark; + +public class PartialEscapeBench extends GraalBenchmark { private static class Thing { final int id;
--- a/mx.graal/mx_graal_8.py Tue Nov 24 15:15:53 2015 +0100 +++ b/mx.graal/mx_graal_8.py Tue Nov 24 15:24:20 2015 +0100 @@ -113,12 +113,10 @@ vmArgs = ['-XX:-UseJVMCIClassLoader'] + vmArgs # look for -f in JMH arguments - containsF = False forking = True for i in range(len(jmhArgs)): arg = jmhArgs[i] if arg.startswith('-f'): - containsF = True if arg == '-f' and (i+1) < len(jmhArgs): arg += jmhArgs[i+1] try: @@ -133,10 +131,6 @@ if not forking: args += vmArgs else: - # default to -f1 if not specified otherwise - if not containsF: - jmhArgs += ['-f1'] - # find all projects with a direct JMH dependency jmhProjects = [] for p in mx.projects_opt_limit_to_suites():
--- a/mx.graal/mx_graal_9.py Tue Nov 24 15:15:53 2015 +0100 +++ b/mx.graal/mx_graal_9.py Tue Nov 24 15:24:20 2015 +0100 @@ -127,12 +127,10 @@ vmArgs, jmhArgs = mx.extract_VM_args(args, useDoubleDash=True) # look for -f in JMH arguments - containsF = False forking = True for i in range(len(jmhArgs)): arg = jmhArgs[i] if arg.startswith('-f'): - containsF = True if arg == '-f' and (i+1) < len(jmhArgs): arg += jmhArgs[i+1] try: @@ -147,10 +145,6 @@ if not forking: args += vmArgs else: - # default to -f1 if not specified otherwise - if not containsF: - jmhArgs += ['-f1'] - # find all projects with a direct JMH dependency jmhProjects = [] for p in mx.projects_opt_limit_to_suites():
--- a/mx.graal/suite.py Tue Nov 24 15:15:53 2015 +0100 +++ b/mx.graal/suite.py Tue Nov 24 15:24:20 2015 +0100 @@ -639,7 +639,7 @@ "com.oracle.graal.virtual.bench" : { "subDir" : "graal", "sourceDirs" : ["src"], - "dependencies" : ["JMH"], + "dependencies" : ["JMH", "com.oracle.graal.microbenchmarks"], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", "annotationProcessors" : ["JMH"],