diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Analysis/InlineCost.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp index 3cb56f8cccf..b7b58d8aca3 100644 --- a/llvm/lib/Analysis/InlineCost.cpp +++ b/llvm/lib/Analysis/InlineCost.cpp @@ -897,7 +897,15 @@ void CallAnalyzer::updateThreshold(CallBase &Call, Function &Callee) { // and the callsite. int SingleBBBonusPercent = 50; int VectorBonusPercent = 150; - int LastCallToStaticBonus = InlineConstants::LastCallToStaticBonus; + + int LastCallToStaticBonus = 0; + bool OnlyOneCallAndLocalLinkage = + F.hasLocalLinkage() && F.hasOneUse() && &F == Call.getCalledFunction(); + // If there is only one call of the function, and it has internal linkage, + // we can allow to inline pretty anything as it will lead to size reduction + // anyway. + if (OnlyOneCallAndLocalLinkage) + LastCallToStaticBonus = InlineConstants::LastCallToStaticBonus; // Lambda to set all the above bonus and bonus percentages to 0. auto DisallowAllBonuses = [&]() { @@ -970,20 +978,13 @@ void CallAnalyzer::updateThreshold(CallBase &Call, Function &Callee) { } } - // Finally, take the target-specific inlining threshold multiplier into - // account. + // Take the target-specific inlining threshold multiplier into account. Threshold *= TTI.getInliningThresholdMultiplier(); SingleBBBonus = Threshold * SingleBBBonusPercent / 100; VectorBonus = Threshold * VectorBonusPercent / 100; - bool OnlyOneCallAndLocalLinkage = - F.hasLocalLinkage() && F.hasOneUse() && &F == Call.getCalledFunction(); - // If there is only one call of the function, and it has internal linkage, - // the cost of inlining it drops dramatically. It may seem odd to update - // Cost in updateThreshold, but the bonus depends on the logic in this method. - if (OnlyOneCallAndLocalLinkage) - Cost -= LastCallToStaticBonus; + Threshold += LastCallToStaticBonus; } bool CallAnalyzer::visitCmpInst(CmpInst &I) { @@ -1330,9 +1331,10 @@ bool CallAnalyzer::visitCallBase(CallBase &Call) { CallAnalyzer CA(TTI, GetAssumptionCache, GetBFI, PSI, ORE, *F, Call, IndirectCallParams); if (CA.analyzeCall(Call)) { - // We were able to inline the indirect call! Subtract the cost from the - // threshold to get the bonus we want to apply, but don't go below zero. - Cost -= std::max(0, CA.getThreshold() - CA.getCost()); + // We were able to inline the indirect call! Increase the threshold + // with the bonus we want to apply (less the cost of inlinee). + // Make sure the bonus doesn't go below zero. + Threshold += std::max(0, CA.getThreshold() - CA.getCost()); } if (!F->onlyReadsMemory()) |
