Mercurial > hg > graal-compiler
changeset 23387:827874f0eba1
[AArch64] Fixes and improvements; can run more methods now.
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.aarch64/src/com/oracle/graal/asm/aarch64/AArch64Address.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.asm.aarch64/src/com/oracle/graal/asm/aarch64/AArch64Address.java Thu Feb 04 14:55:15 2016 -0800 @@ -199,31 +199,53 @@ private boolean verify() { assert addressingMode != null; - assert base.getRegisterCategory().equals(AArch64.CPU) && offset.getRegisterCategory().equals(AArch64.CPU); + assert base.getRegisterCategory().equals(AArch64.CPU); + assert offset.getRegisterCategory().equals(AArch64.CPU); switch (addressingMode) { case IMMEDIATE_SCALED: - assert !base.equals(zr) && offset.equals(zr) && extendType == null && NumUtil.isUnsignedNbit(12, immediate); + assert !base.equals(zr); + assert offset.equals(zr); + assert extendType == null; + assert NumUtil.isUnsignedNbit(12, immediate); break; case IMMEDIATE_UNSCALED: - assert !base.equals(zr) && offset.equals(zr) && extendType == null && NumUtil.isSignedNbit(9, immediate); + assert !base.equals(zr); + assert offset.equals(zr); + assert extendType == null; + assert NumUtil.isSignedNbit(9, immediate); break; case BASE_REGISTER_ONLY: - assert !base.equals(zr) && offset.equals(zr) && extendType == null && immediate == 0; + assert !base.equals(zr); + assert offset.equals(zr); + assert extendType == null; + assert immediate == 0; break; case REGISTER_OFFSET: - assert !base.equals(zr) && offset.getRegisterCategory().equals(AArch64.CPU) && extendType == null && immediate == 0; + assert !base.equals(zr); + assert offset.getRegisterCategory().equals(AArch64.CPU); + assert extendType == null; + assert immediate == 0; break; case EXTENDED_REGISTER_OFFSET: - assert !base.equals(zr) && offset.getRegisterCategory().equals(AArch64.CPU) && (extendType == AArch64Assembler.ExtendType.SXTW || extendType == AArch64Assembler.ExtendType.UXTW) && - immediate == 0; + assert !base.equals(zr); + assert offset.getRegisterCategory().equals(AArch64.CPU); + assert (extendType == AArch64Assembler.ExtendType.SXTW || extendType == AArch64Assembler.ExtendType.UXTW); + assert immediate == 0; break; case PC_LITERAL: - assert base.equals(zr) && offset.equals(zr) && extendType == null && NumUtil.isSignedNbit(21, immediate) && ((immediate & 0x3) == 0); + assert base.equals(zr); + assert offset.equals(zr); + assert extendType == null; + assert NumUtil.isSignedNbit(21, immediate); + assert ((immediate & 0x3) == 0); break; case IMMEDIATE_POST_INDEXED: case IMMEDIATE_PRE_INDEXED: - assert !base.equals(zr) && offset.equals(zr) && extendType == null && NumUtil.isSignedNbit(9, immediate); + assert !base.equals(zr); + assert offset.equals(zr); + assert extendType == null; + assert NumUtil.isSignedNbit(9, immediate); break; default: throw JVMCIError.shouldNotReachHere();
--- a/graal/com.oracle.graal.compiler.aarch64/src/com/oracle/graal/compiler/aarch64/AArch64AddressNode.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.compiler.aarch64/src/com/oracle/graal/compiler/aarch64/AArch64AddressNode.java Thu Feb 04 14:55:15 2016 -0800 @@ -34,6 +34,7 @@ import com.oracle.graal.nodes.spi.LIRLowerable; import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.LIRKind; import jdk.vm.ci.meta.Value; @@ -61,7 +62,7 @@ super(TYPE); this.base = base; this.index = index; - this.addressingMode = AddressingMode.IMMEDIATE_UNSCALED; + this.addressingMode = AddressingMode.REGISTER_OFFSET; } public void generate(NodeLIRBuilderTool gen) { @@ -74,6 +75,7 @@ AllocatableValue indexReference; if (addressingMode.equals(AddressingMode.IMMEDIATE_UNSCALED)) { indexReference = LIRKind.derivedBaseFromValue(indexValue); + throw JVMCIError.unimplemented(); } else { if (indexValue.getLIRKind().isValue()) { indexReference = null; @@ -83,7 +85,8 @@ } LIRKind kind = LIRKind.combineDerived(tool.getLIRKind(stamp()), baseReference, indexReference); - gen.setResult(this, new AArch64AddressValue(kind, baseValue, indexValue, displacement, false, addressingMode)); + final boolean scaled = false; + gen.setResult(this, new AArch64AddressValue(kind, baseValue, indexValue, displacement, scaled, addressingMode)); } public ValueNode getBase() {
--- a/graal/com.oracle.graal.compiler.aarch64/src/com/oracle/graal/compiler/aarch64/AArch64LIRGenerator.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.compiler.aarch64/src/com/oracle/graal/compiler/aarch64/AArch64LIRGenerator.java Thu Feb 04 14:55:15 2016 -0800 @@ -27,10 +27,10 @@ import static jdk.vm.ci.code.ValueUtil.asAllocatableValue; import com.oracle.graal.asm.NumUtil; -import com.oracle.graal.asm.aarch64.AArch64Address; import com.oracle.graal.asm.aarch64.AArch64Address.AddressingMode; import com.oracle.graal.asm.aarch64.AArch64Assembler; import com.oracle.graal.asm.aarch64.AArch64Assembler.ConditionFlag; +import com.oracle.graal.asm.aarch64.AArch64Assembler.ExtendType; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; import com.oracle.graal.compiler.common.spi.LIRKindTool; @@ -156,10 +156,10 @@ base = asAllocatable(getArithmetic().emitAdd(base, constValue, false)); break; case REGISTER_OFFSET: - append(new AArch64ArithmeticOp.ExtendedAddShiftOp(base, base, index, AArch64Assembler.ExtendType.UXTX, shiftAmt)); + append(new AArch64ArithmeticOp.ExtendedAddShiftOp(base, base, index, ExtendType.UXTX, shiftAmt)); break; case EXTENDED_REGISTER_OFFSET: - append(new AArch64ArithmeticOp.ExtendedAddShiftOp(base, base, index, AArch64Assembler.ExtendType.SXTW, shiftAmt)); + append(new AArch64ArithmeticOp.ExtendedAddShiftOp(base, base, index, ExtendType.SXTW, shiftAmt)); break; case BASE_REGISTER_ONLY: // nothing to do. @@ -167,7 +167,7 @@ default: throw JVMCIError.shouldNotReachHere(); } - return new AArch64AddressValue(address.getLIRKind(), base, Value.ILLEGAL, 0, false, AArch64Address.AddressingMode.BASE_REGISTER_ONLY); + return new AArch64AddressValue(address.getLIRKind(), base, Value.ILLEGAL, 0, false, AddressingMode.BASE_REGISTER_ONLY); } @Override @@ -325,7 +325,7 @@ } else { left = loadReg(a); right = loadNonConst(b); - mirrored = true; + mirrored = false; } append(new AArch64Compare.CompareOp(left, asAllocatable(right))); } else {
--- a/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64HotSpotBackend.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64HotSpotBackend.java Thu Feb 04 14:55:15 2016 -0800 @@ -34,16 +34,6 @@ import java.util.Set; -import jdk.vm.ci.code.CallingConvention; -import jdk.vm.ci.code.Register; -import jdk.vm.ci.code.RegisterConfig; -import jdk.vm.ci.code.StackSlot; -import jdk.vm.ci.hotspot.HotSpotCallingConventionType; -import jdk.vm.ci.hotspot.HotSpotVMConfig; -import jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig; -import jdk.vm.ci.meta.JavaType; -import jdk.vm.ci.meta.ResolvedJavaMethod; - import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Label; import com.oracle.graal.asm.aarch64.AArch64Address; @@ -76,6 +66,16 @@ import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.hotspot.HotSpotCallingConventionType; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; + /** * HotSpot AArch64 specific backend. */ @@ -247,7 +247,7 @@ Label verifiedStub = new Label(); emitCodePrefix(crb, installedCodeOwner, masm, regConfig, config, verifiedStub); - emitCodeBody(crb, lir); + emitCodeBody(crb, lir, masm); emitCodeSuffix(crb, masm, config, frameMap); } @@ -272,9 +272,10 @@ masm.ldr(64, klass, klassAddress); } masm.cmp(64, inlineCacheKlass, klass); - // conditional jumps have a much lower range than unconditional ones, which can be a - // problem because - // the miss handler could be out of range. + /* + * Conditional jumps have a much lower range than unconditional ones, which can be a + * problem because the miss handler could be out of range. + */ masm.branchConditionally(AArch64Assembler.ConditionFlag.EQ, verifiedStub); AArch64Call.directJmp(crb, masm, getForeignCalls().lookupForeignCall(IC_MISS_HANDLER)); } @@ -284,7 +285,14 @@ crb.recordMark(config.MARKID_VERIFIED_ENTRY); } - private static void emitCodeBody(CompilationResultBuilder crb, LIR lir) { + private static void emitCodeBody(CompilationResultBuilder crb, LIR lir, AArch64MacroAssembler masm) { + /* + * Insert a nop at the start of the prolog so we can patch in a branch if we need to + * invalidate the method later. + */ + crb.blockComment("[nop for method invalidation]"); + masm.nop(); + crb.emit(lir); }
--- a/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java Thu Feb 04 14:55:15 2016 -0800 @@ -23,7 +23,8 @@ package com.oracle.graal.hotspot.aarch64; -import com.oracle.graal.asm.aarch64.AArch64Address; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.asm.aarch64.AArch64Address.AddressingMode; import com.oracle.graal.compiler.aarch64.AArch64ArithmeticLIRGenerator; import com.oracle.graal.compiler.aarch64.AArch64LIRGenerator; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; @@ -41,7 +42,7 @@ import com.oracle.graal.lir.VirtualStackSlot; import com.oracle.graal.lir.aarch64.AArch64AddressValue; import com.oracle.graal.lir.aarch64.AArch64FrameMapBuilder; -import com.oracle.graal.lir.aarch64.AArch64Move; +import com.oracle.graal.lir.aarch64.AArch64Move.StoreOp; import com.oracle.graal.lir.gen.LIRGenerationResult; import jdk.vm.ci.aarch64.AArch64Kind; @@ -150,8 +151,7 @@ @Override public void emitPrefetchAllocate(Value address) { - // TODO (das) Optimization for later. - throw JVMCIError.unimplemented(); + append(new AArch64PrefetchOp(asAddressValue(address), config.allocatePrefetchInstr)); } @Override @@ -187,8 +187,10 @@ private void moveValueToThread(Value value, int offset) { LIRKind wordKind = LIRKind.value(target().arch.getWordKind()); RegisterValue thread = getProviders().getRegisters().getThreadRegister().asValue(wordKind); - AArch64AddressValue pendingDeoptAddress = new AArch64AddressValue(value.getLIRKind(), thread, Value.ILLEGAL, offset, false, AArch64Address.AddressingMode.IMMEDIATE_UNSCALED); - append(new AArch64Move.StoreOp((AArch64Kind) value.getPlatformKind(), pendingDeoptAddress, loadReg(value), null)); + final int transferSize = value.getLIRKind().getPlatformKind().getSizeInBytes(); + final int scaledDisplacement = offset >> NumUtil.log2Ceil(transferSize); + AArch64AddressValue address = new AArch64AddressValue(value.getLIRKind(), thread, Value.ILLEGAL, scaledDisplacement, true, AddressingMode.IMMEDIATE_SCALED); + append(new StoreOp((AArch64Kind) value.getPlatformKind(), address, loadReg(value), null)); } @Override
--- a/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java Thu Feb 04 14:55:15 2016 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -43,7 +43,7 @@ * Removes the current frame and jumps to the {@link UnwindExceptionToCallerStub}. */ @Opcode("UNWIND") -public class AArch64HotSpotUnwindOp extends AArch64HotSpotEpilogueOp { +public final class AArch64HotSpotUnwindOp extends AArch64HotSpotEpilogueOp { public static final LIRInstructionClass<AArch64HotSpotUnwindOp> TYPE = LIRInstructionClass.create(AArch64HotSpotUnwindOp.class); @Use protected RegisterValue exception;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot.aarch64/src/com/oracle/graal/hotspot/aarch64/AArch64PrefetchOp.java Thu Feb 04 14:55:15 2016 -0800 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2016, 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.hotspot.aarch64; + +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; + +import com.oracle.graal.asm.aarch64.AArch64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.aarch64.AArch64AddressValue; +import com.oracle.graal.lir.aarch64.AArch64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; + +public final class AArch64PrefetchOp extends AArch64LIRInstruction { + public static final LIRInstructionClass<AArch64PrefetchOp> TYPE = LIRInstructionClass.create(AArch64PrefetchOp.class); + + @SuppressWarnings("unused") private final int instr; // AllocatePrefetchInstr + @Alive({COMPOSITE}) protected AArch64AddressValue address; + + public AArch64PrefetchOp(AArch64AddressValue address, int instr) { + super(TYPE); + this.address = address; + this.instr = instr; + } + + @Override + public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { + // TODO implement prefetch + masm.nop(); + } +}
--- a/graal/com.oracle.graal.lir.aarch64/src/com/oracle/graal/lir/aarch64/AArch64AddressValue.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.lir.aarch64/src/com/oracle/graal/lir/aarch64/AArch64AddressValue.java Thu Feb 04 14:55:15 2016 -0800 @@ -24,13 +24,6 @@ import java.util.EnumSet; -import jdk.vm.ci.aarch64.AArch64; -import jdk.vm.ci.code.Register; -import jdk.vm.ci.code.RegisterValue; -import jdk.vm.ci.meta.AllocatableValue; -import jdk.vm.ci.meta.LIRKind; -import jdk.vm.ci.meta.Value; - import com.oracle.graal.asm.aarch64.AArch64Address; import com.oracle.graal.asm.aarch64.AArch64Address.AddressingMode; import com.oracle.graal.asm.aarch64.AArch64Assembler; @@ -41,6 +34,13 @@ import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; +import jdk.vm.ci.aarch64.AArch64; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; + public final class AArch64AddressValue extends CompositeValue { private static final EnumSet<OperandFlag> flags = EnumSet.of(OperandFlag.REG, OperandFlag.ILLEGAL);
--- a/graal/com.oracle.graal.lir.aarch64/src/com/oracle/graal/lir/aarch64/AArch64FrameMap.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.lir.aarch64/src/com/oracle/graal/lir/aarch64/AArch64FrameMap.java Thu Feb 04 14:55:15 2016 -0800 @@ -91,7 +91,7 @@ private int frameSetupSize() { // Size of return address and frame pointer that are saved in function prologue - return getTarget().arch.getWordSize() * 2; + return returnAddressSize() + getTarget().arch.getWordSize(); } @Override @@ -110,7 +110,6 @@ } public StackSlot allocateDeoptimizationRescueSlot() { - // XXX This is very likely not correct. assert spillSize == initialSpillSize : "Deoptimization rescue slot must be the first stack slot"; return allocateSpillSlot(LIRKind.value(AArch64Kind.QWORD)); }
--- a/graal/com.oracle.graal.lir.aarch64/src/com/oracle/graal/lir/aarch64/AArch64SignExtendOp.java Thu Feb 04 11:31:50 2016 -0800 +++ b/graal/com.oracle.graal.lir.aarch64/src/com/oracle/graal/lir/aarch64/AArch64SignExtendOp.java Thu Feb 04 14:55:15 2016 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -29,8 +29,10 @@ import com.oracle.graal.asm.aarch64.AArch64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.asm.CompilationResultBuilder; +@Opcode("SIGNEXTEND") public class AArch64SignExtendOp extends AArch64LIRInstruction { private static final LIRInstructionClass<AArch64SignExtendOp> TYPE = LIRInstructionClass.create(AArch64SignExtendOp.class);