Add InlineCost class for represent the estimated cost of inlining a
function.
- This explicitly models the costs for functions which should
"always" or "never" be inlined. This fixes bugs where such costs
were not previously respected.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58450 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Utils/BasicInliner.cpp b/lib/Transforms/Utils/BasicInliner.cpp
index ba1fb3d..73e8bd8 100644
--- a/lib/Transforms/Utils/BasicInliner.cpp
+++ b/lib/Transforms/Utils/BasicInliner.cpp
@@ -107,16 +107,27 @@
--index;
continue;
}
- int InlineCost = CA.getInlineCost(CS, NeverInline);
- if (InlineCost >= (int) BasicInlineThreshold) {
- DOUT << " NOT Inlining: cost = " << InlineCost
- << ", call: " << *CS.getInstruction();
+ InlineCost IC = CA.getInlineCost(CS, NeverInline);
+ if (IC.isAlways()) {
+ DOUT << " Inlining: cost=always"
+ <<", call: " << *CS.getInstruction();
+ } else if (IC.isNever()) {
+ DOUT << " NOT Inlining: cost=never"
+ <<", call: " << *CS.getInstruction();
continue;
+ } else {
+ int Cost = IC.getValue();
+
+ if (Cost >= BasicInlineThreshold) {
+ DOUT << " NOT Inlining: cost = " << Cost
+ << ", call: " << *CS.getInstruction();
+ continue;
+ } else {
+ DOUT << " Inlining: cost = " << Cost
+ << ", call: " << *CS.getInstruction();
+ }
}
- DOUT << " Inlining: cost=" << InlineCost
- <<", call: " << *CS.getInstruction();
-
// Inline
if (InlineFunction(CS, NULL, TD)) {
if (Callee->use_empty() && Callee->hasInternalLinkage())
diff --git a/lib/Transforms/Utils/InlineCost.cpp b/lib/Transforms/Utils/InlineCost.cpp
index c665b12..b85a455 100644
--- a/lib/Transforms/Utils/InlineCost.cpp
+++ b/lib/Transforms/Utils/InlineCost.cpp
@@ -169,7 +169,7 @@
// getInlineCost - The heuristic used to determine if we should inline the
// function call or not.
//
-int InlineCostAnalyzer::getInlineCost(CallSite CS,
+InlineCost InlineCostAnalyzer::getInlineCost(CallSite CS,
SmallPtrSet<const Function *, 16> &NeverInline) {
Instruction *TheCall = CS.getInstruction();
Function *Callee = CS.getCalledFunction();
@@ -187,7 +187,7 @@
// Don't inline functions marked noinline.
NeverInline.count(Callee))
- return 2000000000;
+ return llvm::InlineCost::getNever();
// InlineCost - This value measures how good of an inline candidate this call
// site is to inline. A lower inline cost make is more likely for the call to
@@ -224,10 +224,14 @@
// If we should never inline this, return a huge cost.
if (CalleeFI.NeverInline)
- return 2000000000;
+ return InlineCost::getNever();
+ // FIXME: It would be nice to kill off CalleeFI.NeverInline. Then we
+ // could move this up and avoid computing the FunctionInfo for
+ // things we are going to just return always inline for. This
+ // requires handling setjmp somewhere else, however.
if (!Callee->isDeclaration() && Callee->hasFnAttr(Attribute::AlwaysInline))
- return -2000000000;
+ return InlineCost::getAlways();
// Add to the inline quality for properties that make the call valuable to
// inline. This includes factors that indicate that the result of inlining
@@ -274,7 +278,7 @@
// Look at the size of the callee. Each instruction counts as 5.
InlineCost += CalleeFI.NumInsts*5;
- return InlineCost;
+ return llvm::InlineCost::get(InlineCost);
}
// getInlineFudgeFactor - Return a > 1.0 factor if the inliner should use a