6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-15 22:28:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix the inliner so that the optsize function attribute don't alter the

Browse Source 
inline threshold if the global inline threshold is lower (as for -Oz).

Reviewed by Chandler Carruth and Bill Wendling.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157323 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Patrik Hägglund
2012-05-23 13:42:57 +00:00
parent 9ce6f6fe5e
commit ab767213fd
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Transforms/IPO/Inliner.cpp
View File

@@ -201,19 +201,22 @@ static bool InlineCallIfPossible(CallSite CS, InlineFunctionInfo &IFI,
} }
unsigned Inliner::getInlineThreshold(CallSite CS) const { unsigned Inliner::getInlineThreshold(CallSite CS) const {
int thres = InlineThreshold; int thres = InlineThreshold; // -inline-threshold or else selected by
// overall opt level
// Listen to optsize when -inline-limit is not given. // If -inline-threshold is not given, listen to the optsize attribute when it
// would decrease the threshold.
Function *Caller = CS.getCaller(); Function *Caller = CS.getCaller();
if (Caller && !Caller->isDeclaration() && bool OptSize = Caller && !Caller->isDeclaration() &&
Caller->hasFnAttr(Attribute::OptimizeForSize) && Caller->hasFnAttr(Attribute::OptimizeForSize);
InlineLimit.getNumOccurrences() == 0) if (!(InlineLimit.getNumOccurrences() > 0) && OptSize && OptSizeThreshold < thres)
thres = OptSizeThreshold; thres = OptSizeThreshold;
// Listen to inlinehint when it would increase the threshold. // Listen to the inlinehint attribute when it would increase the threshold.
Function *Callee = CS.getCalledFunction(); Function *Callee = CS.getCalledFunction();
if (HintThreshold > thres && Callee && !Callee->isDeclaration() && bool InlineHint = Callee && !Callee->isDeclaration() &&
Callee->hasFnAttr(Attribute::InlineHint)) Callee->hasFnAttr(Attribute::InlineHint);
if (InlineHint && HintThreshold > thres)
thres = HintThreshold; thres = HintThreshold;
return thres; return thres;

33
test/Transforms/Inline/inline-optsize.ll Normal file
View File

@@ -0,0 +1,33 @@
; RUN: opt -S -Oz %s | FileCheck %s -check-prefix=OZ
; RUN: opt -S -O2 %s | FileCheck %s -check-prefix=O2
; The inline threshold for a function with the optsize attribute is currently
; the same as the global inline threshold for -Os. Check that the optsize
; function attribute don't alter the function specific inline threshold if the
; global inline threshold is lower (as for -Oz).
@a = global i32 4
; This function should be larger than the inline threshold for -Oz (25), but
; smaller than the inline threshold for optsize (75).
define i32 @inner() {
%a1 = load volatile i32* @a
%x1 = add i32 %a1, %a1
%a2 = load volatile i32* @a
%x2 = add i32 %x1, %a2
%a3 = load volatile i32* @a
%x3 = add i32 %x2, %a3
%a4 = load volatile i32* @a
%x4 = add i32 %x3, %a4
%a5 = load volatile i32* @a
%x5 = add i32 %x3, %a5
ret i32 %x5
}
; @inner() should be inlined for -O2 but not for -Oz.
; OZ: call
; O2-NOT: call
define i32 @outer() optsize {
%r = call i32 @inner()
ret i32 %r
}