From b026a8ade1d1c864ef4d965164b941df4769dff0 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Wed, 29 Jul 2015 22:09:48 +0000 Subject: [PATCH] Rename hasCompatibleFunctionAttributes->areInlineCompatible based on suggestions. Currently the function is only used for inline purposes and this is more descriptive for the use. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243578 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Analysis/TargetTransformInfo.h | 14 +++++++------- include/llvm/Analysis/TargetTransformInfoImpl.h | 4 ++-- lib/Analysis/IPA/InlineCost.cpp | 2 +- lib/Analysis/TargetTransformInfo.cpp | 6 +++--- lib/Target/X86/X86TargetTransformInfo.cpp | 4 ++-- lib/Target/X86/X86TargetTransformInfo.h | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/llvm/Analysis/TargetTransformInfo.h b/include/llvm/Analysis/TargetTransformInfo.h index a85174a1081..fd3cfe72921 100644 --- a/include/llvm/Analysis/TargetTransformInfo.h +++ b/include/llvm/Analysis/TargetTransformInfo.h @@ -527,8 +527,8 @@ public: /// \returns True if the two functions have compatible attributes for inlining /// purposes. - bool hasCompatibleFunctionAttributes(const Function *Caller, - const Function *Callee) const; + bool areInlineCompatible(const Function *Caller, + const Function *Callee) const; /// @} @@ -631,8 +631,8 @@ public: MemIntrinsicInfo &Info) = 0; virtual Value *getOrCreateResultFromMemIntrinsic(IntrinsicInst *Inst, Type *ExpectedType) = 0; - virtual bool hasCompatibleFunctionAttributes(const Function *Caller, - const Function *Callee) const = 0; + virtual bool areInlineCompatible(const Function *Caller, + const Function *Callee) const = 0; }; template @@ -825,9 +825,9 @@ public: Type *ExpectedType) override { return Impl.getOrCreateResultFromMemIntrinsic(Inst, ExpectedType); } - bool hasCompatibleFunctionAttributes(const Function *Caller, - const Function *Callee) const override { - return Impl.hasCompatibleFunctionAttributes(Caller, Callee); + bool areInlineCompatible(const Function *Caller, + const Function *Callee) const override { + return Impl.areInlineCompatible(Caller, Callee); } }; diff --git a/include/llvm/Analysis/TargetTransformInfoImpl.h b/include/llvm/Analysis/TargetTransformInfoImpl.h index 2abe0a58b84..9805f6bc663 100644 --- a/include/llvm/Analysis/TargetTransformInfoImpl.h +++ b/include/llvm/Analysis/TargetTransformInfoImpl.h @@ -325,8 +325,8 @@ public: return nullptr; } - bool hasCompatibleFunctionAttributes(const Function *Caller, - const Function *Callee) const { + bool areInlineCompatible(const Function *Caller, + const Function *Callee) const { return (Caller->getFnAttribute("target-cpu") == Callee->getFnAttribute("target-cpu")) && (Caller->getFnAttribute("target-features") == diff --git a/lib/Analysis/IPA/InlineCost.cpp b/lib/Analysis/IPA/InlineCost.cpp index c0d2e375cb0..6d53b48832d 100644 --- a/lib/Analysis/IPA/InlineCost.cpp +++ b/lib/Analysis/IPA/InlineCost.cpp @@ -1346,7 +1346,7 @@ static bool attributeMatches(Function *F1, Function *F2, AttrKind Attr) { static bool functionsHaveCompatibleAttributes(Function *Caller, Function *Callee, TargetTransformInfo &TTI) { - return TTI.hasCompatibleFunctionAttributes(Caller, Callee) && + return TTI.areInlineCompatible(Caller, Callee) && attributeMatches(Caller, Callee, Attribute::SanitizeAddress) && attributeMatches(Caller, Callee, Attribute::SanitizeMemory) && attributeMatches(Caller, Callee, Attribute::SanitizeThread); diff --git a/lib/Analysis/TargetTransformInfo.cpp b/lib/Analysis/TargetTransformInfo.cpp index b426b2f121c..731aae23a26 100644 --- a/lib/Analysis/TargetTransformInfo.cpp +++ b/lib/Analysis/TargetTransformInfo.cpp @@ -288,9 +288,9 @@ Value *TargetTransformInfo::getOrCreateResultFromMemIntrinsic( return TTIImpl->getOrCreateResultFromMemIntrinsic(Inst, ExpectedType); } -bool TargetTransformInfo::hasCompatibleFunctionAttributes( - const Function *Caller, const Function *Callee) const { - return TTIImpl->hasCompatibleFunctionAttributes(Caller, Callee); +bool TargetTransformInfo::areInlineCompatible(const Function *Caller, + const Function *Callee) const { + return TTIImpl->areInlineCompatible(Caller, Callee); } TargetTransformInfo::Concept::~Concept() {} diff --git a/lib/Target/X86/X86TargetTransformInfo.cpp b/lib/Target/X86/X86TargetTransformInfo.cpp index 04c16f8dfc7..673aefd046f 100644 --- a/lib/Target/X86/X86TargetTransformInfo.cpp +++ b/lib/Target/X86/X86TargetTransformInfo.cpp @@ -1135,8 +1135,8 @@ bool X86TTIImpl::isLegalMaskedStore(Type *DataType, int Consecutive) { return isLegalMaskedLoad(DataType, Consecutive); } -bool X86TTIImpl::hasCompatibleFunctionAttributes(const Function *Caller, - const Function *Callee) const { +bool X86TTIImpl::areInlineCompatible(const Function *Caller, + const Function *Callee) const { const TargetMachine &TM = getTLI()->getTargetMachine(); // Work this as a subsetting of subtarget features. diff --git a/lib/Target/X86/X86TargetTransformInfo.h b/lib/Target/X86/X86TargetTransformInfo.h index da3f36c2e27..23efcade51d 100644 --- a/lib/Target/X86/X86TargetTransformInfo.h +++ b/lib/Target/X86/X86TargetTransformInfo.h @@ -92,8 +92,8 @@ public: Type *Ty); bool isLegalMaskedLoad(Type *DataType, int Consecutive); bool isLegalMaskedStore(Type *DataType, int Consecutive); - bool hasCompatibleFunctionAttributes(const Function *Caller, - const Function *Callee) const; + bool areInlineCompatible(const Function *Caller, + const Function *Callee) const; /// @} }; -- 2.34.1