2012-01-20 08:35:20 +00:00
|
|
|
; RUN: opt -inline < %s -S -o - -inline-threshold=8 | FileCheck %s
|
|
|
|
|
|
Initial commit for the rewrite of the inline cost analysis to operate
on a per-callsite walk of the called function's instructions, in
breadth-first order over the potentially reachable set of basic blocks.
This is a major shift in how inline cost analysis works to improve the
accuracy and rationality of inlining decisions. A brief outline of the
algorithm this moves to:
- Build a simplification mapping based on the callsite arguments to the
function arguments.
- Push the entry block onto a worklist of potentially-live basic blocks.
- Pop the first block off of the *front* of the worklist (for
breadth-first ordering) and walk its instructions using a custom
InstVisitor.
- For each instruction's operands, re-map them based on the
simplification mappings available for the given callsite.
- Compute any simplification possible of the instruction after
re-mapping, and store that back int othe simplification mapping.
- Compute any bonuses, costs, or other impacts of the instruction on the
cost metric.
- When the terminator is reached, replace any conditional value in the
terminator with any simplifications from the mapping we have, and add
any successors which are not proven to be dead from these
simplifications to the worklist.
- Pop the next block off of the front of the worklist, and repeat.
- As soon as the cost of inlining exceeds the threshold for the
callsite, stop analyzing the function in order to bound cost.
The primary goal of this algorithm is to perfectly handle dead code
paths. We do not want any code in trivially dead code paths to impact
inlining decisions. The previous metric was *extremely* flawed here, and
would always subtract the average cost of two successors of
a conditional branch when it was proven to become an unconditional
branch at the callsite. There was no handling of wildly different costs
between the two successors, which would cause inlining when the path
actually taken was too large, and no inlining when the path actually
taken was trivially simple. There was also no handling of the code
*path*, only the immediate successors. These problems vanish completely
now. See the added regression tests for the shiny new features -- we
skip recursive function calls, SROA-killing instructions, and high cost
complex CFG structures when dead at the callsite being analyzed.
Switching to this algorithm required refactoring the inline cost
interface to accept the actual threshold rather than simply returning
a single cost. The resulting interface is pretty bad, and I'm planning
to do lots of interface cleanup after this patch.
Several other refactorings fell out of this, but I've tried to minimize
them for this patch. =/ There is still more cleanup that can be done
here. Please point out anything that you see in review.
I've worked really hard to try to mirror at least the spirit of all of
the previous heuristics in the new model. It's not clear that they are
all correct any more, but I wanted to minimize the change in this single
patch, it's already a bit ridiculous. One heuristic that is *not* yet
mirrored is to allow inlining of functions with a dynamic alloca *if*
the caller has a dynamic alloca. I will add this back, but I think the
most reasonable way requires changes to the inliner itself rather than
just the cost metric, and so I've deferred this for a subsequent patch.
The test case is XFAIL-ed until then.
As mentioned in the review mail, this seems to make Clang run about 1%
to 2% faster in -O0, but makes its binary size grow by just under 4%.
I've looked into the 4% growth, and it can be fixed, but requires
changes to other parts of the inliner.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153812 91177308-0d34-0410-b5e6-96231b3b80d8
2012-03-31 12:42:41 +00:00
|
|
|
target datalayout = "p:32:32"
|
|
|
|
|
|
2012-01-20 08:35:20 +00:00
|
|
|
declare void @llvm.lifetime.start(i64 %size, i8* nocapture %ptr)
|
|
|
|
|
|
|
|
|
|
@glbl = external global i32
|
|
|
|
|
|
|
|
|
|
define void @outer1() {
|
|
|
|
|
; CHECK: @outer1
|
|
|
|
|
; CHECK-NOT: call void @inner1
|
|
|
|
|
%ptr = alloca i32
|
|
|
|
|
call void @inner1(i32* %ptr)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define void @inner1(i32 *%ptr) {
|
|
|
|
|
%A = load i32* %ptr
|
|
|
|
|
store i32 0, i32* %ptr
|
Initial commit for the rewrite of the inline cost analysis to operate
on a per-callsite walk of the called function's instructions, in
breadth-first order over the potentially reachable set of basic blocks.
This is a major shift in how inline cost analysis works to improve the
accuracy and rationality of inlining decisions. A brief outline of the
algorithm this moves to:
- Build a simplification mapping based on the callsite arguments to the
function arguments.
- Push the entry block onto a worklist of potentially-live basic blocks.
- Pop the first block off of the *front* of the worklist (for
breadth-first ordering) and walk its instructions using a custom
InstVisitor.
- For each instruction's operands, re-map them based on the
simplification mappings available for the given callsite.
- Compute any simplification possible of the instruction after
re-mapping, and store that back int othe simplification mapping.
- Compute any bonuses, costs, or other impacts of the instruction on the
cost metric.
- When the terminator is reached, replace any conditional value in the
terminator with any simplifications from the mapping we have, and add
any successors which are not proven to be dead from these
simplifications to the worklist.
- Pop the next block off of the front of the worklist, and repeat.
- As soon as the cost of inlining exceeds the threshold for the
callsite, stop analyzing the function in order to bound cost.
The primary goal of this algorithm is to perfectly handle dead code
paths. We do not want any code in trivially dead code paths to impact
inlining decisions. The previous metric was *extremely* flawed here, and
would always subtract the average cost of two successors of
a conditional branch when it was proven to become an unconditional
branch at the callsite. There was no handling of wildly different costs
between the two successors, which would cause inlining when the path
actually taken was too large, and no inlining when the path actually
taken was trivially simple. There was also no handling of the code
*path*, only the immediate successors. These problems vanish completely
now. See the added regression tests for the shiny new features -- we
skip recursive function calls, SROA-killing instructions, and high cost
complex CFG structures when dead at the callsite being analyzed.
Switching to this algorithm required refactoring the inline cost
interface to accept the actual threshold rather than simply returning
a single cost. The resulting interface is pretty bad, and I'm planning
to do lots of interface cleanup after this patch.
Several other refactorings fell out of this, but I've tried to minimize
them for this patch. =/ There is still more cleanup that can be done
here. Please point out anything that you see in review.
I've worked really hard to try to mirror at least the spirit of all of
the previous heuristics in the new model. It's not clear that they are
all correct any more, but I wanted to minimize the change in this single
patch, it's already a bit ridiculous. One heuristic that is *not* yet
mirrored is to allow inlining of functions with a dynamic alloca *if*
the caller has a dynamic alloca. I will add this back, but I think the
most reasonable way requires changes to the inliner itself rather than
just the cost metric, and so I've deferred this for a subsequent patch.
The test case is XFAIL-ed until then.
As mentioned in the review mail, this seems to make Clang run about 1%
to 2% faster in -O0, but makes its binary size grow by just under 4%.
I've looked into the 4% growth, and it can be fixed, but requires
changes to other parts of the inliner.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153812 91177308-0d34-0410-b5e6-96231b3b80d8
2012-03-31 12:42:41 +00:00
|
|
|
%C = getelementptr inbounds i32* %ptr, i32 0
|
|
|
|
|
%D = getelementptr inbounds i32* %ptr, i32 1
|
2012-01-20 08:35:20 +00:00
|
|
|
%E = bitcast i32* %ptr to i8*
|
|
|
|
|
%F = select i1 false, i32* %ptr, i32* @glbl
|
|
|
|
|
call void @llvm.lifetime.start(i64 0, i8* %E)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define void @outer2() {
|
|
|
|
|
; CHECK: @outer2
|
|
|
|
|
; CHECK: call void @inner2
|
|
|
|
|
%ptr = alloca i32
|
|
|
|
|
call void @inner2(i32* %ptr)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; %D poisons this call, scalar-repl can't handle that instruction.
|
|
|
|
|
define void @inner2(i32 *%ptr) {
|
|
|
|
|
%A = load i32* %ptr
|
|
|
|
|
store i32 0, i32* %ptr
|
Initial commit for the rewrite of the inline cost analysis to operate
on a per-callsite walk of the called function's instructions, in
breadth-first order over the potentially reachable set of basic blocks.
This is a major shift in how inline cost analysis works to improve the
accuracy and rationality of inlining decisions. A brief outline of the
algorithm this moves to:
- Build a simplification mapping based on the callsite arguments to the
function arguments.
- Push the entry block onto a worklist of potentially-live basic blocks.
- Pop the first block off of the *front* of the worklist (for
breadth-first ordering) and walk its instructions using a custom
InstVisitor.
- For each instruction's operands, re-map them based on the
simplification mappings available for the given callsite.
- Compute any simplification possible of the instruction after
re-mapping, and store that back int othe simplification mapping.
- Compute any bonuses, costs, or other impacts of the instruction on the
cost metric.
- When the terminator is reached, replace any conditional value in the
terminator with any simplifications from the mapping we have, and add
any successors which are not proven to be dead from these
simplifications to the worklist.
- Pop the next block off of the front of the worklist, and repeat.
- As soon as the cost of inlining exceeds the threshold for the
callsite, stop analyzing the function in order to bound cost.
The primary goal of this algorithm is to perfectly handle dead code
paths. We do not want any code in trivially dead code paths to impact
inlining decisions. The previous metric was *extremely* flawed here, and
would always subtract the average cost of two successors of
a conditional branch when it was proven to become an unconditional
branch at the callsite. There was no handling of wildly different costs
between the two successors, which would cause inlining when the path
actually taken was too large, and no inlining when the path actually
taken was trivially simple. There was also no handling of the code
*path*, only the immediate successors. These problems vanish completely
now. See the added regression tests for the shiny new features -- we
skip recursive function calls, SROA-killing instructions, and high cost
complex CFG structures when dead at the callsite being analyzed.
Switching to this algorithm required refactoring the inline cost
interface to accept the actual threshold rather than simply returning
a single cost. The resulting interface is pretty bad, and I'm planning
to do lots of interface cleanup after this patch.
Several other refactorings fell out of this, but I've tried to minimize
them for this patch. =/ There is still more cleanup that can be done
here. Please point out anything that you see in review.
I've worked really hard to try to mirror at least the spirit of all of
the previous heuristics in the new model. It's not clear that they are
all correct any more, but I wanted to minimize the change in this single
patch, it's already a bit ridiculous. One heuristic that is *not* yet
mirrored is to allow inlining of functions with a dynamic alloca *if*
the caller has a dynamic alloca. I will add this back, but I think the
most reasonable way requires changes to the inliner itself rather than
just the cost metric, and so I've deferred this for a subsequent patch.
The test case is XFAIL-ed until then.
As mentioned in the review mail, this seems to make Clang run about 1%
to 2% faster in -O0, but makes its binary size grow by just under 4%.
I've looked into the 4% growth, and it can be fixed, but requires
changes to other parts of the inliner.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153812 91177308-0d34-0410-b5e6-96231b3b80d8
2012-03-31 12:42:41 +00:00
|
|
|
%C = getelementptr inbounds i32* %ptr, i32 0
|
|
|
|
|
%D = getelementptr inbounds i32* %ptr, i32 %A
|
2012-01-20 08:35:20 +00:00
|
|
|
%E = bitcast i32* %ptr to i8*
|
|
|
|
|
%F = select i1 false, i32* %ptr, i32* @glbl
|
|
|
|
|
call void @llvm.lifetime.start(i64 0, i8* %E)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
2012-01-25 08:27:40 +00:00
|
|
|
|
|
|
|
|
define void @outer3() {
|
|
|
|
|
; CHECK: @outer3
|
|
|
|
|
; CHECK-NOT: call void @inner3
|
|
|
|
|
%ptr = alloca i32
|
|
|
|
|
call void @inner3(i32* %ptr, i1 undef)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define void @inner3(i32 *%ptr, i1 %x) {
|
|
|
|
|
%A = icmp eq i32* %ptr, null
|
|
|
|
|
%B = and i1 %x, %A
|
|
|
|
|
br i1 %A, label %bb.true, label %bb.false
|
|
|
|
|
bb.true:
|
|
|
|
|
; This block musn't be counted in the inline cost.
|
|
|
|
|
%t1 = load i32* %ptr
|
|
|
|
|
%t2 = add i32 %t1, 1
|
|
|
|
|
%t3 = add i32 %t2, 1
|
|
|
|
|
%t4 = add i32 %t3, 1
|
|
|
|
|
%t5 = add i32 %t4, 1
|
|
|
|
|
%t6 = add i32 %t5, 1
|
|
|
|
|
%t7 = add i32 %t6, 1
|
|
|
|
|
%t8 = add i32 %t7, 1
|
|
|
|
|
%t9 = add i32 %t8, 1
|
|
|
|
|
%t10 = add i32 %t9, 1
|
|
|
|
|
%t11 = add i32 %t10, 1
|
|
|
|
|
%t12 = add i32 %t11, 1
|
|
|
|
|
%t13 = add i32 %t12, 1
|
|
|
|
|
%t14 = add i32 %t13, 1
|
|
|
|
|
%t15 = add i32 %t14, 1
|
|
|
|
|
%t16 = add i32 %t15, 1
|
|
|
|
|
%t17 = add i32 %t16, 1
|
|
|
|
|
%t18 = add i32 %t17, 1
|
|
|
|
|
%t19 = add i32 %t18, 1
|
|
|
|
|
%t20 = add i32 %t19, 1
|
|
|
|
|
ret void
|
|
|
|
|
bb.false:
|
|
|
|
|
ret void
|
|
|
|
|
}
|
2012-03-09 02:49:36 +00:00
|
|
|
|
|
|
|
|
define void @outer4(i32 %A) {
|
|
|
|
|
; CHECK: @outer4
|
|
|
|
|
; CHECK-NOT: call void @inner4
|
|
|
|
|
%ptr = alloca i32
|
|
|
|
|
call void @inner4(i32* %ptr, i32 %A)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-31 10:38:48 +00:00
|
|
|
; %B poisons this call, scalar-repl can't handle that instruction. However, we
|
2012-03-09 02:49:36 +00:00
|
|
|
; still want to detect that the icmp and branch *can* be handled.
|
|
|
|
|
define void @inner4(i32 *%ptr, i32 %A) {
|
Initial commit for the rewrite of the inline cost analysis to operate
on a per-callsite walk of the called function's instructions, in
breadth-first order over the potentially reachable set of basic blocks.
This is a major shift in how inline cost analysis works to improve the
accuracy and rationality of inlining decisions. A brief outline of the
algorithm this moves to:
- Build a simplification mapping based on the callsite arguments to the
function arguments.
- Push the entry block onto a worklist of potentially-live basic blocks.
- Pop the first block off of the *front* of the worklist (for
breadth-first ordering) and walk its instructions using a custom
InstVisitor.
- For each instruction's operands, re-map them based on the
simplification mappings available for the given callsite.
- Compute any simplification possible of the instruction after
re-mapping, and store that back int othe simplification mapping.
- Compute any bonuses, costs, or other impacts of the instruction on the
cost metric.
- When the terminator is reached, replace any conditional value in the
terminator with any simplifications from the mapping we have, and add
any successors which are not proven to be dead from these
simplifications to the worklist.
- Pop the next block off of the front of the worklist, and repeat.
- As soon as the cost of inlining exceeds the threshold for the
callsite, stop analyzing the function in order to bound cost.
The primary goal of this algorithm is to perfectly handle dead code
paths. We do not want any code in trivially dead code paths to impact
inlining decisions. The previous metric was *extremely* flawed here, and
would always subtract the average cost of two successors of
a conditional branch when it was proven to become an unconditional
branch at the callsite. There was no handling of wildly different costs
between the two successors, which would cause inlining when the path
actually taken was too large, and no inlining when the path actually
taken was trivially simple. There was also no handling of the code
*path*, only the immediate successors. These problems vanish completely
now. See the added regression tests for the shiny new features -- we
skip recursive function calls, SROA-killing instructions, and high cost
complex CFG structures when dead at the callsite being analyzed.
Switching to this algorithm required refactoring the inline cost
interface to accept the actual threshold rather than simply returning
a single cost. The resulting interface is pretty bad, and I'm planning
to do lots of interface cleanup after this patch.
Several other refactorings fell out of this, but I've tried to minimize
them for this patch. =/ There is still more cleanup that can be done
here. Please point out anything that you see in review.
I've worked really hard to try to mirror at least the spirit of all of
the previous heuristics in the new model. It's not clear that they are
all correct any more, but I wanted to minimize the change in this single
patch, it's already a bit ridiculous. One heuristic that is *not* yet
mirrored is to allow inlining of functions with a dynamic alloca *if*
the caller has a dynamic alloca. I will add this back, but I think the
most reasonable way requires changes to the inliner itself rather than
just the cost metric, and so I've deferred this for a subsequent patch.
The test case is XFAIL-ed until then.
As mentioned in the review mail, this seems to make Clang run about 1%
to 2% faster in -O0, but makes its binary size grow by just under 4%.
I've looked into the 4% growth, and it can be fixed, but requires
changes to other parts of the inliner.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153812 91177308-0d34-0410-b5e6-96231b3b80d8
2012-03-31 12:42:41 +00:00
|
|
|
%B = getelementptr inbounds i32* %ptr, i32 %A
|
2012-03-31 10:38:48 +00:00
|
|
|
%C = icmp eq i32* %ptr, null
|
|
|
|
|
br i1 %C, label %bb.true, label %bb.false
|
2012-03-09 02:49:36 +00:00
|
|
|
bb.true:
|
|
|
|
|
; This block musn't be counted in the inline cost.
|
|
|
|
|
%t1 = load i32* %ptr
|
|
|
|
|
%t2 = add i32 %t1, 1
|
|
|
|
|
%t3 = add i32 %t2, 1
|
|
|
|
|
%t4 = add i32 %t3, 1
|
|
|
|
|
%t5 = add i32 %t4, 1
|
|
|
|
|
%t6 = add i32 %t5, 1
|
|
|
|
|
%t7 = add i32 %t6, 1
|
|
|
|
|
%t8 = add i32 %t7, 1
|
|
|
|
|
%t9 = add i32 %t8, 1
|
|
|
|
|
%t10 = add i32 %t9, 1
|
|
|
|
|
%t11 = add i32 %t10, 1
|
|
|
|
|
%t12 = add i32 %t11, 1
|
|
|
|
|
%t13 = add i32 %t12, 1
|
|
|
|
|
%t14 = add i32 %t13, 1
|
|
|
|
|
%t15 = add i32 %t14, 1
|
|
|
|
|
%t16 = add i32 %t15, 1
|
|
|
|
|
%t17 = add i32 %t16, 1
|
|
|
|
|
%t18 = add i32 %t17, 1
|
|
|
|
|
%t19 = add i32 %t18, 1
|
|
|
|
|
%t20 = add i32 %t19, 1
|
|
|
|
|
ret void
|
|
|
|
|
bb.false:
|
|
|
|
|
ret void
|
|
|
|
|
}
|
Initial commit for the rewrite of the inline cost analysis to operate
on a per-callsite walk of the called function's instructions, in
breadth-first order over the potentially reachable set of basic blocks.
This is a major shift in how inline cost analysis works to improve the
accuracy and rationality of inlining decisions. A brief outline of the
algorithm this moves to:
- Build a simplification mapping based on the callsite arguments to the
function arguments.
- Push the entry block onto a worklist of potentially-live basic blocks.
- Pop the first block off of the *front* of the worklist (for
breadth-first ordering) and walk its instructions using a custom
InstVisitor.
- For each instruction's operands, re-map them based on the
simplification mappings available for the given callsite.
- Compute any simplification possible of the instruction after
re-mapping, and store that back int othe simplification mapping.
- Compute any bonuses, costs, or other impacts of the instruction on the
cost metric.
- When the terminator is reached, replace any conditional value in the
terminator with any simplifications from the mapping we have, and add
any successors which are not proven to be dead from these
simplifications to the worklist.
- Pop the next block off of the front of the worklist, and repeat.
- As soon as the cost of inlining exceeds the threshold for the
callsite, stop analyzing the function in order to bound cost.
The primary goal of this algorithm is to perfectly handle dead code
paths. We do not want any code in trivially dead code paths to impact
inlining decisions. The previous metric was *extremely* flawed here, and
would always subtract the average cost of two successors of
a conditional branch when it was proven to become an unconditional
branch at the callsite. There was no handling of wildly different costs
between the two successors, which would cause inlining when the path
actually taken was too large, and no inlining when the path actually
taken was trivially simple. There was also no handling of the code
*path*, only the immediate successors. These problems vanish completely
now. See the added regression tests for the shiny new features -- we
skip recursive function calls, SROA-killing instructions, and high cost
complex CFG structures when dead at the callsite being analyzed.
Switching to this algorithm required refactoring the inline cost
interface to accept the actual threshold rather than simply returning
a single cost. The resulting interface is pretty bad, and I'm planning
to do lots of interface cleanup after this patch.
Several other refactorings fell out of this, but I've tried to minimize
them for this patch. =/ There is still more cleanup that can be done
here. Please point out anything that you see in review.
I've worked really hard to try to mirror at least the spirit of all of
the previous heuristics in the new model. It's not clear that they are
all correct any more, but I wanted to minimize the change in this single
patch, it's already a bit ridiculous. One heuristic that is *not* yet
mirrored is to allow inlining of functions with a dynamic alloca *if*
the caller has a dynamic alloca. I will add this back, but I think the
most reasonable way requires changes to the inliner itself rather than
just the cost metric, and so I've deferred this for a subsequent patch.
The test case is XFAIL-ed until then.
As mentioned in the review mail, this seems to make Clang run about 1%
to 2% faster in -O0, but makes its binary size grow by just under 4%.
I've looked into the 4% growth, and it can be fixed, but requires
changes to other parts of the inliner.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153812 91177308-0d34-0410-b5e6-96231b3b80d8
2012-03-31 12:42:41 +00:00
|
|
|
|
|
|
|
|
define void @outer5() {
|
|
|
|
|
; CHECK: @outer5
|
|
|
|
|
; CHECK-NOT: call void @inner5
|
|
|
|
|
%ptr = alloca i32
|
|
|
|
|
call void @inner5(i1 false, i32* %ptr)
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; %D poisons this call, scalar-repl can't handle that instruction. However, if
|
|
|
|
|
; the flag is set appropriately, the poisoning instruction is inside of dead
|
|
|
|
|
; code, and so shouldn't be counted.
|
|
|
|
|
define void @inner5(i1 %flag, i32 *%ptr) {
|
|
|
|
|
%A = load i32* %ptr
|
|
|
|
|
store i32 0, i32* %ptr
|
|
|
|
|
%C = getelementptr inbounds i32* %ptr, i32 0
|
|
|
|
|
br i1 %flag, label %if.then, label %exit
|
|
|
|
|
|
|
|
|
|
if.then:
|
|
|
|
|
%D = getelementptr inbounds i32* %ptr, i32 %A
|
|
|
|
|
%E = bitcast i32* %ptr to i8*
|
|
|
|
|
%F = select i1 false, i32* %ptr, i32* @glbl
|
|
|
|
|
call void @llvm.lifetime.start(i64 0, i8* %E)
|
|
|
|
|
ret void
|
|
|
|
|
|
|
|
|
|
exit:
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
