From 035363ac9156808cbf3eaa603c6be24f25dcee39 Mon Sep 17 00:00:00 2001 From: Haicheng Wu Date: Fri, 20 Jan 2017 03:40:41 +0000 Subject: [PATCH] Revert "Recommit "[InlineCost] Use TTI to check if GEP is free."" This reverts commit r292570. The test still has problem. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@292572 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/InlineCost.cpp | 20 ++------------------ test/Transforms/Inline/gep-cost.ll | 30 ------------------------------ 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 test/Transforms/Inline/gep-cost.ll diff --git a/lib/Analysis/InlineCost.cpp b/lib/Analysis/InlineCost.cpp index b6c3997dae3..4109049ecab 100644 --- a/lib/Analysis/InlineCost.cpp +++ b/lib/Analysis/InlineCost.cpp @@ -134,7 +134,6 @@ class CallAnalyzer : public InstVisitor { void accumulateSROACost(DenseMap::iterator CostIt, int InstructionCost); bool isGEPOffsetConstant(GetElementPtrInst &GEP); - bool isGEPFree(GetElementPtrInst &GEP); bool accumulateGEPOffset(GEPOperator &GEP, APInt &Offset); bool simplifyCallSite(Function *F, CallSite CS); ConstantInt *stripAndComputeInBoundsConstantOffsets(Value *&V); @@ -332,21 +331,6 @@ bool CallAnalyzer::accumulateGEPOffset(GEPOperator &GEP, APInt &Offset) { return true; } -/// \brief Use TTI to check whether a GEP is free. -/// -/// Respects any simplified values known during the analysis of this callsite. -bool CallAnalyzer::isGEPFree(GetElementPtrInst &GEP) { - SmallVector Indices; - for (User::op_iterator I = GEP.idx_begin(), E = GEP.idx_end(); I != E; ++I) - if (Constant *SimpleOp = SimplifiedValues.lookup(*I)) - Indices.push_back(SimpleOp); - else - Indices.push_back(*I); - return TargetTransformInfo::TCC_Free == - TTI.getGEPCost(GEP.getSourceElementType(), GEP.getPointerOperand(), - Indices); -} - bool CallAnalyzer::visitAlloca(AllocaInst &I) { // Check whether inlining will turn a dynamic alloca into a static // alloca and handle that case. @@ -412,7 +396,7 @@ bool CallAnalyzer::visitGetElementPtr(GetElementPtrInst &I) { // Non-constant GEPs aren't folded, and disable SROA. if (SROACandidate) disableSROA(CostIt); - return isGEPFree(I); + return false; } // Add the result as a new mapping to Base + Offset. @@ -438,7 +422,7 @@ bool CallAnalyzer::visitGetElementPtr(GetElementPtrInst &I) { // Variable GEPs will require math and will disable SROA. if (SROACandidate) disableSROA(CostIt); - return isGEPFree(I); + return false; } bool CallAnalyzer::visitBitCast(BitCastInst &I) { diff --git a/test/Transforms/Inline/gep-cost.ll b/test/Transforms/Inline/gep-cost.ll deleted file mode 100644 index 442f7589176..00000000000 --- a/test/Transforms/Inline/gep-cost.ll +++ /dev/null @@ -1,30 +0,0 @@ -; REQUIRES: asserts -; RUN: opt -inline < %s -mtriple=aarch64--linux-gnu -mcpu=kryo -S -debug-only=inline-cost 2>&1 | FileCheck %s - -target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128" -target triple = "aarch64--linux-gnu" - -define void @outer([4 x i32]* %ptr, i32 %i) { - call void @inner1([4 x i32]* %ptr, i32 %i) - call void @inner2([4 x i32]* %ptr, i32 %i) - ret void -} -; The gep in inner1() is reg+reg, which is a legal addressing mode for AArch64. -; Thus, both the gep and ret can be simplified. -; CHECK: Analyzing call of inner1 -; CHECK: NumInstructionsSimplified: 2 -; CHECK: NumInstructions: 2 -define void @inner1([4 x i32]* %ptr, i32 %i) { - %G = getelementptr inbounds [4 x i32], [4 x i32]* %ptr, i32 0, i32 %i - ret void -} - -; The gep in inner2() is reg+imm+reg, which is not a legal addressing mode for -; AArch64. Thus, only the ret can be simplified and not the gep. -; CHECK: Analyzing call of inner2 -; CHECK: NumInstructionsSimplified: 1 -; CHECK: NumInstructions: 2 -define void @inner2([4 x i32]* %ptr, i32 %i) { - %G = getelementptr inbounds [4 x i32], [4 x i32]* %ptr, i32 1, i32 %i - ret void -} -- 2.11.0