Enable the inlinehint attribute in the Inliner.

Functions explicitly marked inline will get an inlining threshold slightly
more aggressive than the default for -O3. This means than -O3 builds are
mostly unaffected while -Os builds will be a bit bigger and faster.

The difference depends entirely on how many 'inline's are sprinkled on the
source.

In the CINT2006 suite, only these tests are significantly affected under -Os:

               Size   Time
471.omnetpp   +1.63% -1.85%
473.astar     +4.01% -6.02%
483.xalancbmk +4.60%  0.00%

Note that 483.xalancbmk runs too quickly to give useful timing results.

llvm-svn: 96066
This commit is contained in:
Jakob Stoklund Olesen 2010-02-13 01:51:53 +00:00
parent 44232af55a
commit 492b8b42cd
1 changed files with 12 additions and 13 deletions

View File

@ -41,12 +41,9 @@ static cl::opt<int>
InlineLimit("inline-threshold", cl::Hidden, cl::init(225), cl::ZeroOrMore,
cl::desc("Control the amount of inlining to perform (default = 225)"));
static cl::opt<bool>
RespectHint("respect-inlinehint", cl::Hidden,
cl::desc("Respect the inlinehint attribute"));
// Threshold to use when inlinehint is given.
const int HintThreshold = 300;
static cl::opt<int>
HintThreshold("inlinehint-threshold", cl::Hidden, cl::init(325),
cl::desc("Threshold for inlining functions with inline hint"));
// Threshold to use when optsize is specified (and there is no -inline-limit).
const int OptSizeThreshold = 75;
@ -183,20 +180,22 @@ static bool InlineCallIfPossible(CallSite CS, CallGraph &CG,
}
unsigned Inliner::getInlineThreshold(CallSite CS) const {
// Listen to inlinehint when -respect-inlinehint is given.
Function *Callee = CS.getCalledFunction();
if (RespectHint && Callee && !Callee->isDeclaration() &&
Callee->hasFnAttr(Attribute::InlineHint))
return HintThreshold;
int thres = InlineThreshold;
// Listen to optsize when -inline-limit is not given.
Function *Caller = CS.getCaller();
if (Caller && !Caller->isDeclaration() &&
Caller->hasFnAttr(Attribute::OptimizeForSize) &&
InlineLimit.getNumOccurrences() == 0)
return OptSizeThreshold;
thres = OptSizeThreshold;
return InlineThreshold;
// Listen to inlinehint when it would increase the threshold.
Function *Callee = CS.getCalledFunction();
if (HintThreshold > thres && Callee && !Callee->isDeclaration() &&
Callee->hasFnAttr(Attribute::InlineHint))
thres = HintThreshold;
return thres;
}
/// shouldInline - Return true if the inliner should attempt to inline