Mercurial > hg > truffle
changeset 9914:84890660eefb
cleaner implementation of stable options
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Jun 06 17:29:08 2013 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.compiler; -import static com.oracle.graal.options.OptionValue.*; import static com.oracle.graal.phases.GraalOptions.*; import java.util.*; @@ -58,9 +57,9 @@ // @formatter:off @Option(help = "") - public static final OptionValue<Boolean> VerifyUsageWithEquals = newOption(true); + public static final OptionValue<Boolean> VerifyUsageWithEquals = new OptionValue<>(true); @Option(help = "Enable inlining") - public static final OptionValue<Boolean> Inline = newOption(true); + public static final OptionValue<Boolean> Inline = new OptionValue<>(true); // @formatter:on /**
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugConfig.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugConfig.java Thu Jun 06 17:29:08 2013 +0200 @@ -22,8 +22,6 @@ */ package com.oracle.graal.compiler; -import static com.oracle.graal.options.OptionValue.*; - import java.io.*; import java.util.*; @@ -39,27 +37,27 @@ // @formatter:off @Option(help = "Enable scope-based debugging", name = "Debug") - public static final OptionValue<Boolean> DebugEnabled = newOption(true); + public static final OptionValue<Boolean> DebugEnabled = new OptionValue<>(true); @Option(help = "Scopes to be dumped") - public static final OptionValue<String> Dump = OptionValue.newOption(null); + public static final OptionValue<String> Dump = new OptionValue<>(null); @Option(help = "Scopes to be metered") - public static final OptionValue<String> Meter = OptionValue.newOption(null); + public static final OptionValue<String> Meter = new OptionValue<>(null); @Option(help = "Scopes to be timed") - public static final OptionValue<String> Time = OptionValue.newOption(null); + public static final OptionValue<String> Time = new OptionValue<>(null); @Option(help = "Scopes to be logged") - public static final OptionValue<String> Log = OptionValue.newOption(null); + public static final OptionValue<String> Log = new OptionValue<>(null); @Option(help = "Filters debug scope output by method name/pattern") - public static final OptionValue<String> MethodFilter = OptionValue.newOption(null); + public static final OptionValue<String> MethodFilter = new OptionValue<>(null); @Option(help = "") - public static final OptionValue<Boolean> PerThreadDebugValues = newOption(false); + public static final OptionValue<Boolean> PerThreadDebugValues = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> SummarizeDebugValues = newOption(false); + public static final OptionValue<Boolean> SummarizeDebugValues = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> SummarizePerPhase = newOption(false); + public static final OptionValue<Boolean> SummarizePerPhase = new OptionValue<>(false); @Option(help = "Send Graal IR to dump handlers on error") - public static final OptionValue<Boolean> DumpOnError = newOption(false); + public static final OptionValue<Boolean> DumpOnError = new OptionValue<>(false); @Option(help = "Enable expensive assertions") - public static final OptionValue<Boolean> DetailedAsserts = new OptionValue<Boolean>(true) { + public static final OptionValue<Boolean> DetailedAsserts = new StableOptionValue<Boolean>() { @Override protected Boolean initialValue() { boolean enabled = false;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Jun 06 17:29:08 2013 +0200 @@ -24,7 +24,6 @@ import static com.oracle.graal.api.code.CodeUtil.*; import static com.oracle.graal.nodes.StructuredGraph.*; -import static com.oracle.graal.options.OptionValue.*; import static com.oracle.graal.phases.GraalOptions.*; import java.lang.reflect.*; @@ -47,7 +46,7 @@ //@formatter:off @Option(help = "") - public static final OptionValue<Integer> SlowQueueCutoff = newOption(100000); + public static final OptionValue<Integer> SlowQueueCutoff = new OptionValue<>(100000); //@formatter:on public static final ThreadLocal<Boolean> withinEnqueue = new ThreadLocal<Boolean>() {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Jun 06 17:29:08 2013 +0200 @@ -23,7 +23,6 @@ package com.oracle.graal.hotspot; import static com.oracle.graal.graph.UnsafeAccess.*; -//import static com.oracle.graal.phases.GraalOptions.*; import java.lang.reflect.*; import java.util.*; @@ -39,6 +38,8 @@ import com.oracle.graal.options.*; import com.oracle.graal.phases.*; +//import static com.oracle.graal.phases.GraalOptions.*; + /** * Singleton class holding the instance of the {@link GraalRuntime}. * @@ -88,7 +89,7 @@ // @formatter:off @Option(help = "The runtime configuration to use") - private static final OptionValue<String> GraalRuntime = OptionValue.newOption("basic"); + private static final OptionValue<String> GraalRuntime = new OptionValue<>("basic"); // @formatter:on protected static HotSpotGraalRuntimeFactory findFactory(String architecture) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Jun 06 17:29:08 2013 +0200 @@ -28,7 +28,6 @@ import static com.oracle.graal.hotspot.CompilationTask.*; import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; import static com.oracle.graal.java.GraphBuilderPhase.*; -import static com.oracle.graal.options.OptionValue.*; import static com.oracle.graal.phases.GraalOptions.*; import java.io.*; @@ -63,22 +62,22 @@ //@formatter:off @Option(help = "File to which compiler logging is sent") - private static final OptionValue<String> LogFile = OptionValue.newOption(null); + private static final OptionValue<String> LogFile = new OptionValue<>(null); @Option(help = "Use low priority compilation threads") - private static final OptionValue<Boolean> SlowCompileThreads = newOption(false); + private static final OptionValue<Boolean> SlowCompileThreads = new OptionValue<>(false); @Option(help = "Use priority-based compilation queue") - private static final OptionValue<Boolean> PriorityCompileQueue = OptionValue.newOption(true); + private static final OptionValue<Boolean> PriorityCompileQueue = new OptionValue<>(true); @Option(help = "Print compilation queue activity periodically") - private static final OptionValue<Boolean> PrintQueue = OptionValue.newOption(false); + private static final OptionValue<Boolean> PrintQueue = new OptionValue<>(false); @Option(help = "Time limit in milliseconds for bootstrap (-1 for no limit)") - private static final OptionValue<Integer> TimedBootstrap = OptionValue.newOption(-1); + private static final OptionValue<Integer> TimedBootstrap = new OptionValue<>(-1); @Option(help = "Number of compilation threads to use") - private static final OptionValue<Integer> Threads = new OptionValue<Integer>(true) { + private static final StableOptionValue<Integer> Threads = new StableOptionValue<Integer>() { @Override public Integer initialValue() { @@ -87,10 +86,10 @@ }; @Option(help = "") - private static final OptionValue<Boolean> GenericDynamicCounters = newOption(false); + private static final OptionValue<Boolean> GenericDynamicCounters = new OptionValue<>(false); @Option(help = "") - private static final OptionValue<String> BenchmarkDynamicCounters = OptionValue.newOption(null); + private static final OptionValue<String> BenchmarkDynamicCounters = new OptionValue<>(null); //@formatter:on private final HotSpotGraalRuntime graalRuntime;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java Thu Jun 06 17:29:08 2013 +0200 @@ -103,11 +103,9 @@ } } else { Class<?> clazz = object.getClass(); - if (OptionValue.class.isAssignableFrom(clazz)) { - OptionValue<?> option = (OptionValue<?>) object; - if (option.isStable()) { - return Constant.forObject(option.getValue()); - } + if (StableOptionValue.class.isAssignableFrom(clazz)) { + StableOptionValue<?> option = (StableOptionValue<?>) object; + return Constant.forObject(option.getValue()); } } }
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionValue.java Thu Jun 06 17:29:08 2013 +0200 @@ -38,47 +38,19 @@ */ protected T value; - private OptionValue(boolean stable, T value) { + public OptionValue(T value) { this.value = value; - this.stable = stable; - } - - /** - * Used to assert the invariant for {@link #isStable()} options. Without using locks, this check - * is not safe against races and so it's only an assertion. - */ - private boolean getValueCalled; - - /** - * Creates a {@link #isStable() non-stable} option value. - * - * @param value the initial/default value of the option - */ - public static <T> OptionValue<T> newOption(T value) { - return new OptionValue<>(false, value); - } - - /** - * Creates a {@link #isStable() stable} option value. - * - * @param value the initial/default value of the option - */ - public static <T> OptionValue<T> newStableOption(T value) { - return new OptionValue<>(true, value); } private static final Object UNINITIALIZED = "UNINITIALIZED"; - private final boolean stable; - /** * Creates an uninitialized option value for a subclass that initializes itself * {@link #initialValue() lazily}. */ @SuppressWarnings("unchecked") - protected OptionValue(boolean stable) { + protected OptionValue() { this.value = (T) UNINITIALIZED; - this.stable = stable; } /** @@ -91,33 +63,18 @@ /** * Gets the value of this option. */ - public final T getValue() { + public T getValue() { if (value == UNINITIALIZED) { value = initialValue(); } - assert initGetValueCalled(); return value; } - private boolean initGetValueCalled() { - getValueCalled = true; - return true; - } - /** - * Determines if this option always returns the same {@linkplain #getValue() value}. - */ - public boolean isStable() { - return stable; - } - - /** - * Sets the value of this option. This can only be called for a {@linkplain #isStable() stable} - * option if {@link #getValue()} has never been called. + * Sets the value of this option. */ @SuppressWarnings("unchecked") - public final void setValue(Object v) { - assert !getValueCalled || !stable; + public void setValue(Object v) { this.value = (T) v; } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/StableOptionValue.java Thu Jun 06 17:29:08 2013 +0200 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.options; + +/** + * A settable option that always returns the same {@linkplain #getValue() value}. + */ +public class StableOptionValue<T> extends OptionValue<T> { + + /** + * Creates a stable option value. + */ + public StableOptionValue(T value) { + super(value); + } + + /** + * Used to assert the invariant for stability. Without using locks, this check is not safe + * against races and so it's only an assertion. + */ + private boolean getValueCalled; + + /** + * Creates an uninitialized stable option value for a subclass that initializes itself + * {@link #initialValue() lazily}. + */ + public StableOptionValue() { + } + + /** + * Gets the value of this option. + */ + @Override + public final T getValue() { + T result = super.getValue(); + assert initGetValueCalled(); + return result; + } + + private boolean initGetValueCalled() { + getValueCalled = true; + return true; + } + + /** + * {@inheritDoc} + * <p> + * This must only be called if {@link #getValue()} has never been called. + */ + @Override + public final void setValue(Object v) { + assert !getValueCalled; + super.setValue(v); + } +}
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Thu Jun 06 17:29:08 2013 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.options.OptionValue.*; import static com.oracle.graal.phases.GraalOptions.*; import java.util.*; @@ -49,7 +48,7 @@ // @formatter:off @Option(help = "Unconditionally inline intrinsics") - public static final OptionValue<Boolean> AlwaysInlineIntrinsics = newOption(false); + public static final OptionValue<Boolean> AlwaysInlineIntrinsics = new OptionValue<>(false); // @formatter:on private final PhasePlan plan;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java Thu Jun 06 17:29:08 2013 +0200 @@ -22,8 +22,6 @@ */ package com.oracle.graal.phases; -import static com.oracle.graal.options.OptionValue.*; - import com.oracle.graal.options.*; /** @@ -33,303 +31,303 @@ public final class GraalOptions { @Option(help = "Enable use of compiler intrinsics") - public static final OptionValue<Boolean> Intrinsify = newOption(true); + public static final OptionValue<Boolean> Intrinsify = new OptionValue<>(true); @Option(help = "Enable inlining of monomorphic calls") - static final OptionValue<Boolean> InlineMonomorphicCalls = newOption(true); + static final OptionValue<Boolean> InlineMonomorphicCalls = new OptionValue<>(true); @Option(help = "Enable inlining of polymorphic calls") - static final OptionValue<Boolean> InlinePolymorphicCalls = newOption(true); + static final OptionValue<Boolean> InlinePolymorphicCalls = new OptionValue<>(true); @Option(help = "Enable inlining of megamorphic calls") - static final OptionValue<Boolean> InlineMegamorphicCalls = newOption(true); + static final OptionValue<Boolean> InlineMegamorphicCalls = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Double> MegamorphicInliningMinMethodProbability = newOption(0.33D); + public static final OptionValue<Double> MegamorphicInliningMinMethodProbability = new OptionValue<>(0.33D); @Option(help = "") - public static final OptionValue<Integer> MaximumDesiredSize = newOption(5000); + public static final OptionValue<Integer> MaximumDesiredSize = new OptionValue<>(5000); @Option(help = "") - public static final OptionValue<Integer> MaximumRecursiveInlining = newOption(1); + public static final OptionValue<Integer> MaximumRecursiveInlining = new OptionValue<>(1); // inlining settings @Option(help = "") - public static final OptionValue<Float> BoostInliningForEscapeAnalysis = newOption(2f); + public static final OptionValue<Float> BoostInliningForEscapeAnalysis = new OptionValue<>(2f); @Option(help = "") - public static final OptionValue<Float> RelevanceCapForInlining = newOption(1f); + public static final OptionValue<Float> RelevanceCapForInlining = new OptionValue<>(1f); @Option(help = "") - public static final OptionValue<Float> CapInheritedRelevance = newOption(1f); + public static final OptionValue<Float> CapInheritedRelevance = new OptionValue<>(1f); @Option(help = "") - public static final OptionValue<Boolean> IterativeInlining = newOption(false); + public static final OptionValue<Boolean> IterativeInlining = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Integer> TrivialInliningSize = newOption(10); + public static final OptionValue<Integer> TrivialInliningSize = new OptionValue<>(10); @Option(help = "") - public static final OptionValue<Integer> MaximumInliningSize = newOption(300); + public static final OptionValue<Integer> MaximumInliningSize = new OptionValue<>(300); @Option(help = "") - public static final OptionValue<Integer> SmallCompiledLowLevelGraphSize = newOption(300); + public static final OptionValue<Integer> SmallCompiledLowLevelGraphSize = new OptionValue<>(300); @Option(help = "") - public static final OptionValue<Double> LimitInlinedInvokes = newOption(5.0); + public static final OptionValue<Double> LimitInlinedInvokes = new OptionValue<>(5.0); // escape analysis settings @Option(help = "") - public static final OptionValue<Boolean> PartialEscapeAnalysis = newOption(true); + public static final OptionValue<Boolean> PartialEscapeAnalysis = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> EscapeAnalysisHistogram = newOption(false); + public static final OptionValue<Boolean> EscapeAnalysisHistogram = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Integer> EscapeAnalysisIterations = newOption(2); + public static final OptionValue<Integer> EscapeAnalysisIterations = new OptionValue<>(2); @Option(help = "") - public static final OptionValue<String> EscapeAnalyzeOnly = OptionValue.newOption(null); + public static final OptionValue<String> EscapeAnalyzeOnly = new OptionValue<>(null); @Option(help = "") - public static final OptionValue<Integer> MaximumEscapeAnalysisArrayLength = newOption(32); + public static final OptionValue<Integer> MaximumEscapeAnalysisArrayLength = new OptionValue<>(32); @Option(help = "") - public static final OptionValue<Boolean> PEAInliningHints = newOption(false); + public static final OptionValue<Boolean> PEAInliningHints = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Double> TailDuplicationProbability = newOption(0.5); + public static final OptionValue<Double> TailDuplicationProbability = new OptionValue<>(0.5); @Option(help = "") - public static final OptionValue<Integer> TailDuplicationTrivialSize = newOption(1); + public static final OptionValue<Integer> TailDuplicationTrivialSize = new OptionValue<>(1); // profiling information @Option(help = "") - public static final OptionValue<Integer> DeoptsToDisableOptimisticOptimization = newOption(40); + public static final OptionValue<Integer> DeoptsToDisableOptimisticOptimization = new OptionValue<>(40); @Option(help = "") - public static final OptionValue<Integer> MatureExecutionsBranch = newOption(1); + public static final OptionValue<Integer> MatureExecutionsBranch = new OptionValue<>(1); @Option(help = "") - public static final OptionValue<Integer> MatureExecutionsPerSwitchCase = newOption(1); + public static final OptionValue<Integer> MatureExecutionsPerSwitchCase = new OptionValue<>(1); @Option(help = "") - public static final OptionValue<Integer> MatureExecutionsTypeProfile = newOption(1); + public static final OptionValue<Integer> MatureExecutionsTypeProfile = new OptionValue<>(1); // comilation queue @Option(help = "") - public static final OptionValue<Boolean> DynamicCompilePriority = newOption(false); + public static final OptionValue<Boolean> DynamicCompilePriority = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<String> CompileTheWorld = OptionValue.newOption(null); + public static final OptionValue<String> CompileTheWorld = new OptionValue<>(null); @Option(help = "") - public static final OptionValue<Integer> CompileTheWorldStartAt = newOption(1); + public static final OptionValue<Integer> CompileTheWorldStartAt = new OptionValue<>(1); @Option(help = "") - public static final OptionValue<Integer> CompileTheWorldStopAt = newOption(Integer.MAX_VALUE); + public static final OptionValue<Integer> CompileTheWorldStopAt = new OptionValue<>(Integer.MAX_VALUE); // graph caching @Option(help = "") - public static final OptionValue<Boolean> CacheGraphs = newOption(true); + public static final OptionValue<Boolean> CacheGraphs = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Integer> GraphCacheSize = newOption(1000); + public static final OptionValue<Integer> GraphCacheSize = new OptionValue<>(1000); @Option(help = "") - public static final OptionValue<Boolean> PrintGraphCache = newOption(false); + public static final OptionValue<Boolean> PrintGraphCache = new OptionValue<>(false); //loop transform settings TODO (gd) tune @Option(help = "") - public static final OptionValue<Boolean> LoopPeeling = newOption(true); + public static final OptionValue<Boolean> LoopPeeling = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> ReassociateInvariants = newOption(true); + public static final OptionValue<Boolean> ReassociateInvariants = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> FullUnroll = newOption(true); + public static final OptionValue<Boolean> FullUnroll = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> LoopUnswitch = newOption(true); + public static final OptionValue<Boolean> LoopUnswitch = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Integer> FullUnrollMaxNodes = newOption(300); + public static final OptionValue<Integer> FullUnrollMaxNodes = new OptionValue<>(300); @Option(help = "") - public static final OptionValue<Integer> ExactFullUnrollMaxNodes = newOption(1200); + public static final OptionValue<Integer> ExactFullUnrollMaxNodes = new OptionValue<>(1200); @Option(help = "") - public static final OptionValue<Float> MinimumPeelProbability = newOption(0.35f); + public static final OptionValue<Float> MinimumPeelProbability = new OptionValue<>(0.35f); @Option(help = "") - public static final OptionValue<Integer> LoopMaxUnswitch = newOption(3); + public static final OptionValue<Integer> LoopMaxUnswitch = new OptionValue<>(3); @Option(help = "") - public static final OptionValue<Integer> LoopUnswitchMaxIncrease = newOption(50); + public static final OptionValue<Integer> LoopUnswitchMaxIncrease = new OptionValue<>(50); @Option(help = "") - public static final OptionValue<Integer> LoopUnswitchUncertaintyBoost = newOption(5); + public static final OptionValue<Integer> LoopUnswitchUncertaintyBoost = new OptionValue<>(5); @Option(help = "") - public static final OptionValue<Boolean> UseLoopLimitChecks = newOption(true); + public static final OptionValue<Boolean> UseLoopLimitChecks = new OptionValue<>(true); // debugging settings @Option(help = "") - public static final OptionValue<Boolean> ZapStackOnMethodEntry = newOption(false); + public static final OptionValue<Boolean> ZapStackOnMethodEntry = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> DeoptALot = newOption(false); + public static final OptionValue<Boolean> DeoptALot = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> VerifyPhases = newOption(false); + public static final OptionValue<Boolean> VerifyPhases = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<String> PrintFilter = OptionValue.newOption(null); + public static final OptionValue<String> PrintFilter = new OptionValue<>(null); // Debug settings: @Option(help = "") - public static final OptionValue<Boolean> BootstrapReplacements = newOption(false); + public static final OptionValue<Boolean> BootstrapReplacements = new OptionValue<>(false); // Ideal graph visualizer output settings @Option(help = "") - public static final OptionValue<Boolean> PrintBinaryGraphs = newOption(true); + public static final OptionValue<Boolean> PrintBinaryGraphs = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> PrintCFG = newOption(false); + public static final OptionValue<Boolean> PrintCFG = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> PrintIdealGraphFile = newOption(false); + public static final OptionValue<Boolean> PrintIdealGraphFile = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<String> PrintIdealGraphAddress = OptionValue.newOption("127.0.0.1"); + public static final OptionValue<String> PrintIdealGraphAddress = new OptionValue<>("127.0.0.1"); @Option(help = "") - public static final OptionValue<Integer> PrintIdealGraphPort = newOption(4444); + public static final OptionValue<Integer> PrintIdealGraphPort = new OptionValue<>(4444); @Option(help = "") - public static final OptionValue<Integer> PrintBinaryGraphPort = newOption(4445); + public static final OptionValue<Integer> PrintBinaryGraphPort = new OptionValue<>(4445); // Other printing settings @Option(help = "") - public static final OptionValue<Boolean> PrintCompilation = newOption(false); + public static final OptionValue<Boolean> PrintCompilation = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> PrintProfilingInformation = newOption(false); + public static final OptionValue<Boolean> PrintProfilingInformation = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> PrintIRWithLIR = newOption(false); + public static final OptionValue<Boolean> PrintIRWithLIR = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> PrintCodeBytes = newOption(false); + public static final OptionValue<Boolean> PrintCodeBytes = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> PrintBailout = newOption(false); + public static final OptionValue<Boolean> PrintBailout = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Integer> TraceLinearScanLevel = newOption(0); + public static final OptionValue<Integer> TraceLinearScanLevel = new OptionValue<>(0); @Option(help = "") - public static final OptionValue<Integer> TraceLIRGeneratorLevel = newOption(0); + public static final OptionValue<Integer> TraceLIRGeneratorLevel = new OptionValue<>(0); @Option(help = "") - public static final OptionValue<Boolean> TraceEscapeAnalysis = newOption(false); + public static final OptionValue<Boolean> TraceEscapeAnalysis = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Integer> TraceBytecodeParserLevel = newOption(0); + public static final OptionValue<Integer> TraceBytecodeParserLevel = new OptionValue<>(0); @Option(help = "") - public static final OptionValue<Boolean> ExitVMOnBailout = newOption(false); + public static final OptionValue<Boolean> ExitVMOnBailout = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> ExitVMOnException = newOption(true); + public static final OptionValue<Boolean> ExitVMOnException = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> PrintStackTraceOnException = newOption(false); + public static final OptionValue<Boolean> PrintStackTraceOnException = new OptionValue<>(false); // HotSpot command line options @Option(help = "") - public static final OptionValue<Boolean> HotSpotPrintCompilation = newOption(false); + public static final OptionValue<Boolean> HotSpotPrintCompilation = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> HotSpotPrintInlining = newOption(false); + public static final OptionValue<Boolean> HotSpotPrintInlining = new OptionValue<>(false); // Register allocator debugging @Option(help = "") - public static final OptionValue<String> RegisterPressure = OptionValue.newOption(null); + public static final OptionValue<String> RegisterPressure = new OptionValue<>(null); // Code generator settings @Option(help = "") - public static final OptionValue<Boolean> ConditionalElimination = newOption(true); + public static final OptionValue<Boolean> ConditionalElimination = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> CullFrameStates = newOption(false); + public static final OptionValue<Boolean> CullFrameStates = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> UseProfilingInformation = newOption(true); + public static final OptionValue<Boolean> UseProfilingInformation = new OptionValue<>(true); @Option(help = "") - static final OptionValue<Boolean> RemoveNeverExecutedCode = newOption(true); + static final OptionValue<Boolean> RemoveNeverExecutedCode = new OptionValue<>(true); @Option(help = "") - static final OptionValue<Boolean> UseExceptionProbability = newOption(true); + static final OptionValue<Boolean> UseExceptionProbability = new OptionValue<>(true); @Option(help = "") - static final OptionValue<Boolean> UseExceptionProbabilityForOperations = newOption(true); + static final OptionValue<Boolean> UseExceptionProbabilityForOperations = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OmitHotExceptionStacktrace = newOption(false); + public static final OptionValue<Boolean> OmitHotExceptionStacktrace = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> GenSafepoints = newOption(true); + public static final OptionValue<Boolean> GenSafepoints = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> GenLoopSafepoints = newOption(true); + public static final OptionValue<Boolean> GenLoopSafepoints = new OptionValue<>(true); @Option(help = "") - static final OptionValue<Boolean> UseTypeCheckHints = newOption(true); + static final OptionValue<Boolean> UseTypeCheckHints = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> InlineVTableStubs = newOption(true); + public static final OptionValue<Boolean> InlineVTableStubs = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> AlwaysInlineVTableStubs = newOption(false); + public static final OptionValue<Boolean> AlwaysInlineVTableStubs = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> GenAssertionCode = newOption(false); + public static final OptionValue<Boolean> GenAssertionCode = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> AlignCallsForPatching = newOption(true); + public static final OptionValue<Boolean> AlignCallsForPatching = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> ResolveClassBeforeStaticInvoke = newOption(false); + public static final OptionValue<Boolean> ResolveClassBeforeStaticInvoke = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> CanOmitFrame = newOption(true); + public static final OptionValue<Boolean> CanOmitFrame = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Integer> SafepointPollOffset = newOption(256); + public static final OptionValue<Integer> SafepointPollOffset = new OptionValue<>(256); @Option(help = "") - public static final OptionValue<Boolean> MemoryAwareScheduling = newOption(true); + public static final OptionValue<Boolean> MemoryAwareScheduling = new OptionValue<>(true); // Translating tableswitch instructions @Option(help = "") - public static final OptionValue<Integer> MinimumJumpTableSize = newOption(5); + public static final OptionValue<Integer> MinimumJumpTableSize = new OptionValue<>(5); @Option(help = "") - public static final OptionValue<Integer> RangeTestsSwitchDensity = newOption(5); + public static final OptionValue<Integer> RangeTestsSwitchDensity = new OptionValue<>(5); @Option(help = "") - public static final OptionValue<Double> MinTableSwitchDensity = newOption(0.5); + public static final OptionValue<Double> MinTableSwitchDensity = new OptionValue<>(0.5); // Runtime settings @Option(help = "") - public static final OptionValue<Integer> StackShadowPages = newOption(2); + public static final OptionValue<Integer> StackShadowPages = new OptionValue<>(2); @Option(help = "") - public static final OptionValue<Boolean> SupportJsrBytecodes = newOption(true); + public static final OptionValue<Boolean> SupportJsrBytecodes = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptAssumptions = newOption(true); + public static final OptionValue<Boolean> OptAssumptions = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptConvertDeoptsToGuards = newOption(true); + public static final OptionValue<Boolean> OptConvertDeoptsToGuards = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptReadElimination = newOption(true); + public static final OptionValue<Boolean> OptReadElimination = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptEarlyReadElimination = newOption(true); + public static final OptionValue<Boolean> OptEarlyReadElimination = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptCanonicalizer = newOption(true); + public static final OptionValue<Boolean> OptCanonicalizer = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptCanonicalizeReads = newOption(true); + public static final OptionValue<Boolean> OptCanonicalizeReads = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptScheduleOutOfLoops = newOption(true); + public static final OptionValue<Boolean> OptScheduleOutOfLoops = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptEliminateGuards = newOption(true); + public static final OptionValue<Boolean> OptEliminateGuards = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptEliminateSafepoints = newOption(true); + public static final OptionValue<Boolean> OptEliminateSafepoints = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptImplicitNullChecks = newOption(true); + public static final OptionValue<Boolean> OptImplicitNullChecks = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptLivenessAnalysis = newOption(true); + public static final OptionValue<Boolean> OptLivenessAnalysis = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptLoopTransform = newOption(true); + public static final OptionValue<Boolean> OptLoopTransform = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptFloatingReads = newOption(true); + public static final OptionValue<Boolean> OptFloatingReads = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptTailDuplication = newOption(true); + public static final OptionValue<Boolean> OptTailDuplication = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptEliminatePartiallyRedundantGuards = newOption(true); + public static final OptionValue<Boolean> OptEliminatePartiallyRedundantGuards = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptFilterProfiledTypes = newOption(true); + public static final OptionValue<Boolean> OptFilterProfiledTypes = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptDevirtualizeInvokesOptimistically = newOption(true); + public static final OptionValue<Boolean> OptDevirtualizeInvokesOptimistically = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> OptPushThroughPi = newOption(true); + public static final OptionValue<Boolean> OptPushThroughPi = new OptionValue<>(true); // Intrinsification settings @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyObjectClone = newOption(false); + public static final OptionValue<Boolean> IntrinsifyObjectClone = new OptionValue<>(false); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyArrayCopy = newOption(true); + public static final OptionValue<Boolean> IntrinsifyArrayCopy = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyObjectMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyObjectMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifySystemMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifySystemMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyClassMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyClassMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyThreadMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyThreadMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyUnsafeMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyUnsafeMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyMathMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyMathMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyAESMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyAESMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyReflectionMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyReflectionMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyInstalledCodeMethods = newOption(true); + public static final OptionValue<Boolean> IntrinsifyInstalledCodeMethods = new OptionValue<>(true); @Option(help = "") - public static final OptionValue<Boolean> IntrinsifyCallSiteTarget = newOption(true); + public static final OptionValue<Boolean> IntrinsifyCallSiteTarget = new OptionValue<>(true); /** * Counts the various paths taken through snippets. */ @Option(help = "") - public static final OptionValue<Boolean> SnippetCounters = newOption(false); + public static final OptionValue<Boolean> SnippetCounters = new OptionValue<>(false); /** * If the probability that a checkcast will hit one the profiled types (up to {@link #CheckcastMaxHints}) * is below this value, the checkcast will be compiled without hints. */ @Option(help = "") - public static final OptionValue<Double> CheckcastMinHintHitProbability = newOption(0.5); + public static final OptionValue<Double> CheckcastMinHintHitProbability = new OptionValue<>(0.5); /** * The maximum number of hint types that will be used when compiling a checkcast for which @@ -337,17 +335,17 @@ * also influences whether hints are used. */ @Option(help = "") - public static final OptionValue<Integer> CheckcastMaxHints = newOption(2); + public static final OptionValue<Integer> CheckcastMaxHints = new OptionValue<>(2); /** * @see #CheckcastMinHintHitProbability */ @Option(help = "") - public static final OptionValue<Double> InstanceOfMinHintHitProbability = newOption(0.5); + public static final OptionValue<Double> InstanceOfMinHintHitProbability = new OptionValue<>(0.5); /** * @see #CheckcastMaxHints */ @Option(help = "") - public static final OptionValue<Integer> InstanceOfMaxHints = newOption(2); + public static final OptionValue<Integer> InstanceOfMaxHints = new OptionValue<>(2); }
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Thu Jun 06 17:27:07 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Thu Jun 06 17:29:08 2013 +0200 @@ -32,7 +32,7 @@ // @formatter:off @Option(help = "The compiler configuration to use") - private static final OptionValue<String> CompilerConfiguration = OptionValue.newOption("basic"); + private static final OptionValue<String> CompilerConfiguration = new OptionValue<>("basic"); // @formatter:on public static final Suites DEFAULT;