From d24494d672f750493a6456ed76500aec053c24b0 Mon Sep 17 00:00:00 2001 From: Juergen Ributzka Date: Thu, 28 Aug 2014 00:09:46 +0000 Subject: [PATCH] [FastISel] Currently instructions are folded very aggressively for AArch64 into the memory operation, which can lead to the use of killed operands: %vreg1 = ADDXri %vreg0, 2 %vreg2 = LDRBBui %vreg0, 2 ... = ... %vreg1 ... This usually happens when the result is also used by another non-memory instruction in the same basic block, or any instruction in another basic block. This fix teaches hasTrivialKill to not only check the LLVM IR that the value has a single use, but also to check if the register that represents that value has already been used. This can happen when the instruction with the use was folded into another instruction (in this particular case a load instruction). This fixes rdar://problem/18142857. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216634 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/FastISel.h | 2 +- lib/CodeGen/SelectionDAG/FastISel.cpp | 9 ++++++++- test/CodeGen/AArch64/fast-isel-addressing-modes.ll | 10 ++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/llvm/CodeGen/FastISel.h b/include/llvm/CodeGen/FastISel.h index b0503f0391f..ed370c3e67c 100644 --- a/include/llvm/CodeGen/FastISel.h +++ b/include/llvm/CodeGen/FastISel.h @@ -525,7 +525,7 @@ protected: bool canFoldAddIntoGEP(const User *GEP, const Value *Add); /// Test whether the given value has exactly one use. - bool hasTrivialKill(const Value *V) const; + bool hasTrivialKill(const Value *V); /// \brief Create a machine mem operand from the given instruction. MachineMemOperand *createMachineMemOperandFor(const Instruction *I) const; diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp index 0a81662e9a3..1896c67d177 100644 --- a/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -131,7 +131,7 @@ void FastISel::flushLocalValueMap() { recomputeInsertPt(); } -bool FastISel::hasTrivialKill(const Value *V) const { +bool FastISel::hasTrivialKill(const Value *V) { // Don't consider constants or arguments to have trivial kills. const Instruction *I = dyn_cast(V); if (!I) @@ -143,6 +143,13 @@ bool FastISel::hasTrivialKill(const Value *V) const { !hasTrivialKill(Cast->getOperand(0))) return false; + // Even the value might have only one use in the LLVM IR, it is possible that + // FastISel might fold the use into another instruction and now there is more + // than one use at the Machine Instruction level. + unsigned Reg = lookUpRegForValue(V); + if (Reg && !MRI.use_empty(Reg)) + return false; + // GEPs with all zero indices are trivially coalesced by fast-isel. if (const GetElementPtrInst *GEP = dyn_cast(I)) if (GEP->hasAllZeroIndices() && !hasTrivialKill(GEP->getOperand(0))) diff --git a/test/CodeGen/AArch64/fast-isel-addressing-modes.ll b/test/CodeGen/AArch64/fast-isel-addressing-modes.ll index 750e081d423..86755d90c63 100644 --- a/test/CodeGen/AArch64/fast-isel-addressing-modes.ll +++ b/test/CodeGen/AArch64/fast-isel-addressing-modes.ll @@ -478,3 +478,13 @@ define i64 @load_breg_sext_shift_offreg_imm1(i32 %a, i64 %b) { ret i64 %6 } +; Test that the kill flag is not set - the machine instruction verifier does that for us. +define i64 @kill_reg(i64 %a) { + %1 = sub i64 %a, 8 + %2 = add i64 %1, 96 + %3 = inttoptr i64 %2 to i64* + %4 = load i64* %3 + %5 = add i64 %2, %4 + ret i64 %5 +} + -- 2.34.1