# HG changeset patch # User Thomas Wuerthinger # Date 1305818455 -7200 # Node ID a2f62de90c76644409ddb3f6713b9813318cfb33 # Parent 108adba3345e92b590fdbc0eb0f2f948bc66d96e Removed unused optimization settings. Removed unused imports. diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java --- a/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java Thu May 19 17:20:55 2011 +0200 @@ -25,14 +25,13 @@ import java.util.*; +import com.oracle.graal.graph.*; import com.oracle.max.asm.*; -import com.oracle.graal.graph.*; import com.sun.c1x.alloc.*; import com.sun.c1x.asm.*; import com.sun.c1x.gen.*; -import com.sun.c1x.gen.LIRGenerator.DeoptimizationStub; +import com.sun.c1x.gen.LIRGenerator.*; import com.sun.c1x.graph.*; -import com.sun.c1x.ir.*; import com.sun.c1x.lir.*; import com.sun.c1x.observer.*; import com.sun.c1x.value.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java --- a/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java Thu May 19 17:20:55 2011 +0200 @@ -39,8 +39,6 @@ // Checkstyle: resume // inlining settings - public static boolean OptInline = ____; - public static int MaximumInstructionCount = 37000; public static float MaximumInlineRatio = 0.90f; public static int MaximumInlineSize = 35; @@ -91,12 +89,8 @@ public static boolean PrintAssumptions = ____; public static boolean QuietBailout = ____; - // optimistic optimization settings - public static boolean UseAssumptions = true; - // state merging settings public static boolean AssumeVerifiedBytecode = ____; - public static boolean PhiLoopStores = true; // miscellaneous settings public static boolean SupportObjectConstants = true; @@ -139,23 +133,4 @@ public static boolean UseXmmRegToRegMoveAll = ____; public static boolean StressImplicitExceptions = ____; - - static { - setOptimizationLevel(1); - } - - public static void setOptimizationLevel(int level) { - final boolean l = (level >= 1); - final boolean ll = (level >= 2); - final boolean lll = (level >= 3); - - // Level 1 optimizations - PhiLoopStores = l; - - // Level 2 optimizations - OptInline = ll; - - // Level 3 optimizations - UseAssumptions = lll; - } } diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java --- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java Thu May 19 17:20:55 2011 +0200 @@ -28,19 +28,17 @@ import java.util.*; import com.sun.c1x.*; -import com.sun.c1x.alloc.Interval.RegisterBinding; -import com.sun.c1x.alloc.Interval.RegisterPriority; -import com.sun.c1x.alloc.Interval.SpillState; +import com.sun.c1x.alloc.Interval.*; import com.sun.c1x.debug.*; import com.sun.c1x.gen.*; import com.sun.c1x.graph.*; import com.sun.c1x.ir.*; import com.sun.c1x.lir.*; -import com.sun.c1x.lir.LIRInstruction.OperandMode; +import com.sun.c1x.lir.LIRInstruction.*; import com.sun.c1x.observer.*; import com.sun.c1x.util.*; import com.sun.c1x.value.*; -import com.sun.c1x.value.FrameState.ValueProcedure; +import com.sun.c1x.value.FrameState.*; import com.sun.cri.ci.*; import com.sun.cri.ri.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScanWalker.java --- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScanWalker.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScanWalker.java Thu May 19 17:20:55 2011 +0200 @@ -27,16 +27,12 @@ import java.util.*; import com.sun.c1x.*; -import com.sun.c1x.alloc.Interval.RegisterBinding; -import com.sun.c1x.alloc.Interval.RegisterPriority; -import com.sun.c1x.alloc.Interval.SpillState; -import com.sun.c1x.alloc.Interval.State; +import com.sun.c1x.alloc.Interval.*; import com.sun.c1x.debug.*; -import com.sun.c1x.ir.*; import com.sun.c1x.lir.*; import com.sun.c1x.util.*; import com.sun.cri.ci.*; -import com.sun.cri.ci.CiRegister.RegisterFlag; +import com.sun.cri.ci.CiRegister.*; /** * diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/alloc/RegisterVerifier.java --- a/graal/GraalCompiler/src/com/sun/c1x/alloc/RegisterVerifier.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/RegisterVerifier.java Thu May 19 17:20:55 2011 +0200 @@ -26,7 +26,6 @@ import com.sun.c1x.*; import com.sun.c1x.debug.*; -import com.sun.c1x.ir.*; import com.sun.c1x.lir.*; import com.sun.c1x.util.*; import com.sun.cri.ci.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java --- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Thu May 19 17:20:55 2011 +0200 @@ -32,7 +32,7 @@ import com.oracle.max.asm.*; import com.sun.c1x.*; import com.sun.c1x.alloc.*; -import com.sun.c1x.alloc.OperandPool.VariableFlag; +import com.sun.c1x.alloc.OperandPool.*; import com.sun.c1x.debug.*; import com.sun.c1x.globalstub.*; import com.sun.c1x.graph.*; @@ -41,18 +41,11 @@ import com.sun.c1x.opt.*; import com.sun.c1x.util.*; import com.sun.c1x.value.*; -import com.sun.c1x.value.FrameState.PhiProcedure; import com.sun.cri.bytecode.*; -import com.sun.cri.bytecode.Bytecodes.MemoryBarriers; import com.sun.cri.ci.*; import com.sun.cri.ri.*; -import com.sun.cri.xir.CiXirAssembler.XirConstant; -import com.sun.cri.xir.CiXirAssembler.XirInstruction; -import com.sun.cri.xir.CiXirAssembler.XirOperand; -import com.sun.cri.xir.CiXirAssembler.XirParameter; -import com.sun.cri.xir.CiXirAssembler.XirRegister; -import com.sun.cri.xir.CiXirAssembler.XirTemp; import com.sun.cri.xir.*; +import com.sun.cri.xir.CiXirAssembler.*; /** * This class traverses the HIR instructions and generates LIR instructions from them. diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java --- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Thu May 19 17:20:55 2011 +0200 @@ -37,7 +37,7 @@ import com.sun.cri.bytecode.*; import com.sun.cri.ci.*; import com.sun.cri.ri.*; -import com.sun.cri.ri.RiType.Representation; +import com.sun.cri.ri.RiType.*; /** * The {@code GraphBuilder} class parses the bytecode of a method and builds the IR graph. @@ -393,8 +393,6 @@ updateDispatchChain(dispatch.otherSuccessor(), mergedState, bci); } else if (dispatchEntry.next() instanceof Deoptimize) { // deoptimizing handler - Deoptimize deopt = (Deoptimize) dispatchEntry.next(); - //deopt.setStateBefore(mergedState.duplicate(bci)); dispatchEntry.end().setStateAfter(mergedState.duplicate(bci)); updateDispatchChain(dispatchEntry.end().blockSuccessor(0), mergedState, bci); } else if (dispatchEntry.next() instanceof Unwind) { @@ -880,23 +878,6 @@ return exact; } - private RiType getAssumedLeafType(RiType type) { - if (isFinal(type.accessFlags())) { - return type; - } - RiType assumed = null; - if (C1XOptions.UseAssumptions) { - assumed = type.uniqueConcreteSubtype(); - if (assumed != null) { - if (C1XOptions.PrintAssumptions) { - TTY.println("Recording concrete subtype assumption in context of " + type.name() + ": " + assumed.name()); - } - compilation.assumptions.recordConcreteSubtype(type, assumed); - } - } - return assumed; - } - private void callRegisterFinalizer() { Value receiver = frameState.loadLocal(0); RiType declaredType = receiver.declaredType(); diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/graph/IR.java --- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java Thu May 19 17:20:55 2011 +0200 @@ -24,7 +24,6 @@ import java.util.*; -import com.oracle.graal.graph.*; import com.sun.c1x.*; import com.sun.c1x.debug.*; import com.sun.c1x.ir.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java --- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Thu May 19 17:20:55 2011 +0200 @@ -25,7 +25,6 @@ import java.util.*; import com.oracle.graal.graph.*; -import com.oracle.max.asm.*; import com.sun.c1x.*; import com.sun.c1x.debug.*; import com.sun.c1x.lir.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/lir/FrameMap.java --- a/graal/GraalCompiler/src/com/sun/c1x/lir/FrameMap.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/FrameMap.java Thu May 19 17:20:55 2011 +0200 @@ -31,7 +31,7 @@ import com.sun.c1x.util.*; import com.sun.cri.bytecode.*; import com.sun.cri.ci.*; -import com.sun.cri.ci.CiCallingConvention.Type; +import com.sun.cri.ci.CiCallingConvention.*; import com.sun.cri.ri.*; import com.sun.cri.util.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/lir/LIRAssembler.java --- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRAssembler.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRAssembler.java Thu May 19 17:20:55 2011 +0200 @@ -30,12 +30,12 @@ import com.sun.c1x.debug.*; import com.sun.c1x.gen.*; import com.sun.c1x.ir.*; -import com.sun.c1x.lir.FrameMap.StackBlock; +import com.sun.c1x.lir.FrameMap.*; import com.sun.c1x.util.*; import com.sun.cri.ci.*; -import com.sun.cri.ci.CiTargetMethod.Mark; +import com.sun.cri.ci.CiTargetMethod.*; import com.sun.cri.ri.*; -import com.sun.cri.xir.CiXirAssembler.XirMark; +import com.sun.cri.xir.CiXirAssembler.*; /** * The {@code LIRAssembler} class definition. diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/lir/LIRCall.java --- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRCall.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRCall.java Thu May 19 17:20:55 2011 +0200 @@ -25,9 +25,9 @@ import java.util.*; import com.sun.cri.ci.*; -import com.sun.cri.ci.CiTargetMethod.Mark; +import com.sun.cri.ci.CiTargetMethod.*; import com.sun.cri.ri.*; -import com.sun.cri.xir.CiXirAssembler.XirMark; +import com.sun.cri.xir.CiXirAssembler.*; /** * This class represents a call instruction; either to a {@linkplain CiRuntimeCall runtime method}, diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/lir/LIRInstruction.java --- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRInstruction.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRInstruction.java Thu May 19 17:20:55 2011 +0200 @@ -27,9 +27,7 @@ import java.util.*; import com.sun.c1x.*; -import com.sun.c1x.ir.*; -import com.sun.c1x.lir.LIROperand.LIRAddressOperand; -import com.sun.c1x.lir.LIROperand.LIRVariableOperand; +import com.sun.c1x.lir.LIROperand.*; import com.sun.cri.ci.*; /** diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java --- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java Thu May 19 17:20:55 2011 +0200 @@ -32,10 +32,10 @@ import com.sun.c1x.globalstub.*; import com.sun.c1x.ir.*; import com.sun.cri.ci.*; -import com.sun.cri.ci.CiTargetMethod.Mark; +import com.sun.cri.ci.CiTargetMethod.*; import com.sun.cri.ri.*; -import com.sun.cri.xir.CiXirAssembler.XirMark; import com.sun.cri.xir.*; +import com.sun.cri.xir.CiXirAssembler.*; /** * This class represents a list of LIR instructions and contains factory methods for creating and appending LIR diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/lir/LIRTableSwitch.java --- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRTableSwitch.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRTableSwitch.java Thu May 19 17:20:55 2011 +0200 @@ -22,7 +22,6 @@ */ package com.sun.c1x.lir; -import com.sun.c1x.ir.*; import com.sun.cri.ci.*; /** diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/opt/PhiSimplifier.java --- a/graal/GraalCompiler/src/com/sun/c1x/opt/PhiSimplifier.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/opt/PhiSimplifier.java Thu May 19 17:20:55 2011 +0200 @@ -22,7 +22,7 @@ */ package com.sun.c1x.opt; -import com.sun.c1x.graph.IR; +import com.sun.c1x.graph.*; import com.sun.c1x.ir.*; import com.sun.c1x.value.*; diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64GlobalStubEmitter.java --- a/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64GlobalStubEmitter.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64GlobalStubEmitter.java Thu May 19 17:20:55 2011 +0200 @@ -33,15 +33,10 @@ import com.sun.c1x.asm.*; import com.sun.c1x.globalstub.*; import com.sun.cri.ci.*; -import com.sun.cri.ci.CiRegister.RegisterFlag; +import com.sun.cri.ci.CiRegister.*; import com.sun.cri.ri.*; import com.sun.cri.xir.*; -import com.sun.cri.xir.CiXirAssembler.XirConstant; -import com.sun.cri.xir.CiXirAssembler.XirConstantOperand; -import com.sun.cri.xir.CiXirAssembler.XirOperand; -import com.sun.cri.xir.CiXirAssembler.XirParameter; -import com.sun.cri.xir.CiXirAssembler.XirRegister; -import com.sun.cri.xir.CiXirAssembler.XirTemp; +import com.sun.cri.xir.CiXirAssembler.*; public class AMD64GlobalStubEmitter implements GlobalStubEmitter { diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java --- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java Thu May 19 17:20:55 2011 +0200 @@ -22,6 +22,8 @@ */ package com.sun.c1x.value; +import static com.sun.c1x.value.ValueUtil.*; + import java.util.*; import com.oracle.graal.graph.*; @@ -30,8 +32,6 @@ import com.sun.c1x.ir.*; import com.sun.cri.ci.*; -import static com.sun.c1x.value.ValueUtil.*; - /** * The {@code FrameState} class encapsulates the frame state (i.e. local variables and * operand stack) at a particular point in the abstract interpretation. diff -r 108adba3345e -r a2f62de90c76 graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java --- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java Thu May 19 17:20:55 2011 +0200 @@ -22,6 +22,9 @@ */ package com.sun.c1x.value; +import static com.sun.c1x.value.ValueUtil.*; +import static java.lang.reflect.Modifier.*; + import java.util.*; import com.oracle.graal.graph.*; @@ -30,9 +33,6 @@ import com.sun.cri.ci.*; import com.sun.cri.ri.*; -import static com.sun.c1x.value.ValueUtil.*; -import static java.lang.reflect.Modifier.*; - public class FrameStateBuilder implements FrameStateAccess { diff -r 108adba3345e -r a2f62de90c76 graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotOptions.java --- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotOptions.java Thu May 19 17:17:22 2011 +0200 +++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotOptions.java Thu May 19 17:20:55 2011 +0200 @@ -31,7 +31,6 @@ public class HotSpotOptions { public static void setDefaultOptions() { - C1XOptions.setOptimizationLevel(3); C1XOptions.DetailedAsserts = false; C1XOptions.CommentedAssembly = false; C1XOptions.MethodEndBreakpointGuards = 2;