diff --git a/include/llvm/Analysis/FunctionTargetTransformInfo.h b/include/llvm/Analysis/FunctionTargetTransformInfo.h index fce5a1a92bd..a3217293010 100644 --- a/include/llvm/Analysis/FunctionTargetTransformInfo.h +++ b/include/llvm/Analysis/FunctionTargetTransformInfo.h @@ -42,7 +42,7 @@ public: void getUnrollingPreferences(Loop *L, TargetTransformInfo::UnrollingPreferences &UP) const { - TTI->getUnrollingPreferences(Fn, L, UP); + TTI->getUnrollingPreferences(L, UP); } }; } diff --git a/include/llvm/Analysis/TargetTransformInfo.h b/include/llvm/Analysis/TargetTransformInfo.h index 1d3db7bfe45..53da46019b3 100644 --- a/include/llvm/Analysis/TargetTransformInfo.h +++ b/include/llvm/Analysis/TargetTransformInfo.h @@ -249,8 +249,7 @@ public: /// \brief Get target-customized preferences for the generic loop unrolling /// transformation. The caller will initialize UP with the current /// target-independent defaults. - void getUnrollingPreferences(const Function *F, Loop *L, - UnrollingPreferences &UP) const; + void getUnrollingPreferences(Loop *L, UnrollingPreferences &UP) const; /// @} @@ -499,8 +498,7 @@ public: virtual unsigned getUserCost(const User *U) = 0; virtual bool hasBranchDivergence() = 0; virtual bool isLoweredToCall(const Function *F) = 0; - virtual void getUnrollingPreferences(const Function *F, Loop *L, - UnrollingPreferences &UP) = 0; + virtual void getUnrollingPreferences(Loop *L, UnrollingPreferences &UP) = 0; virtual bool isLegalAddImmediate(int64_t Imm) = 0; virtual bool isLegalICmpImmediate(int64_t Imm) = 0; virtual bool isLegalAddressingMode(Type *Ty, GlobalValue *BaseGV, @@ -596,9 +594,8 @@ public: bool isLoweredToCall(const Function *F) override { return Impl.isLoweredToCall(F); } - void getUnrollingPreferences(const Function *F, Loop *L, - UnrollingPreferences &UP) override { - return Impl.getUnrollingPreferences(F, L, UP); + void getUnrollingPreferences(Loop *L, UnrollingPreferences &UP) override { + return Impl.getUnrollingPreferences(L, UP); } bool isLegalAddImmediate(int64_t Imm) override { return Impl.isLegalAddImmediate(Imm); diff --git a/include/llvm/Analysis/TargetTransformInfoImpl.h b/include/llvm/Analysis/TargetTransformInfoImpl.h index 01fb8b6da78..488f96e6ade 100644 --- a/include/llvm/Analysis/TargetTransformInfoImpl.h +++ b/include/llvm/Analysis/TargetTransformInfoImpl.h @@ -198,8 +198,7 @@ public: return true; } - void getUnrollingPreferences(const Function *, Loop *, - TTI::UnrollingPreferences &) {} + void getUnrollingPreferences(Loop *, TTI::UnrollingPreferences &) {} bool isLegalAddImmediate(int64_t Imm) { return false; } diff --git a/include/llvm/CodeGen/BasicTTIImpl.h b/include/llvm/CodeGen/BasicTTIImpl.h index d7129579cf0..61664327244 100644 --- a/include/llvm/CodeGen/BasicTTIImpl.h +++ b/include/llvm/CodeGen/BasicTTIImpl.h @@ -167,8 +167,7 @@ public: TLI->isOperationLegalOrCustom(ISD::FSQRT, VT); } - void getUnrollingPreferences(const Function *F, Loop *L, - TTI::UnrollingPreferences &UP) { + void getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP) { // This unrolling functionality is target independent, but to provide some // motivation for its intended use, for x86: diff --git a/lib/Analysis/TargetTransformInfo.cpp b/lib/Analysis/TargetTransformInfo.cpp index d51cfb347ff..5a50d36ee8b 100644 --- a/lib/Analysis/TargetTransformInfo.cpp +++ b/lib/Analysis/TargetTransformInfo.cpp @@ -81,8 +81,8 @@ bool TargetTransformInfo::isLoweredToCall(const Function *F) const { } void TargetTransformInfo::getUnrollingPreferences( - const Function *F, Loop *L, UnrollingPreferences &UP) const { - return TTIImpl->getUnrollingPreferences(F, L, UP); + Loop *L, UnrollingPreferences &UP) const { + return TTIImpl->getUnrollingPreferences(L, UP); } bool TargetTransformInfo::isLegalAddImmediate(int64_t Imm) const { diff --git a/lib/Target/AArch64/AArch64TargetTransformInfo.cpp b/lib/Target/AArch64/AArch64TargetTransformInfo.cpp index eab080bb24c..0646d855ab7 100644 --- a/lib/Target/AArch64/AArch64TargetTransformInfo.cpp +++ b/lib/Target/AArch64/AArch64TargetTransformInfo.cpp @@ -424,7 +424,7 @@ unsigned AArch64TTIImpl::getMaxInterleaveFactor() { return 2; } -void AArch64TTIImpl::getUnrollingPreferences(const Function *F, Loop *L, +void AArch64TTIImpl::getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP) { // Disable partial & runtime unrolling on -Os. UP.PartialOptSizeThreshold = 0; diff --git a/lib/Target/AArch64/AArch64TargetTransformInfo.h b/lib/Target/AArch64/AArch64TargetTransformInfo.h index fffeb981b53..dd3fd1f5ab7 100644 --- a/lib/Target/AArch64/AArch64TargetTransformInfo.h +++ b/lib/Target/AArch64/AArch64TargetTransformInfo.h @@ -132,8 +132,7 @@ public: unsigned getCostOfKeepingLiveOverCall(ArrayRef Tys); - void getUnrollingPreferences(const Function *F, Loop *L, - TTI::UnrollingPreferences &UP); + void getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP); Value *getOrCreateResultFromMemIntrinsic(IntrinsicInst *Inst, Type *ExpectedType); diff --git a/lib/Target/PowerPC/PPCTargetTransformInfo.cpp b/lib/Target/PowerPC/PPCTargetTransformInfo.cpp index 98fe5cdd8db..4003b1b0812 100644 --- a/lib/Target/PowerPC/PPCTargetTransformInfo.cpp +++ b/lib/Target/PowerPC/PPCTargetTransformInfo.cpp @@ -181,7 +181,7 @@ unsigned PPCTTIImpl::getIntImmCost(unsigned Opcode, unsigned Idx, return PPCTTIImpl::getIntImmCost(Imm, Ty); } -void PPCTTIImpl::getUnrollingPreferences(const Function *F, Loop *L, +void PPCTTIImpl::getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP) { if (ST->getDarwinDirective() == PPC::DIR_A2) { // The A2 is in-order with a deep pipeline, and concatenation unrolling @@ -189,7 +189,7 @@ void PPCTTIImpl::getUnrollingPreferences(const Function *F, Loop *L, UP.Partial = UP.Runtime = true; } - BaseT::getUnrollingPreferences(F, L, UP); + BaseT::getUnrollingPreferences(L, UP); } unsigned PPCTTIImpl::getNumberOfRegisters(bool Vector) { diff --git a/lib/Target/PowerPC/PPCTargetTransformInfo.h b/lib/Target/PowerPC/PPCTargetTransformInfo.h index 0429a26c200..cef70794234 100644 --- a/lib/Target/PowerPC/PPCTargetTransformInfo.h +++ b/lib/Target/PowerPC/PPCTargetTransformInfo.h @@ -71,8 +71,7 @@ public: Type *Ty); TTI::PopcntSupportKind getPopcntSupport(unsigned TyWidth); - void getUnrollingPreferences(const Function *F, Loop *L, - TTI::UnrollingPreferences &UP); + void getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP); /// @} diff --git a/lib/Target/R600/AMDGPUTargetTransformInfo.cpp b/lib/Target/R600/AMDGPUTargetTransformInfo.cpp index be7b2f42971..4647ddf038e 100644 --- a/lib/Target/R600/AMDGPUTargetTransformInfo.cpp +++ b/lib/Target/R600/AMDGPUTargetTransformInfo.cpp @@ -27,7 +27,7 @@ using namespace llvm; #define DEBUG_TYPE "AMDGPUtti" -void AMDGPUTTIImpl::getUnrollingPreferences(const Function *, Loop *L, +void AMDGPUTTIImpl::getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP) { UP.Threshold = 300; // Twice the default. UP.Count = UINT_MAX; diff --git a/lib/Target/R600/AMDGPUTargetTransformInfo.h b/lib/Target/R600/AMDGPUTargetTransformInfo.h index 4c410330206..4abbdf20e76 100644 --- a/lib/Target/R600/AMDGPUTargetTransformInfo.h +++ b/lib/Target/R600/AMDGPUTargetTransformInfo.h @@ -61,8 +61,7 @@ public: bool hasBranchDivergence() { return true; } - void getUnrollingPreferences(const Function *F, Loop *L, - TTI::UnrollingPreferences &UP); + void getUnrollingPreferences(Loop *L, TTI::UnrollingPreferences &UP); TTI::PopcntSupportKind getPopcntSupport(unsigned TyWidth) { assert(isPowerOf2_32(TyWidth) && "Ty width must be power of 2");