Mercurial > hg > graal-compiler
changeset 22863:f6e1108b9a94
moved Graal compiler options from JVMCI to GraalCompilerOptions
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 21 Oct 2015 23:56:19 +0200 |
| parents | 9d9c7d4ed220 |
| children | 4fb65c8712dd |
| files | graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompilerOptions.java graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java mx.graal/suite.py |
| diffstat | 7 files changed, 29 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Oct 21 14:11:00 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Oct 21 23:56:19 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.compiler.test; import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintCompilation; import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; import static jdk.vm.ci.code.CodeUtil.getCallingConvention; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintCompilation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompilerOptions.java Wed Oct 21 14:11:00 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompilerOptions.java Wed Oct 21 23:56:19 2015 +0200 @@ -28,15 +28,26 @@ /** * Options related to {@link GraalCompiler}. - * - * Note: This must be a top level class to work around for <a - * href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=477597">Eclipse bug 477597</a>. */ -class GraalCompilerOptions { +public class GraalCompilerOptions { // @formatter:off @Option(help = "Repeatedly run the LIR code generation pass to improve statistical profiling results.", type = OptionType.Debug) public static final OptionValue<Integer> EmitLIRRepeatCount = new OptionValue<>(0); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<String> PrintFilter = new OptionValue<>(null); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> PrintCompilation = new OptionValue<>(false); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> PrintAfterCompilation = new OptionValue<>(false); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> PrintBailout = new OptionValue<>(false); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> ExitVMOnBailout = new OptionValue<>(false); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> ExitVMOnException = new OptionValue<>(false); + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> PrintStackTraceOnException = new OptionValue<>(false); // @formatter:on }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java Wed Oct 21 14:11:00 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java Wed Oct 21 23:56:19 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.test; -import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnException; +import static com.oracle.graal.compiler.GraalCompilerOptions.ExitVMOnException; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Oct 21 14:11:00 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Oct 21 23:56:19 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot; -import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnBailout; -import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnException; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintAfterCompilation; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintBailout; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintCompilation; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintFilter; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintStackTraceOnException; +import static com.oracle.graal.compiler.GraalCompilerOptions.ExitVMOnBailout; +import static com.oracle.graal.compiler.GraalCompilerOptions.ExitVMOnException; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintAfterCompilation; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintBailout; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintCompilation; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintFilter; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintStackTraceOnException; import java.lang.reflect.Field; import java.util.concurrent.TimeUnit;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Oct 21 14:11:00 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Oct 21 23:56:19 2015 +0200 @@ -22,6 +22,9 @@ */ package com.oracle.graal.hotspot; +import static com.oracle.graal.compiler.GraalCompilerOptions.ExitVMOnException; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintBailout; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintStackTraceOnException; import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldClasspath; import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldConfig; import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldExcludeMethodFilter; @@ -30,9 +33,6 @@ import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldStopAt; import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldVerbose; import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; -import static jdk.vm.ci.runtime.JVMCICompiler.ExitVMOnException; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintBailout; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintStackTraceOnException; import java.io.Closeable; import java.io.File;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java Wed Oct 21 14:11:00 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java Wed Oct 21 23:56:19 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.debug; -import static jdk.vm.ci.runtime.JVMCICompiler.PrintBailout; +import static com.oracle.graal.compiler.GraalCompilerOptions.PrintBailout; import java.util.LinkedHashMap; import java.util.Map;
--- a/mx.graal/suite.py Wed Oct 21 14:11:00 2015 -0700 +++ b/mx.graal/suite.py Wed Oct 21 23:56:19 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "ea58bbafd5b9672e004f4d987d6f2400e57fccac", + "version" : "1ecbf6cc9ab0c1dd8c2a9740591cd59c3bac2e0c", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},