Reapply r99451 with a fix to move the NoInline check to the cost functions
instead of InlineFunction. llvm-svn: 99483
This commit is contained in:
parent
e2a504ee82
commit
b1a382d8b9
|
@ -971,6 +971,13 @@ public:
|
||||||
unsigned getParamAlignment(unsigned i) const {
|
unsigned getParamAlignment(unsigned i) const {
|
||||||
return AttributeList.getParamAlignment(i);
|
return AttributeList.getParamAlignment(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @brief Return true if the call should not be inlined.
|
||||||
|
bool isNoInline() const { return paramHasAttr(~0, Attribute::NoInline); }
|
||||||
|
void setIsNoInline(bool Value) {
|
||||||
|
if (Value) addAttribute(~0, Attribute::NoInline);
|
||||||
|
else removeAttribute(~0, Attribute::NoInline);
|
||||||
|
}
|
||||||
|
|
||||||
/// @brief Determine if the call does not access memory.
|
/// @brief Determine if the call does not access memory.
|
||||||
bool doesNotAccessMemory() const {
|
bool doesNotAccessMemory() const {
|
||||||
|
@ -2456,6 +2463,13 @@ public:
|
||||||
return AttributeList.getParamAlignment(i);
|
return AttributeList.getParamAlignment(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @brief Return true if the call should not be inlined.
|
||||||
|
bool isNoInline() const { return paramHasAttr(~0, Attribute::NoInline); }
|
||||||
|
void setIsNoInline(bool Value) {
|
||||||
|
if (Value) addAttribute(~0, Attribute::NoInline);
|
||||||
|
else removeAttribute(~0, Attribute::NoInline);
|
||||||
|
}
|
||||||
|
|
||||||
/// @brief Determine if the call does not access memory.
|
/// @brief Determine if the call does not access memory.
|
||||||
bool doesNotAccessMemory() const {
|
bool doesNotAccessMemory() const {
|
||||||
return paramHasAttr(~0, Attribute::ReadNone);
|
return paramHasAttr(~0, Attribute::ReadNone);
|
||||||
|
|
|
@ -76,6 +76,10 @@ public:
|
||||||
/// @brief Extract the alignment for a call or parameter (0=unknown).
|
/// @brief Extract the alignment for a call or parameter (0=unknown).
|
||||||
uint16_t getParamAlignment(uint16_t i) const;
|
uint16_t getParamAlignment(uint16_t i) const;
|
||||||
|
|
||||||
|
/// @brief Return true if the call should not be inlined.
|
||||||
|
bool isNoInline() const;
|
||||||
|
void setIsNoInline(bool Value = true);
|
||||||
|
|
||||||
/// @brief Determine if the call does not access memory.
|
/// @brief Determine if the call does not access memory.
|
||||||
bool doesNotAccessMemory() const;
|
bool doesNotAccessMemory() const;
|
||||||
void setDoesNotAccessMemory(bool doesNotAccessMemory = true);
|
void setDoesNotAccessMemory(bool doesNotAccessMemory = true);
|
||||||
|
|
|
@ -255,9 +255,11 @@ InlineCost InlineCostAnalyzer::getInlineCost(CallSite CS,
|
||||||
Function *Caller = TheCall->getParent()->getParent();
|
Function *Caller = TheCall->getParent()->getParent();
|
||||||
|
|
||||||
// Don't inline functions which can be redefined at link-time to mean
|
// Don't inline functions which can be redefined at link-time to mean
|
||||||
// something else. Don't inline functions marked noinline.
|
// something else. Don't inline functions marked noinline or call sites
|
||||||
|
// marked noinline.
|
||||||
if (Callee->mayBeOverridden() ||
|
if (Callee->mayBeOverridden() ||
|
||||||
Callee->hasFnAttr(Attribute::NoInline) || NeverInline.count(Callee))
|
Callee->hasFnAttr(Attribute::NoInline) || NeverInline.count(Callee) ||
|
||||||
|
CS.isNoInline())
|
||||||
return llvm::InlineCost::getNever();
|
return llvm::InlineCost::getNever();
|
||||||
|
|
||||||
// InlineCost - This value measures how good of an inline candidate this call
|
// InlineCost - This value measures how good of an inline candidate this call
|
||||||
|
|
|
@ -31,13 +31,13 @@ using namespace llvm;
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#define CALLSITE_DELEGATE_GETTER(METHOD) \
|
#define CALLSITE_DELEGATE_GETTER(METHOD) \
|
||||||
Instruction *II(getInstruction()); \
|
Instruction *II = getInstruction(); \
|
||||||
return isCall() \
|
return isCall() \
|
||||||
? cast<CallInst>(II)->METHOD \
|
? cast<CallInst>(II)->METHOD \
|
||||||
: cast<InvokeInst>(II)->METHOD
|
: cast<InvokeInst>(II)->METHOD
|
||||||
|
|
||||||
#define CALLSITE_DELEGATE_SETTER(METHOD) \
|
#define CALLSITE_DELEGATE_SETTER(METHOD) \
|
||||||
Instruction *II(getInstruction()); \
|
Instruction *II = getInstruction(); \
|
||||||
if (isCall()) \
|
if (isCall()) \
|
||||||
cast<CallInst>(II)->METHOD; \
|
cast<CallInst>(II)->METHOD; \
|
||||||
else \
|
else \
|
||||||
|
@ -66,6 +66,17 @@ bool CallSite::paramHasAttr(uint16_t i, Attributes attr) const {
|
||||||
uint16_t CallSite::getParamAlignment(uint16_t i) const {
|
uint16_t CallSite::getParamAlignment(uint16_t i) const {
|
||||||
CALLSITE_DELEGATE_GETTER(getParamAlignment(i));
|
CALLSITE_DELEGATE_GETTER(getParamAlignment(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @brief Return true if the call should not be inlined.
|
||||||
|
bool CallSite::isNoInline() const {
|
||||||
|
CALLSITE_DELEGATE_GETTER(isNoInline());
|
||||||
|
}
|
||||||
|
|
||||||
|
void CallSite::setIsNoInline(bool Value) {
|
||||||
|
CALLSITE_DELEGATE_GETTER(setIsNoInline(Value));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool CallSite::doesNotAccessMemory() const {
|
bool CallSite::doesNotAccessMemory() const {
|
||||||
CALLSITE_DELEGATE_GETTER(doesNotAccessMemory());
|
CALLSITE_DELEGATE_GETTER(doesNotAccessMemory());
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
; RUN: opt %s -inline -S | FileCheck %s
|
||||||
|
; PR6682
|
||||||
|
declare void @foo() nounwind
|
||||||
|
|
||||||
|
define void @bar() nounwind {
|
||||||
|
entry:
|
||||||
|
tail call void @foo() nounwind
|
||||||
|
ret void
|
||||||
|
}
|
||||||
|
|
||||||
|
define void @bazz() nounwind {
|
||||||
|
entry:
|
||||||
|
tail call void @bar() nounwind noinline
|
||||||
|
ret void
|
||||||
|
}
|
||||||
|
|
||||||
|
; CHECK: define void @bazz()
|
||||||
|
; CHECK: call void @bar()
|
Loading…
Reference in New Issue