mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-23 21:13:02 +02:00
96c1e7e4f0
Lay out trellis-shaped CFGs optimally.
A trellis of the shape below:
A B
|\ /|
| \ / |
| X |
| / \ |
|/ \|
C D
would be laid out A; B->C ; D by the current layout algorithm. Now we identify
trellises and lay them out either A->C; B->D or A->D; B->C. This scales with an
increasing number of predecessors. A trellis is a a group of 2 or more
predecessor blocks that all have the same successors.
because of this we can tail duplicate to extend existing trellises.
As an example consider the following CFG:
B D F H
/ \ / \ / \ / \
A---C---E---G---Ret
Where A,C,E,G are all small (Currently 2 instructions).
The CFG preserving layout is then A,B,C,D,E,F,G,H,Ret.
The current code will copy C into B, E into D and G into F and yield the layout
A,C,B(C),E,D(E),F(G),G,H,ret
define void @straight_test(i32 %tag) {
entry:
br label %test1
test1: ; A
%tagbit1 = and i32 %tag, 1
%tagbit1eq0 = icmp eq i32 %tagbit1, 0
br i1 %tagbit1eq0, label %test2, label %optional1
optional1: ; B
call void @a()
br label %test2
test2: ; C
%tagbit2 = and i32 %tag, 2
%tagbit2eq0 = icmp eq i32 %tagbit2, 0
br i1 %tagbit2eq0, label %test3, label %optional2
optional2: ; D
call void @b()
br label %test3
test3: ; E
%tagbit3 = and i32 %tag, 4
%tagbit3eq0 = icmp eq i32 %tagbit3, 0
br i1 %tagbit3eq0, label %test4, label %optional3
optional3: ; F
call void @c()
br label %test4
test4: ; G
%tagbit4 = and i32 %tag, 8
%tagbit4eq0 = icmp eq i32 %tagbit4, 0
br i1 %tagbit4eq0, label %exit, label %optional4
optional4: ; H
call void @d()
br label %exit
exit:
ret void
}
here is the layout after D27742:
straight_test: # @straight_test
; ... Prologue elided
; BB#0: # %entry ; A (merged with test1)
; ... More prologue elided
mr 30, 3
andi. 3, 30, 1
bc 12, 1, .LBB0_2
; BB#1: # %test2 ; C
rlwinm. 3, 30, 0, 30, 30
beq 0, .LBB0_3
b .LBB0_4
.LBB0_2: # %optional1 ; B (copy of C)
bl a
nop
rlwinm. 3, 30, 0, 30, 30
bne 0, .LBB0_4
.LBB0_3: # %test3 ; E
rlwinm. 3, 30, 0, 29, 29
beq 0, .LBB0_5
b .LBB0_6
.LBB0_4: # %optional2 ; D (copy of E)
bl b
nop
rlwinm. 3, 30, 0, 29, 29
bne 0, .LBB0_6
.LBB0_5: # %test4 ; G
rlwinm. 3, 30, 0, 28, 28
beq 0, .LBB0_8
b .LBB0_7
.LBB0_6: # %optional3 ; F (copy of G)
bl c
nop
rlwinm. 3, 30, 0, 28, 28
beq 0, .LBB0_8
.LBB0_7: # %optional4 ; H
bl d
nop
.LBB0_8: # %exit ; Ret
ld 30, 96(1) # 8-byte Folded Reload
addi 1, 1, 112
ld 0, 16(1)
mtlr 0
blr
The tail-duplication has produced some benefit, but it has also produced a
trellis which is not laid out optimally. With this patch, we improve the layouts
of such trellises, and decrease the cost calculation for tail-duplication
accordingly.
This patch produces the layout A,C,E,G,B,D,F,H,Ret. This layout does have
back edges, which is a negative, but it has a bigger compensating
positive, which is that it handles the case where there are long strings
of skipped blocks much better than the original layout. Both layouts
handle runs of executed blocks equally well. Branch prediction also
improves if there is any correlation between subsequent optional blocks.
Here is the resulting concrete layout:
straight_test: # @straight_test
; BB#0: # %entry ; A (merged with test1)
mr 30, 3
andi. 3, 30, 1
bc 12, 1, .LBB0_4
; BB#1: # %test2 ; C
rlwinm. 3, 30, 0, 30, 30
bne 0, .LBB0_5
.LBB0_2: # %test3 ; E
rlwinm. 3, 30, 0, 29, 29
bne 0, .LBB0_6
.LBB0_3: # %test4 ; G
rlwinm. 3, 30, 0, 28, 28
bne 0, .LBB0_7
b .LBB0_8
.LBB0_4: # %optional1 ; B (Copy of C)
bl a
nop
rlwinm. 3, 30, 0, 30, 30
beq 0, .LBB0_2
.LBB0_5: # %optional2 ; D (Copy of E)
bl b
nop
rlwinm. 3, 30, 0, 29, 29
beq 0, .LBB0_3
.LBB0_6: # %optional3 ; F (Copy of G)
bl c
nop
rlwinm. 3, 30, 0, 28, 28
beq 0, .LBB0_8
.LBB0_7: # %optional4 ; H
bl d
nop
.LBB0_8: # %exit
Differential Revision: https://reviews.llvm.org/D28522
llvm-svn: 295223
82 lines
2.5 KiB
LLVM
82 lines
2.5 KiB
LLVM
; RUN: llc < %s -march=arm | FileCheck %s
|
|
; RUN: llc < %s -march=arm -enable-tail-merge=0 | \
|
|
; RUN: FileCheck --check-prefix=NOMERGE %s
|
|
|
|
; Check that tail merging is the default on ARM, and that -enable-tail-merge=0
|
|
; works.
|
|
; PR1628
|
|
|
|
; CHECK: bl _baz
|
|
; CHECK-NOT: bl _baz
|
|
|
|
; CHECK: bl _quux
|
|
; CHECK-NOT: bl _quux
|
|
|
|
; NOMERGE-DAG: bl _baz
|
|
; NOMERGE-DAG: bl _baz
|
|
|
|
; NOMERGE-DAG: bl _quux
|
|
; NOMERGE-DAG: bl _quux
|
|
|
|
; ModuleID = 'tail.c'
|
|
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
|
|
target triple = "i686-apple-darwin8"
|
|
|
|
define i32 @f(i32 %i, i32 %q) {
|
|
entry:
|
|
%i_addr = alloca i32 ; <i32*> [#uses=2]
|
|
%q_addr = alloca i32 ; <i32*> [#uses=2]
|
|
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
|
|
store i32 %i, i32* %i_addr
|
|
store i32 %q, i32* %q_addr
|
|
%tmp = load i32, i32* %i_addr ; <i32> [#uses=1]
|
|
%tmp1 = icmp ne i32 %tmp, 0 ; <i1> [#uses=1]
|
|
%tmp12 = zext i1 %tmp1 to i8 ; <i8> [#uses=1]
|
|
%toBool = icmp ne i8 %tmp12, 0 ; <i1> [#uses=1]
|
|
br i1 %toBool, label %cond_true, label %cond_false
|
|
|
|
cond_true: ; preds = %entry
|
|
%tmp3 = call i32 (...) @bar( ) ; <i32> [#uses=0]
|
|
%tmp4 = call i32 (...) @baz( i32 5, i32 6 ) ; <i32> [#uses=0]
|
|
%tmp7 = load i32, i32* %q_addr ; <i32> [#uses=1]
|
|
%tmp8 = icmp ne i32 %tmp7, 0 ; <i1> [#uses=1]
|
|
%tmp89 = zext i1 %tmp8 to i8 ; <i8> [#uses=1]
|
|
%toBool10 = icmp ne i8 %tmp89, 0 ; <i1> [#uses=1]
|
|
br i1 %toBool10, label %cond_true11, label %cond_false15
|
|
|
|
cond_false: ; preds = %entry
|
|
%tmp5 = call i32 (...) @foo( ) ; <i32> [#uses=0]
|
|
%tmp6 = call i32 (...) @baz( i32 5, i32 6 ) ; <i32> [#uses=0]
|
|
%tmp27 = load i32, i32* %q_addr ; <i32> [#uses=1]
|
|
%tmp28 = icmp ne i32 %tmp27, 0 ; <i1> [#uses=1]
|
|
%tmp289 = zext i1 %tmp28 to i8 ; <i8> [#uses=1]
|
|
%toBool210 = icmp ne i8 %tmp289, 0 ; <i1> [#uses=1]
|
|
br i1 %toBool210, label %cond_true11, label %cond_false15
|
|
|
|
cond_true11: ; preds = %cond_next
|
|
%tmp13 = call i32 (...) @foo( ) ; <i32> [#uses=0]
|
|
%tmp14 = call i32 (...) @quux( i32 3, i32 4 ) ; <i32> [#uses=0]
|
|
br label %cond_next18
|
|
|
|
cond_false15: ; preds = %cond_next
|
|
%tmp16 = call i32 (...) @bar( ) ; <i32> [#uses=0]
|
|
%tmp17 = call i32 (...) @quux( i32 3, i32 4 ) ; <i32> [#uses=0]
|
|
br label %cond_next18
|
|
|
|
cond_next18: ; preds = %cond_false15, %cond_true11
|
|
%tmp19 = call i32 (...) @bar( ) ; <i32> [#uses=0]
|
|
br label %return
|
|
|
|
return: ; preds = %cond_next18
|
|
%retval20 = load i32, i32* %retval ; <i32> [#uses=1]
|
|
ret i32 %retval20
|
|
}
|
|
|
|
declare i32 @bar(...)
|
|
|
|
declare i32 @baz(...)
|
|
|
|
declare i32 @foo(...)
|
|
|
|
declare i32 @quux(...)
|