Mercurial > hg > graal-compiler
changeset 19332:833d0361c3e2
Temporarily remove the baseline compiler experiment.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 12 Feb 2015 21:27:06 +0100 |
parents | 9a12234da10c |
children | ae87324c37d6 |
files | graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineFrameStateBuilder.java graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineLoop.java graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java mx/suite.py |
diffstat | 9 files changed, 36 insertions(+), 1276 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Thu Feb 12 21:22:47 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,788 +0,0 @@ -/* - * Copyright (c) 2014, 2014, 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.baseline; - -import static com.oracle.graal.compiler.common.GraalOptions.*; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.java.*; -import com.oracle.graal.java.BciBlockMapping.BciBlock; -import com.oracle.graal.java.BciBlockMapping.LocalLiveness; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.StandardOp.BlockEndOp; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.phases.*; - -public class BaselineBytecodeParser extends AbstractBytecodeParser<Value, BaselineFrameStateBuilder> implements BytecodeParserTool { - private Backend backend; - protected LIRGeneratorTool gen; - private LIRGenerationResult lirGenRes; - private BytecodeLIRBuilder lirBuilder; - @SuppressWarnings("unused") private BciBlock[] loopHeaders; - private LocalLiveness liveness; - private BciBlockBitMap blockVisited; - - private static class BciBlockBitMap { - BitSet bitSet; - - public BciBlockBitMap(BciBlockMapping blockMap) { - bitSet = new BitSet(blockMap.getBlocks().length); - } - - public boolean get(BciBlock block) { - return bitSet.get(block.getId()); - } - - public void set(BciBlock block) { - bitSet.set(block.getId()); - } - } - - public BaselineBytecodeParser(MetaAccessProvider metaAccess, ResolvedJavaMethod method, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, - BaselineFrameStateBuilder frameState, Backend backend) { - - super(metaAccess, method, graphBuilderConfig, optimisticOpts); - this.backend = backend; - this.setCurrentFrameState(frameState); - } - - protected LIRGenerationResult build() { - if (PrintProfilingInformation.getValue()) { - TTY.println("Profiling info for " + method.format("%H.%n(%p)")); - TTY.println(MetaUtil.indent(profilingInfo.toString(method, CodeUtil.NEW_LINE), " ")); - } - - try (Indent indent = Debug.logAndIndent("build graph for %s", method)) { - - BciBlockMapping blockMap; - try (Scope ds = Debug.scope("BciBlockMapping")) { - // compute the block map, setup exception handlers and get the entrypoint(s) - blockMap = BciBlockMapping.create(method, graphBuilderConfig.doLivenessAnalysis(), false); - } catch (Throwable e) { - throw Debug.handle(e); - } - - loopHeaders = blockMap.getLoopHeaders(); - liveness = blockMap.liveness; - blockVisited = new BciBlockBitMap(blockMap); - - if (method.isSynchronized()) { - throw GraalInternalError.unimplemented("Handle synchronized methods"); - } - - frameState = new BaselineFrameStateBuilder(method); - frameState.clearNonLiveLocals(blockMap.startBlock, liveness, true); - - currentBlock = blockMap.startBlock; - blockMap.startBlock.setEntryState(0, frameState); - if (blockMap.startBlock.isLoopHeader) { - throw GraalInternalError.unimplemented("Handle start block as loop header"); - } - - // add loops ? how do we add looks when we haven't parsed the bytecode? - - // create the control flow graph - BaselineControlFlowGraph cfg = BaselineControlFlowGraph.compute(blockMap); - - // create the LIR - List<BciBlock> linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blockMap.getBlocks().length, blockMap.startBlock); - List<BciBlock> codeEmittingOrder = ComputeBlockOrder.computeCodeEmittingOrder(blockMap.getBlocks().length, blockMap.startBlock); - LIR lir = new LIR(cfg, linearScanOrder, codeEmittingOrder); - - RegisterConfig registerConfig = null; - FrameMapBuilder frameMapBuilder = backend.newFrameMapBuilder(registerConfig); - TargetDescription target = backend.getTarget(); - CallingConvention cc = CodeUtil.getCallingConvention(backend.getProviders().getCodeCache(), CallingConvention.Type.JavaCallee, method, false); - this.lirGenRes = backend.newLIRGenerationResult(lir, frameMapBuilder, method, null); - this.gen = backend.newLIRGenerator(cc, lirGenRes); - this.lirBuilder = backend.newBytecodeLIRBuilder(gen, this); - - try (Scope ds = Debug.scope("BackEnd", lir)) { - try (Scope s = Debug.scope("LIRGen", gen)) { - - // possibly add all the arguments to slots in the local variable array - - for (BciBlock block : blockMap.getBlocks()) { - emitBlock(block); - } - - gen.beforeRegisterAllocation(); - Debug.dump(lir, "After LIR generation"); - } catch (Throwable e) { - throw Debug.handle(e); - } - - try (Scope s = Debug.scope("LIRTier", this)) { - LIRSuites lirSuites = backend.getSuites().getDefaultLIRSuites(); - return GraalCompiler.emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, gen, lirSuites); - } catch (Throwable e) { - throw Debug.handle(e); - } - - } catch (Throwable e) { - throw Debug.handle(e); - } - } catch (Throwable e) { - throw Debug.handle(e); - } - } - - private void emitBlock(BciBlock b) { - if (lirGenRes.getLIR().getLIRforBlock(b) == null) { - for (BciBlock pred : b.getPredecessors()) { - if (!b.isLoopHeader() || !pred.isLoopEnd()) { - emitBlock(pred); - } - } - processBlock(b); - } - } - - @Override - protected void handleUnresolvedLoadConstant(JavaType type) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedCheckCast(JavaType type, Value object) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedInstanceOf(JavaType type, Value object) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedNewInstance(JavaType type) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedNewObjectArray(JavaType type, Value length) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedNewMultiArray(JavaType type, List<Value> dims) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedLoadField(JavaField field, Value receiver) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedStoreField(JavaField field, Value value, Value receiver) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void handleUnresolvedExceptionType(JavaType type) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genLoadIndexed(Value index, Value array, Kind kind) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genStoreIndexed(Value array, Value index, Kind kind, Value value) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genIntegerAdd(Kind kind, Value x, Value y) { - return gen.emitAdd(x, y, false); - } - - @Override - protected Value genIntegerSub(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genIntegerMul(Kind kind, Value x, Value y) { - return gen.emitMul(x, y, false); - } - - @Override - protected Value genFloatAdd(Kind kind, Value x, Value y, boolean isStrictFP) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genFloatSub(Kind kind, Value x, Value y, boolean isStrictFP) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genFloatMul(Kind kind, Value x, Value y, boolean isStrictFP) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genFloatDiv(Kind kind, Value x, Value y, boolean isStrictFP) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genFloatRem(Kind kind, Value x, Value y, boolean isStrictFP) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genIntegerDiv(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genIntegerRem(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genNegateOp(Value x) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genLeftShift(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genRightShift(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genUnsignedRightShift(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genAnd(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genOr(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genXor(Kind kind, Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genNormalizeCompare(Value x, Value y, boolean isUnorderedLess) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genFloatConvert(FloatConvert op, Value input) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genNarrow(Value input, int bitCount) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genSignExtend(Value input, int bitCount) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genZeroExtend(Value input, int bitCount) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genObjectEquals(Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genIntegerEquals(Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genIf(Value x, Condition cond, Value y) { - assert currentBlock.getSuccessors().size() == 2; - BciBlock trueBlock = currentBlock.getSuccessors().get(0); - BciBlock falseBlock = currentBlock.getSuccessors().get(1); - if (trueBlock == falseBlock) { - genGoto(); - return; - } - - double probability = branchProbability(); - - LabelRef trueDestination = getSuccessor(0); - LabelRef falseDestination = getSuccessor(1); - - gen.emitCompareBranch(x.getKind(), x, y, cond, false, trueDestination, falseDestination, probability); - } - - @Override - protected Value genIntegerLessThan(Value x, Value y) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genUnique(Value x) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genThrow() { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value createCheckCast(ResolvedJavaType type, Value object, JavaTypeProfile profileForTypeCheck, boolean b) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value createInstanceOf(ResolvedJavaType type, Value object, JavaTypeProfile profileForTypeCheck) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genConditional(Value x) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value createNewInstance(ResolvedJavaType type, boolean fillContents) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value createNewArray(ResolvedJavaType elementType, Value length, boolean fillContents) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value createNewMultiArray(ResolvedJavaType type, List<Value> dims) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genLoadField(Value receiver, ResolvedJavaField field) { - if (field.isStatic()) { - Value classRef = lirBuilder.getClassConstant(field.getDeclaringClass()); - long displacement = lirBuilder.getFieldOffset(field); - Value address = gen.emitAddress(classRef, displacement, Value.ILLEGAL, 0); - LIRKind readKind = backend.getTarget().getLIRKind(field.getKind()); - LIRFrameState state = createFrameState(frameState); - return gen.emitLoad(readKind, address, state); - } - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void emitNullCheck(Value receiver) { - gen.emitNullCheck(receiver, createFrameState(frameState)); - } - - @Override - protected void emitBoundsCheck(Value index, Value length) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genArrayLength(Value array) { - emitNullCheck(array); - long displacement = lirBuilder.getArrayLengthOffset(); - Value address = gen.emitAddress(array, displacement, Value.ILLEGAL, 0); - LIRKind readKind = backend.getTarget().getLIRKind(Kind.Int); - LIRFrameState state = createFrameState(frameState); - return gen.emitLoad(readKind, address, state); - } - - private LIRFrameState createFrameState(BaselineFrameStateBuilder state) { - LabelRef exceptionEdge = null; - BytecodeFrame caller = null; - boolean duringCall = false; - int numLocals = state.localsSize(); - int numStack = state.stackSize(); - int numLocks = state.lockDepth(); - JavaValue[] values = new JavaValue[numLocals + numStack + numLocks]; - - for (int i = 0; i < numLocals; i++) { - values[i] = (JavaValue) state.localAt(i); - } - - for (int i = 0; i < numStack; i++) { - values[numLocals + i] = (JavaValue) state.stackAt(i); - } - - for (int i = 0; i < numStack; i++) { - values[numLocals + numStack + i] = (JavaValue) state.lockAt(i); - } - - BytecodeFrame frame = new BytecodeFrame(caller, method, bci(), state.rethrowException(), duringCall, values, numLocals, numStack, numLocks); - return new LIRFrameState(frame, null, exceptionEdge); - } - - @Override - protected Value genStoreField(Value receiver, ResolvedJavaField field, Value value) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genInvokeStatic(JavaMethod target) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genInvokeInterface(JavaMethod target) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genInvokeDynamic(JavaMethod target) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genInvokeVirtual(JavaMethod target) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genInvokeSpecial(JavaMethod target) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genReturn(Value x) { - gen.emitReturn(x); - } - - @Override - protected Value genMonitorEnter(Value x) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value genMonitorExit(Value x, Value returnValue) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genJsr(int dest) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genRet(int localIndex) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected void genIntegerSwitch(Value value, ArrayList<BciBlock> actualSuccessors, int[] keys, double[] keyProbabilities, int[] keySuccessors) { - // TODO Auto-generated method stub - throw GraalInternalError.unimplemented("Auto-generated method stub"); - } - - @Override - protected Value appendConstant(JavaConstant constant) { - return gen.emitLoadConstant(constant.getLIRKind(), constant); - } - - @Override - protected Value append(Value v) { - return v; - } - - private void createTarget(BciBlock block) { - assert block != null && frameState != null; - assert !block.isExceptionEntry || frameState.stackSize() == 1; - - if (!blockVisited.get(block)) { - /* - * This is the first time we see this block as a branch target. Create and return a - * placeholder that later can be replaced with a MergeNode when we see this block again. - */ - blockVisited.set(block); - if (block.getPredecessorCount() > 1) { - /* - * If there are more than one predecessors we have to ensure that we are not passing - * constants to the new framestate otherwise we will get interfacing problems. - */ - moveConstantsToVariables(); - } - block.setEntryState(0, frameState.copy()); - block.getEntryState(0).clearNonLiveLocals(block, liveness, true); - - Debug.log("createTarget %s: first visit", block); - return; - } - - // We already saw this block before, so we have to merge states. - if (!((BaselineFrameStateBuilder) block.getEntryState(0)).isCompatibleWith(frameState)) { - throw new BailoutException("stacks do not match; bytecodes would not verify"); - } - - if (block.isLoopHeader) { - assert currentBlock == null || currentBlock.getId() >= block.getId() : "must be backward branch"; - if (currentBlock != null && currentBlock.numNormalSuccessors() == 1) { - // this is the only successor of the current block so we can adjust - adaptFramestate((BaselineFrameStateBuilder) block.getEntryState(0)); - return; - } - GraalInternalError.unimplemented("Loops not yet supported"); - } - assert currentBlock == null || currentBlock.getId() < block.getId() : "must not be backward branch"; - - /* - * This is the second time we see this block. Create the actual MergeNode and the End Node - * for the already existing edge. For simplicity, we leave the placeholder in the graph and - * just append the new nodes after the placeholder. - */ - if (currentBlock != null && currentBlock.numNormalSuccessors() == 1) { - // this is the only successor of the current block so we can adjust - adaptFramestate((BaselineFrameStateBuilder) block.getEntryState(0)); - return; - } - GraalInternalError.unimplemented("second block visit not yet implemented"); - - // merge frame states e.g. block.entryState.merge(mergeNode, target.state); - - Debug.log("createTarget %s: merging state", block); - } - - private void moveConstantsToVariables() { - Debug.log("moveConstantsToVariables: framestate before: %s", frameState); - for (int i = 0; i < frameState.stackSize(); i++) { - Value src = frameState.stackAt(i); - if (src instanceof JavaConstant) { - AllocatableValue dst = gen.newVariable(src.getLIRKind()); - gen.emitMove(dst, src); - frameState.storeStack(i, dst); - Debug.log("introduce new variabe %s for stackslot %d (end of block %s", dst, i, currentBlock); - } - } - for (int i = 0; i < frameState.localsSize(); i++) { - Value src = frameState.localAt(i); - if (src instanceof JavaConstant) { - AllocatableValue dst = gen.newVariable(src.getLIRKind()); - gen.emitMove(dst, src); - frameState.storeLocal(i, dst); - Debug.log("introduce new variabe %s for local %d (end of block %s", dst, i, currentBlock); - } - } - Debug.log("moveConstantsToVariables: framestate after: %s", frameState); - } - - private static void adaptValues(Value dst, Value src, PhiResolver resolver) { - if (dst == null) { - return; - } - assert src != null : "Source is null but Destination is not!"; - - if (!dst.equals(src)) { - resolver.move(dst, src); - } - } - - private void adaptFramestate(BaselineFrameStateBuilder other) { - assert frameState.isCompatibleWith(other) : "framestates not compatible!"; - PhiResolver resolver = new PhiResolver(gen); - for (int i = 0; i < frameState.stackSize(); i++) { - Value src = frameState.stackAt(i); - Value dst = other.stackAt(i); - adaptValues(dst, src, resolver); - } - for (int i = 0; i < frameState.localsSize(); i++) { - Value src = frameState.localAt(i); - Value dst = other.localAt(i); - adaptValues(dst, src, resolver); - } - resolver.dispose(); - } - - protected void processBlock(BciBlock block) { - frameState = (BaselineFrameStateBuilder) block.getEntryState(0); - setCurrentFrameState(frameState); - currentBlock = block; - iterateBytecodesForBlock(block); - } - - private boolean isBlockEnd() { - List<LIRInstruction> l = gen.getResult().getLIR().getLIRforBlock(currentBlock); - if (l.isEmpty()) { - return false; - } - return l.get(l.size() - 1) instanceof BlockEndOp; - } - - @Override - protected void iterateBytecodesForBlock(BciBlock block) { - gen.doBlockStart(block); - - if (block == gen.getResult().getLIR().getControlFlowGraph().getStartBlock()) { - assert block.getPredecessorCount() == 0; - lirBuilder.emitPrologue(method); - } else { - assert block.getPredecessorCount() > 0; - } - - if (block.isLoopHeader) { - /* - * We need to preserve the frame state builder of the loop header so that we can merge - * values for phi functions, so make a copy of it. - */ - block.setEntryState(0, frameState.copy()); - - } - int endBCI = stream.endBCI(); - - stream.setBCI(block.startBci); - int bci = block.startBci; - BytecodesParsed.add(block.endBci - bci); - - while (bci < endBCI) { - - // read the opcode - int opcode = stream.currentBC(); - // traceState(); - traceInstruction(bci, opcode, bci == block.startBci); - - processBytecode(bci, opcode); - - stream.next(); - bci = stream.currentBCI(); - - if (isBlockEnd()) { - break; - } - - if (bci < endBCI) { - if (bci > block.endBci) { - if (block.numNormalSuccessors() == 1) { - assert !block.getSuccessor(0).isExceptionEntry; - // we fell through to the next block, add a goto and break - genGoto(); - } - break; - } - } - } - - assert LIR.verifyBlock(gen.getResult().getLIR(), block); - gen.doBlockEnd(block); - } - - public void storeLocal(int i, Value x) { - frameState.storeLocal(i, x); - } - - LabelRef getSuccessor(int index) { - createTarget(currentBlock.getSuccessor(index)); - return LabelRef.forSuccessor(lirGenRes.getLIR(), currentBlock, index); - } - - @Override - protected void genGoto() { - gen.emitJump(getSuccessor(0)); - } - -}
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Thu Feb 12 21:22:47 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2014, 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.baseline; - -import static com.oracle.graal.compiler.common.GraalOptions.*; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.java.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; - -/** - * The {@code GraphBuilder} class parses the bytecode of a method and builds the IR graph. - */ -public class BaselineCompiler { - - public BaselineCompiler(GraphBuilderConfiguration graphBuilderConfig, MetaAccessProvider metaAccess) { - this.graphBuilderConfig = graphBuilderConfig; - this.metaAccess = metaAccess; - } - - private final MetaAccessProvider metaAccess; - - private final GraphBuilderConfiguration graphBuilderConfig; - - public CompilationResult generate(ResolvedJavaMethod method, @SuppressWarnings("unused") int entryBCI, Backend backend, CompilationResult compilationResult, ResolvedJavaMethod installedCodeOwner, - CompilationResultBuilderFactory factory, OptimisticOptimizations optimisticOpts, @SuppressWarnings("unused") Replacements replacements) { - assert method.getCode() != null : "method must contain bytecodes: " + method; - TTY.Filter filter = new TTY.Filter(PrintFilter.getValue(), method); - - BaselineFrameStateBuilder frameState = new BaselineFrameStateBuilder(method); - - BaselineBytecodeParser parser = new BaselineBytecodeParser(metaAccess, method, graphBuilderConfig, optimisticOpts, frameState, backend); - - // build blocks and LIR instructions - final LIRGenerationResult res; - try { - res = parser.build(); - } finally { - filter.remove(); - } - - // emitCode - Assumptions assumptions = OptAssumptions.getValue() ? new Assumptions() : null; - GraalCompiler.emitCode(backend, assumptions, Collections.emptySet(), res, compilationResult, installedCodeOwner, factory); - - return compilationResult; - } -}
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java Thu Feb 12 21:22:47 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2014, 2014, 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.baseline; - -import java.util.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.java.*; -import com.oracle.graal.java.BciBlockMapping.BciBlock; - -public final class BaselineControlFlowGraph implements AbstractControlFlowGraph<BciBlock> { - - private BciBlock[] blocks; - private Collection<Loop<BciBlock>> loops; - - public static BaselineControlFlowGraph compute(BciBlockMapping blockMap) { - try (Scope ds = Debug.scope("BaselineCFG", blockMap)) { - BaselineControlFlowGraph cfg = new BaselineControlFlowGraph(blockMap); - cfg.computePredecessors(); - cfg.computeLoopInformation(blockMap); - AbstractControlFlowGraph.computeDominators(cfg); - - assert CFGVerifier.verify(cfg); - - return cfg; - } catch (Throwable e) { - throw Debug.handle(e); - } - } - - private BaselineControlFlowGraph(BciBlockMapping blockMap) { - blocks = blockMap.getBlocks(); - loops = new ArrayList<>(); - } - - public List<BciBlock> getBlocks() { - return Arrays.asList(blocks); - } - - public Collection<Loop<BciBlock>> getLoops() { - return loops; - } - - public BciBlock getStartBlock() { - if (blocks.length > 0) { - return blocks[0]; - } - return null; - } - - /** - * Create and populate the predecessor list. - */ - private void computePredecessors() { - // set predecessors - for (BciBlock block : blocks) { - block.setPredecessors(new ArrayList<>(4)); - } - // calculate predecessors - for (BciBlock block : blocks) { - for (BciBlock succ : block.getSuccessors()) { - succ.getPredecessors().add(block); - } - } - } - - private void computeLoopInformation(BciBlockMapping blockMap) { - try (Indent indent = Debug.logAndIndent("computeLoopInformation")) { - for (BciBlock block : blocks) { - calcLoop(block, blockMap); - Debug.log("Block: %s, Loop: %s", block, block.getLoop()); - } - } - } - - private Loop<BciBlock> getLoop(int index, BciBlockMapping blockMap) { - BciBlock header = blockMap.getLoopHeader(index); - assert header.getLoopDepth() > 0; - Loop<BciBlock> loop = header.getLoop(); - - if (loop == null) { - Loop<BciBlock> parent = null; - - if (header.getLoopDepth() > 1) { - // Recursively create out loops. - Iterator<Integer> i = header.loopIdIterable().iterator(); - assert i.hasNext() : "BciBlock.loopIdIterable() must return exactly BciBlock.getLoopDepth() elements!"; - int outerLoopId = i.next(); - assert index == outerLoopId : "The first loopId must be the id of the loop that is started by this header!"; - assert i.hasNext() : "BciBlock.loopIdIterable() must return exactly BciBlock.getLoopDepth() elements!"; - outerLoopId = i.next(); - parent = getLoop(outerLoopId, blockMap); - } - - loop = new BaselineLoop(parent, index, header); - loops.add(loop); - header.setLoop(loop); - } - return loop; - } - - private void calcLoop(BciBlock block, BciBlockMapping blockMap) { - int loopId = block.getLoopId(); - if (loopId != -1) { - block.setLoop(getLoop(loopId, blockMap)); - - } - } - -}
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineFrameStateBuilder.java Thu Feb 12 21:22:47 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2014, 2014, 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.baseline; - -import com.oracle.graal.api.meta.*; -import com.oracle.graal.java.*; - -public class BaselineFrameStateBuilder extends AbstractFrameStateBuilder<Value, BaselineFrameStateBuilder> { - - private static final Value[] EMPTY_ARRAY = new Value[0]; - - public BaselineFrameStateBuilder(ResolvedJavaMethod method) { - // we always need at least one stack slot (for exceptions) - super(method); - } - - protected BaselineFrameStateBuilder(BaselineFrameStateBuilder other) { - super(other); - } - - @Override - protected Value[] allocateArray(int length) { - return length == 0 ? EMPTY_ARRAY : new Value[length]; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("[locals: ["); - for (int i = 0; i < locals.length; i++) { - sb.append(i == 0 ? "" : ",").append(locals[i] == null ? "_" : locals[i].toString()); - } - sb.append("] stack: ["); - for (int i = 0; i < stackSize; i++) { - sb.append(i == 0 ? "" : ",").append(stack[i] == null ? "_" : stack[i].toString()); - } - sb.append("] locks: ["); - for (int i = 0; i < lockedObjects.length; i++) { - sb.append(i == 0 ? "" : ",").append(lockedObjects[i].toString()); - } - sb.append("]"); - if (rethrowException) { - sb.append(" rethrowException"); - } - sb.append("]"); - return sb.toString(); - } - - @Override - public BaselineFrameStateBuilder copy() { - return new BaselineFrameStateBuilder(this); - } - - private static boolean isCompatible(Value x, Value y) { - if (x == null && y == null) { - return true; - } - if ((x == null || y == null) || (x.getKind() != y.getKind())) { - return false; - } - return true; - - } - - @Override - public boolean isCompatibleWith(BaselineFrameStateBuilder other) { - assert method.equals(other.method) && localsSize() == other.localsSize() : "Can only compare frame states of the same method"; - - if (stackSize() != other.stackSize()) { - return false; - } - for (int i = 0; i < stackSize(); i++) { - if (!isCompatible(stackAt(i), other.stackAt(i))) { - return false; - } - } - if (lockedObjects.length != other.lockedObjects.length) { - return false; - } - return true; - } -}
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineLoop.java Thu Feb 12 21:22:47 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014, 2014, 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.baseline; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.java.BciBlockMapping.BciBlock; - -public class BaselineLoop extends Loop<BciBlock> { - - protected BaselineLoop(Loop<BciBlock> parent, int index, BciBlock header) { - super(parent, index, header); - } - - @Override - public long numBackedges() { - // currently only loops with one backedge are supported - return 1; - } - -}
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Thu Feb 12 21:22:47 2015 +0100 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Thu Feb 12 21:27:06 2015 +0100 @@ -30,9 +30,6 @@ // @formatter:off public final class GraalOptions { - @Option(help = "Use experimental baseline compiler configuration.", type = OptionType.Debug) - public static final OptionValue<Boolean> UseBaselineCompiler = new OptionValue<>(false); - @Option(help = "Use compiler intrinsifications.", type = OptionType.Debug) public static final OptionValue<Boolean> Intrinsify = new OptionValue<>(true);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Feb 12 21:22:47 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Feb 12 21:27:06 2015 +0100 @@ -40,7 +40,6 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.api.replacements.*; import com.oracle.graal.api.runtime.*; -import com.oracle.graal.baseline.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.GraalCompiler.Request; import com.oracle.graal.compiler.common.*; @@ -482,12 +481,7 @@ checkArgs(method, executeArgs); - InstalledCode compiledMethod = null; - if (UseBaselineCompiler.getValue()) { - compiledMethod = getCodeBaseline(method); - } else { - compiledMethod = getCode(method); - } + InstalledCode compiledMethod = getCode(method); try { return new Result(compiledMethod.executeVarargs(executeArgs), null); } catch (Throwable e) { @@ -497,73 +491,6 @@ } } - protected InstalledCode getCodeBaseline(ResolvedJavaMethod javaMethod) { - return getCodeBaseline(javaMethod, false); - } - - protected InstalledCode getCodeBaseline(ResolvedJavaMethod javaMethod, boolean forceCompile) { - assert javaMethod.getAnnotation(Test.class) == null : "shouldn't parse method with @Test annotation: " + javaMethod; - - try (Scope bds = Debug.scope("Baseline")) { - Debug.log("getCodeBaseline()"); - } catch (Throwable e) { - throw Debug.handle(e); - } - - if (!forceCompile) { - InstalledCode cached = cache.get(javaMethod); - if (cached != null) { - if (cached.isValid()) { - return cached; - } - } - } - - final int id = compilationId.incrementAndGet(); - - InstalledCode installedCode = null; - try (Scope ds = Debug.scope("Compiling", new DebugDumpScope(String.valueOf(id), true))) { - final boolean printCompilation = PrintCompilation.getValue() && !TTY.isSuppressed(); - - if (printCompilation) { - TTY.println(String.format("@%-6d Graal %-70s %-45s %-50s ...", id, javaMethod.getDeclaringClass().getName(), javaMethod.getName(), javaMethod.getSignature())); - } - long start = System.currentTimeMillis(); - - CompilationResult compResult = compileBaseline(javaMethod); - - if (printCompilation) { - TTY.println(String.format("@%-6d Graal %-70s %-45s %-50s | %4dms %5dB", id, "", "", "", System.currentTimeMillis() - start, compResult.getTargetCodeSize())); - } - - try (Scope s = Debug.scope("CodeInstall", getCodeCache(), javaMethod)) { - installedCode = addMethod(javaMethod, compResult); - if (installedCode == null) { - throw new GraalInternalError("Could not install code for " + javaMethod.format("%H.%n(%p)")); - } - } catch (Throwable e) { - throw Debug.handle(e); - } - } catch (Throwable e) { - throw Debug.handle(e); - } - - if (!forceCompile) { - cache.put(javaMethod, installedCode); - } - return installedCode; - } - - private CompilationResult compileBaseline(ResolvedJavaMethod javaMethod) { - try (Scope bds = Debug.scope("CompileBaseline", javaMethod, providers.getCodeCache())) { - BaselineCompiler baselineCompiler = new BaselineCompiler(GraphBuilderConfiguration.getDefault(), providers.getMetaAccess()); - OptimisticOptimizations optimisticOpts = OptimisticOptimizations.ALL; - return baselineCompiler.generate(javaMethod, -1, getBackend(), new CompilationResult(), javaMethod, CompilationResultBuilderFactory.Default, optimisticOpts, getReplacements()); - } catch (Throwable e) { - throw Debug.handle(e); - } - } - protected void checkArgs(ResolvedJavaMethod method, Object[] args) { JavaType[] sig = method.toParameterTypes(); Assert.assertEquals(sig.length, args.length);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Feb 12 21:22:47 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Feb 12 21:27:06 2015 +0100 @@ -42,7 +42,6 @@ import com.oracle.graal.api.code.CallingConvention.Type; import com.oracle.graal.api.meta.*; import com.oracle.graal.api.runtime.*; -import com.oracle.graal.baseline.*; import com.oracle.graal.compiler.common.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; @@ -53,7 +52,6 @@ import com.oracle.graal.hotspot.events.EventProvider.CompilerFailureEvent; import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.hotspot.phases.*; -import com.oracle.graal.java.*; import com.oracle.graal.lir.asm.*; import com.oracle.graal.lir.phases.*; import com.oracle.graal.nodes.*; @@ -197,52 +195,45 @@ // Begin the compilation event. compilationEvent.begin(); - if (UseBaselineCompiler.getValue() == true) { - HotSpotProviders providers = backend.getProviders(); - BaselineCompiler baselineCompiler = new BaselineCompiler(GraphBuilderConfiguration.getDefault(), providers.getMetaAccess()); - OptimisticOptimizations optimisticOpts = OptimisticOptimizations.ALL; - result = baselineCompiler.generate(method, -1, backend, new CompilationResult(), method, CompilationResultBuilderFactory.Default, optimisticOpts, providers.getReplacements()); - } else { - Map<ResolvedJavaMethod, StructuredGraph> graphCache = null; - if (GraalOptions.CacheGraphs.getValue()) { - graphCache = new HashMap<>(); - } + Map<ResolvedJavaMethod, StructuredGraph> graphCache = null; + if (GraalOptions.CacheGraphs.getValue()) { + graphCache = new HashMap<>(); + } - boolean recordEvolMethodDeps = graalEnv == 0 || unsafe.getByte(graalEnv + config.graalEnvJvmtiCanHotswapOrPostBreakpointOffset) != 0; + boolean recordEvolMethodDeps = graalEnv == 0 || unsafe.getByte(graalEnv + config.graalEnvJvmtiCanHotswapOrPostBreakpointOffset) != 0; - HotSpotProviders providers = backend.getProviders(); - Replacements replacements = providers.getReplacements(); - graph = replacements.getMethodSubstitution(method); - if (graph == null || entryBCI != INVOCATION_ENTRY_BCI) { - graph = new StructuredGraph(method, entryBCI, AllowAssumptions.from(OptAssumptions.getValue())); - if (!recordEvolMethodDeps) { - graph.disableMethodRecording(); - } - } else { - // Compiling method substitution - must clone the graph - graph = graph.copy(graph.name, method, AllowAssumptions.from(OptAssumptions.getValue()), recordEvolMethodDeps); + HotSpotProviders providers = backend.getProviders(); + Replacements replacements = providers.getReplacements(); + graph = replacements.getMethodSubstitution(method); + if (graph == null || entryBCI != INVOCATION_ENTRY_BCI) { + graph = new StructuredGraph(method, entryBCI, AllowAssumptions.from(OptAssumptions.getValue())); + if (!recordEvolMethodDeps) { + graph.disableMethodRecording(); } - InlinedBytecodes.add(method.getCodeSize()); - CallingConvention cc = getCallingConvention(providers.getCodeCache(), Type.JavaCallee, graph.method(), false); - if (graph.getEntryBCI() != StructuredGraph.INVOCATION_ENTRY_BCI) { - // for OSR, only a pointer is passed to the method. - JavaType[] parameterTypes = new JavaType[]{providers.getMetaAccess().lookupJavaType(long.class)}; - CallingConvention tmp = providers.getCodeCache().getRegisterConfig().getCallingConvention(JavaCallee, providers.getMetaAccess().lookupJavaType(void.class), parameterTypes, - backend.getTarget(), false); - cc = new CallingConvention(cc.getStackSize(), cc.getReturn(), tmp.getArgument(0)); - } - Suites suites = getSuites(providers); - LIRSuites lirSuites = getLIRSuites(providers); - ProfilingInfo profilingInfo = getProfilingInfo(); - OptimisticOptimizations optimisticOpts = getOptimisticOpts(profilingInfo); - if (isOSR) { - // In OSR compiles, we cannot rely on never executed code profiles, because - // all code after the OSR loop is never executed. - optimisticOpts.remove(Optimization.RemoveNeverExecutedCode); - } - result = compileGraph(graph, cc, method, providers, backend, backend.getTarget(), graphCache, getGraphBuilderSuite(providers), optimisticOpts, profilingInfo, - method.getSpeculationLog(), suites, lirSuites, new CompilationResult(), CompilationResultBuilderFactory.Default); + } else { + // Compiling method substitution - must clone the graph + graph = graph.copy(graph.name, method, AllowAssumptions.from(OptAssumptions.getValue()), recordEvolMethodDeps); } + InlinedBytecodes.add(method.getCodeSize()); + CallingConvention cc = getCallingConvention(providers.getCodeCache(), Type.JavaCallee, graph.method(), false); + if (graph.getEntryBCI() != StructuredGraph.INVOCATION_ENTRY_BCI) { + // for OSR, only a pointer is passed to the method. + JavaType[] parameterTypes = new JavaType[]{providers.getMetaAccess().lookupJavaType(long.class)}; + CallingConvention tmp = providers.getCodeCache().getRegisterConfig().getCallingConvention(JavaCallee, providers.getMetaAccess().lookupJavaType(void.class), parameterTypes, + backend.getTarget(), false); + cc = new CallingConvention(cc.getStackSize(), cc.getReturn(), tmp.getArgument(0)); + } + Suites suites = getSuites(providers); + LIRSuites lirSuites = getLIRSuites(providers); + ProfilingInfo profilingInfo = getProfilingInfo(); + OptimisticOptimizations optimisticOpts = getOptimisticOpts(profilingInfo); + if (isOSR) { + // In OSR compiles, we cannot rely on never executed code profiles, because + // all code after the OSR loop is never executed. + optimisticOpts.remove(Optimization.RemoveNeverExecutedCode); + } + result = compileGraph(graph, cc, method, providers, backend, backend.getTarget(), graphCache, getGraphBuilderSuite(providers), optimisticOpts, profilingInfo, + method.getSpeculationLog(), suites, lirSuites, new CompilationResult(), CompilationResultBuilderFactory.Default); result.setId(getId()); result.setEntryBCI(entryBCI); } catch (Throwable e) {
--- a/mx/suite.py Thu Feb 12 21:22:47 2015 +0100 +++ b/mx/suite.py Thu Feb 12 21:27:06 2015 +0100 @@ -343,7 +343,6 @@ "com.oracle.graal.replacements", "com.oracle.graal.runtime", "com.oracle.graal.printer", - "com.oracle.graal.baseline", "com.oracle.graal.hotspotvmconfig", "com.oracle.nfi", ], @@ -824,18 +823,6 @@ "workingSets" : "Graal,Java", }, - "com.oracle.graal.baseline" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.graal.compiler", - "com.oracle.graal.java", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Java", - }, - "com.oracle.graal.printer" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -867,7 +854,6 @@ "com.oracle.graal.test", "com.oracle.graal.printer", "com.oracle.graal.runtime", - "com.oracle.graal.baseline", "JAVA_ALLOCATION_INSTRUMENTER", ], "checkstyle" : "com.oracle.graal.graph",