Mercurial > hg > truffle
changeset 19808:73dddd2d8710
moved bytecode paring options to AbstractBytecodeParser.Options
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 12 Mar 2015 14:11:03 +0100 |
parents | ad32fd810c83 |
children | 35f3381375de |
files | graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java |
diffstat | 3 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Thu Mar 12 12:45:04 2015 +0100 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Thu Mar 12 14:11:03 2015 +0100 @@ -134,9 +134,6 @@ @Option(help = "", type = OptionType.Debug) public static final OptionValue<String> PrintFilter = new OptionValue<>(null); - @Option(help = "", type = OptionType.Debug) - public static final StableOptionValue<Boolean> DumpDuringGraphBuilding = new StableOptionValue<>(false); - // Debug settings: @Option(help = "", type = OptionType.Debug) public static final OptionValue<Boolean> BootstrapReplacements = new OptionValue<>(false); @@ -324,13 +321,6 @@ @Option(help = "Mark well-known stable fields as such.", type = OptionType.Debug) public static final OptionValue<Boolean> ImplicitStableValues = new OptionValue<>(true); - - @Option(help = "Max number of loop explosions per method.", type = OptionType.Debug) - public static final OptionValue<Integer> MaximumLoopExplosionCount = new OptionValue<>(10000); - - @Option(help = "Do not bail out but throw an exception on failed loop explosion.", type = OptionType.Debug) - public static final OptionValue<Boolean> FailedLoopExplosionIsFatal = new OptionValue<>(false); - /** * Counts the various paths taken through snippets. */
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java Thu Mar 12 12:45:04 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java Thu Mar 12 14:11:03 2015 +0100 @@ -27,6 +27,7 @@ import static com.oracle.graal.api.meta.DeoptimizationReason.*; import static com.oracle.graal.bytecode.Bytecodes.*; import static com.oracle.graal.java.AbstractBytecodeParser.Options.*; + import java.util.*; import com.oracle.graal.api.code.*; @@ -51,18 +52,27 @@ @Option(help = "The trace level for the bytecode parser used when building a graph from bytecode", type = OptionType.Debug) public static final OptionValue<Integer> TraceBytecodeParserLevel = new OptionValue<>(0); - @Option(help = "Inlines trivial methods during parsing of the bytecodes.", type = OptionType.Expert) + @Option(help = "Inlines trivial methods during bytecode parsing.", type = OptionType.Expert) public static final StableOptionValue<Boolean> InlineDuringParsing = new StableOptionValue<>(false); - @Option(help = "Traces inlining eagerly performed during bytecode parsing", type = OptionType.Debug) + @Option(help = "Traces inlining performed during bytecode parsing.", type = OptionType.Debug) public static final StableOptionValue<Boolean> TraceInlineDuringParsing = new StableOptionValue<>(false); - @Option(help = "Traces use of bytecode parser plugins", type = OptionType.Debug) + @Option(help = "Traces use of plugins during bytecode parsing.", type = OptionType.Debug) public static final StableOptionValue<Boolean> TraceParserPlugins = new StableOptionValue<>(false); - @Option(help = "Maximum depth when inlining during parsing.", type = OptionType.Debug) + @Option(help = "Maximum depth when inlining during bytecode parsing.", type = OptionType.Debug) public static final StableOptionValue<Integer> InlineDuringParsingMaxDepth = new StableOptionValue<>(10); + @Option(help = "Dump graphs after non-trivial changes during bytecode parsing.", type = OptionType.Debug) + public static final StableOptionValue<Boolean> DumpDuringGraphBuilding = new StableOptionValue<>(false); + + @Option(help = "Max number of loop explosions per method.", type = OptionType.Debug) + public static final OptionValue<Integer> MaximumLoopExplosionCount = new OptionValue<>(10000); + + @Option(help = "Do not bail out but throw an exception on failed loop explosion.", type = OptionType.Debug) + public static final OptionValue<Boolean> FailedLoopExplosionIsFatal = new OptionValue<>(false); + // @formatter:on }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 12 12:45:04 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 12 14:11:03 2015 +0100 @@ -461,7 +461,7 @@ for (int i = loopBegins.size() - 1; i >= 0; --i) { LoopBeginNode loopBegin = loopBegins.get(i); insertLoopExits(loopBegin, innerLoopsMap); - if (GraalOptions.DumpDuringGraphBuilding.getValue()) { + if (DumpDuringGraphBuilding.getValue()) { Debug.dump(currentGraph, "After building loop exits for %s.", loopBegin); } } @@ -527,7 +527,7 @@ for (LoopBeginNode inner : innerLoopBegins) { addLoopExits(loopBegin, inner, innerLoopsMap, visited); - if (GraalOptions.DumpDuringGraphBuilding.getValue()) { + if (DumpDuringGraphBuilding.getValue()) { Debug.dump(currentGraph, "After adding loop exits for %s.", inner); } }