2009-09-11 18:01:28 +00:00
|
|
|
; RUN: opt < %s -basicaa -licm -S | FileCheck %s
|
2009-08-30 22:13:26 +00:00
|
|
|
|
|
|
|
|
declare i32 @strlen(i8*) readonly
|
|
|
|
|
|
|
|
|
|
declare void @foo()
|
|
|
|
|
|
|
|
|
|
; Sink readonly function.
|
|
|
|
|
define i32 @test1(i8* %P) {
|
|
|
|
|
br label %Loop
|
|
|
|
|
|
|
|
|
|
Loop: ; preds = %Loop, %0
|
|
|
|
|
%A = call i32 @strlen( i8* %P ) readonly
|
|
|
|
|
br i1 false, label %Loop, label %Out
|
|
|
|
|
|
|
|
|
|
Out: ; preds = %Loop
|
|
|
|
|
ret i32 %A
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test1(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out:
|
|
|
|
|
; CHECK-NEXT: call i32 @strlen
|
|
|
|
|
; CHECK-NEXT: ret i32 %A
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
declare double @sin(double) readnone
|
|
|
|
|
|
|
|
|
|
; Sink readnone function out of loop with unknown memory behavior.
|
|
|
|
|
define double @test2(double %X) {
|
|
|
|
|
br label %Loop
|
|
|
|
|
|
|
|
|
|
Loop: ; preds = %Loop, %0
|
|
|
|
|
call void @foo( )
|
|
|
|
|
%A = call double @sin( double %X ) readnone
|
|
|
|
|
br i1 true, label %Loop, label %Out
|
|
|
|
|
|
|
|
|
|
Out: ; preds = %Loop
|
|
|
|
|
ret double %A
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test2(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out:
|
|
|
|
|
; CHECK-NEXT: call double @sin
|
|
|
|
|
; CHECK-NEXT: ret double %A
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; This testcase checks to make sure the sinker does not cause problems with
|
|
|
|
|
; critical edges.
|
|
|
|
|
define void @test3() {
|
|
|
|
|
Entry:
|
|
|
|
|
br i1 false, label %Loop, label %Exit
|
|
|
|
|
Loop:
|
|
|
|
|
%X = add i32 0, 1
|
|
|
|
|
br i1 false, label %Loop, label %Exit
|
|
|
|
|
Exit:
|
|
|
|
|
%Y = phi i32 [ 0, %Entry ], [ %X, %Loop ]
|
|
|
|
|
ret void
|
|
|
|
|
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test3(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Exit.loopexit:
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: %X.le = add i32 0, 1
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK-NEXT: br label %Exit
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; If the result of an instruction is only used outside of the loop, sink
|
|
|
|
|
; the instruction to the exit blocks instead of executing it on every
|
|
|
|
|
; iteration of the loop.
|
|
|
|
|
;
|
|
|
|
|
define i32 @test4(i32 %N) {
|
|
|
|
|
Entry:
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop: ; preds = %Loop, %Entry
|
|
|
|
|
%N_addr.0.pn = phi i32 [ %dec, %Loop ], [ %N, %Entry ]
|
|
|
|
|
%tmp.6 = mul i32 %N, %N_addr.0.pn ; <i32> [#uses=1]
|
|
|
|
|
%tmp.7 = sub i32 %tmp.6, %N ; <i32> [#uses=1]
|
|
|
|
|
%dec = add i32 %N_addr.0.pn, -1 ; <i32> [#uses=1]
|
|
|
|
|
%tmp.1 = icmp ne i32 %N_addr.0.pn, 1 ; <i1> [#uses=1]
|
|
|
|
|
br i1 %tmp.1, label %Loop, label %Out
|
|
|
|
|
Out: ; preds = %Loop
|
|
|
|
|
ret i32 %tmp.7
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test4(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out:
|
2014-01-25 04:07:24 +00:00
|
|
|
; CHECK-NEXT: %[[LCSSAPHI:.*]] = phi i32 [ %N_addr.0.pn
|
|
|
|
|
; CHECK-NEXT: mul i32 %N, %[[LCSSAPHI]]
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: sub i32 %tmp.6.le, %N
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK-NEXT: ret i32
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; To reduce register pressure, if a load is hoistable out of the loop, and the
|
|
|
|
|
; result of the load is only used outside of the loop, sink the load instead of
|
|
|
|
|
; hoisting it!
|
|
|
|
|
;
|
|
|
|
|
@X = global i32 5 ; <i32*> [#uses=1]
|
|
|
|
|
|
|
|
|
|
define i32 @test5(i32 %N) {
|
|
|
|
|
Entry:
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop: ; preds = %Loop, %Entry
|
|
|
|
|
%N_addr.0.pn = phi i32 [ %dec, %Loop ], [ %N, %Entry ]
|
|
|
|
|
%tmp.6 = load i32* @X ; <i32> [#uses=1]
|
|
|
|
|
%dec = add i32 %N_addr.0.pn, -1 ; <i32> [#uses=1]
|
|
|
|
|
%tmp.1 = icmp ne i32 %N_addr.0.pn, 1 ; <i1> [#uses=1]
|
|
|
|
|
br i1 %tmp.1, label %Loop, label %Out
|
|
|
|
|
Out: ; preds = %Loop
|
|
|
|
|
ret i32 %tmp.6
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test5(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out:
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: %tmp.6.le = load i32* @X
|
|
|
|
|
; CHECK-NEXT: ret i32 %tmp.6.le
|
2009-08-30 22:13:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
; The loop sinker was running from the bottom of the loop to the top, causing
|
|
|
|
|
; it to miss opportunities to sink instructions that depended on sinking other
|
|
|
|
|
; instructions from the loop. Instead they got hoisted, which is better than
|
|
|
|
|
; leaving them in the loop, but increases register pressure pointlessly.
|
|
|
|
|
|
|
|
|
|
%Ty = type { i32, i32 }
|
|
|
|
|
@X2 = external global %Ty
|
|
|
|
|
|
|
|
|
|
define i32 @test6() {
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop:
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
One of several parallel first steps to remove the target type of pointers,
replacing them with a single opaque pointer type.
This adds an explicit type parameter to the gep instruction so that when the
first parameter becomes an opaque pointer type, the type to gep through is
still available to the instructions.
* This doesn't modify gep operators, only instructions (operators will be
handled separately)
* Textual IR changes only. Bitcode (including upgrade) and changing the
in-memory representation will be in separate changes.
* geps of vectors are transformed as:
getelementptr <4 x float*> %x, ...
->getelementptr float, <4 x float*> %x, ...
Then, once the opaque pointer type is introduced, this will ultimately look
like:
getelementptr float, <4 x ptr> %x
with the unambiguous interpretation that it is a vector of pointers to float.
* address spaces remain on the pointer, not the type:
getelementptr float addrspace(1)* %x
->getelementptr float, float addrspace(1)* %x
Then, eventually:
getelementptr float, ptr addrspace(1) %x
Importantly, the massive amount of test case churn has been automated by
same crappy python code. I had to manually update a few test cases that
wouldn't fit the script's model (r228970,r229196,r229197,r229198). The
python script just massages stdin and writes the result to stdout, I
then wrapped that in a shell script to handle replacing files, then
using the usual find+xargs to migrate all the files.
update.py:
import fileinput
import sys
import re
ibrep = re.compile(r"(^.*?[^%\w]getelementptr inbounds )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
normrep = re.compile( r"(^.*?[^%\w]getelementptr )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
def conv(match, line):
if not match:
return line
line = match.groups()[0]
if len(match.groups()[5]) == 0:
line += match.groups()[2]
line += match.groups()[3]
line += ", "
line += match.groups()[1]
line += "\n"
return line
for line in sys.stdin:
if line.find("getelementptr ") == line.find("getelementptr inbounds"):
if line.find("getelementptr inbounds") != line.find("getelementptr inbounds ("):
line = conv(re.match(ibrep, line), line)
elif line.find("getelementptr ") != line.find("getelementptr ("):
line = conv(re.match(normrep, line), line)
sys.stdout.write(line)
apply.sh:
for name in "$@"
do
python3 `dirname "$0"`/update.py < "$name" > "$name.tmp" && mv "$name.tmp" "$name"
rm -f "$name.tmp"
done
The actual commands:
From llvm/src:
find test/ -name *.ll | xargs ./apply.sh
From llvm/src/tools/clang:
find test/ -name *.mm -o -name *.m -o -name *.cpp -o -name *.c | xargs -I '{}' ../../apply.sh "{}"
From llvm/src/tools/polly:
find test/ -name *.ll | xargs ./apply.sh
After that, check-all (with llvm, clang, clang-tools-extra, lld,
compiler-rt, and polly all checked out).
The extra 'rm' in the apply.sh script is due to a few files in clang's test
suite using interesting unicode stuff that my python script was throwing
exceptions on. None of those files needed to be migrated, so it seemed
sufficient to ignore those cases.
Reviewers: rafael, dexonsmith, grosser
Differential Revision: http://reviews.llvm.org/D7636
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230786 91177308-0d34-0410-b5e6-96231b3b80d8
2015-02-27 19:29:02 +00:00
|
|
|
%dead = getelementptr %Ty, %Ty* @X2, i64 0, i32 0
|
2009-08-30 22:13:26 +00:00
|
|
|
%sunk2 = load i32* %dead
|
|
|
|
|
br i1 false, label %Loop, label %Out
|
|
|
|
|
Out: ; preds = %Loop
|
|
|
|
|
ret i32 %sunk2
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test6(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out:
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
One of several parallel first steps to remove the target type of pointers,
replacing them with a single opaque pointer type.
This adds an explicit type parameter to the gep instruction so that when the
first parameter becomes an opaque pointer type, the type to gep through is
still available to the instructions.
* This doesn't modify gep operators, only instructions (operators will be
handled separately)
* Textual IR changes only. Bitcode (including upgrade) and changing the
in-memory representation will be in separate changes.
* geps of vectors are transformed as:
getelementptr <4 x float*> %x, ...
->getelementptr float, <4 x float*> %x, ...
Then, once the opaque pointer type is introduced, this will ultimately look
like:
getelementptr float, <4 x ptr> %x
with the unambiguous interpretation that it is a vector of pointers to float.
* address spaces remain on the pointer, not the type:
getelementptr float addrspace(1)* %x
->getelementptr float, float addrspace(1)* %x
Then, eventually:
getelementptr float, ptr addrspace(1) %x
Importantly, the massive amount of test case churn has been automated by
same crappy python code. I had to manually update a few test cases that
wouldn't fit the script's model (r228970,r229196,r229197,r229198). The
python script just massages stdin and writes the result to stdout, I
then wrapped that in a shell script to handle replacing files, then
using the usual find+xargs to migrate all the files.
update.py:
import fileinput
import sys
import re
ibrep = re.compile(r"(^.*?[^%\w]getelementptr inbounds )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
normrep = re.compile( r"(^.*?[^%\w]getelementptr )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
def conv(match, line):
if not match:
return line
line = match.groups()[0]
if len(match.groups()[5]) == 0:
line += match.groups()[2]
line += match.groups()[3]
line += ", "
line += match.groups()[1]
line += "\n"
return line
for line in sys.stdin:
if line.find("getelementptr ") == line.find("getelementptr inbounds"):
if line.find("getelementptr inbounds") != line.find("getelementptr inbounds ("):
line = conv(re.match(ibrep, line), line)
elif line.find("getelementptr ") != line.find("getelementptr ("):
line = conv(re.match(normrep, line), line)
sys.stdout.write(line)
apply.sh:
for name in "$@"
do
python3 `dirname "$0"`/update.py < "$name" > "$name.tmp" && mv "$name.tmp" "$name"
rm -f "$name.tmp"
done
The actual commands:
From llvm/src:
find test/ -name *.ll | xargs ./apply.sh
From llvm/src/tools/clang:
find test/ -name *.mm -o -name *.m -o -name *.cpp -o -name *.c | xargs -I '{}' ../../apply.sh "{}"
From llvm/src/tools/polly:
find test/ -name *.ll | xargs ./apply.sh
After that, check-all (with llvm, clang, clang-tools-extra, lld,
compiler-rt, and polly all checked out).
The extra 'rm' in the apply.sh script is due to a few files in clang's test
suite using interesting unicode stuff that my python script was throwing
exceptions on. None of those files needed to be migrated, so it seemed
sufficient to ignore those cases.
Reviewers: rafael, dexonsmith, grosser
Differential Revision: http://reviews.llvm.org/D7636
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230786 91177308-0d34-0410-b5e6-96231b3b80d8
2015-02-27 19:29:02 +00:00
|
|
|
; CHECK-NEXT: %dead.le = getelementptr %Ty, %Ty* @X2, i64 0, i32 0
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: %sunk2.le = load i32* %dead.le
|
|
|
|
|
; CHECK-NEXT: ret i32 %sunk2.le
|
2009-08-30 22:13:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
; This testcase ensures that we can sink instructions from loops with
|
|
|
|
|
; multiple exits.
|
|
|
|
|
;
|
|
|
|
|
define i32 @test7(i32 %N, i1 %C) {
|
|
|
|
|
Entry:
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop: ; preds = %ContLoop, %Entry
|
|
|
|
|
%N_addr.0.pn = phi i32 [ %dec, %ContLoop ], [ %N, %Entry ]
|
|
|
|
|
%tmp.6 = mul i32 %N, %N_addr.0.pn
|
|
|
|
|
%tmp.7 = sub i32 %tmp.6, %N ; <i32> [#uses=2]
|
|
|
|
|
%dec = add i32 %N_addr.0.pn, -1 ; <i32> [#uses=1]
|
|
|
|
|
br i1 %C, label %ContLoop, label %Out1
|
|
|
|
|
ContLoop:
|
|
|
|
|
%tmp.1 = icmp ne i32 %N_addr.0.pn, 1
|
|
|
|
|
br i1 %tmp.1, label %Loop, label %Out2
|
|
|
|
|
Out1: ; preds = %Loop
|
|
|
|
|
ret i32 %tmp.7
|
|
|
|
|
Out2: ; preds = %ContLoop
|
|
|
|
|
ret i32 %tmp.7
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test7(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out1:
|
2014-01-25 04:07:24 +00:00
|
|
|
; CHECK-NEXT: %[[LCSSAPHI:.*]] = phi i32 [ %N_addr.0.pn
|
|
|
|
|
; CHECK-NEXT: mul i32 %N, %[[LCSSAPHI]]
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: sub i32 %tmp.6.le, %N
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK-NEXT: ret
|
|
|
|
|
; CHECK: Out2:
|
2014-01-25 04:07:24 +00:00
|
|
|
; CHECK-NEXT: %[[LCSSAPHI:.*]] = phi i32 [ %N_addr.0.pn
|
|
|
|
|
; CHECK-NEXT: mul i32 %N, %[[LCSSAPHI]]
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: sub i32 %tmp.6.le4, %N
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK-NEXT: ret
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
; This testcase checks to make sure we can sink values which are only live on
|
|
|
|
|
; some exits out of the loop, and that we can do so without breaking dominator
|
|
|
|
|
; info.
|
|
|
|
|
define i32 @test8(i1 %C1, i1 %C2, i32* %P, i32* %Q) {
|
|
|
|
|
Entry:
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop: ; preds = %Cont, %Entry
|
|
|
|
|
br i1 %C1, label %Cont, label %exit1
|
|
|
|
|
Cont: ; preds = %Loop
|
|
|
|
|
%X = load i32* %P ; <i32> [#uses=2]
|
|
|
|
|
store i32 %X, i32* %Q
|
|
|
|
|
%V = add i32 %X, 1 ; <i32> [#uses=1]
|
|
|
|
|
br i1 %C2, label %Loop, label %exit2
|
|
|
|
|
exit1: ; preds = %Loop
|
|
|
|
|
ret i32 0
|
|
|
|
|
exit2: ; preds = %Cont
|
|
|
|
|
ret i32 %V
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test8(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: exit1:
|
|
|
|
|
; CHECK-NEXT: ret i32 0
|
|
|
|
|
; CHECK: exit2:
|
2014-01-25 04:07:24 +00:00
|
|
|
; CHECK-NEXT: %[[LCSSAPHI:.*]] = phi i32 [ %X
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: %V.le = add i32 %[[LCSSAPHI]], 1
|
|
|
|
|
; CHECK-NEXT: ret i32 %V.le
|
2009-08-30 22:13:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
define void @test9() {
|
|
|
|
|
loopentry.2.i:
|
|
|
|
|
br i1 false, label %no_exit.1.i.preheader, label %loopentry.3.i.preheader
|
|
|
|
|
no_exit.1.i.preheader: ; preds = %loopentry.2.i
|
|
|
|
|
br label %no_exit.1.i
|
|
|
|
|
no_exit.1.i: ; preds = %endif.8.i, %no_exit.1.i.preheader
|
|
|
|
|
br i1 false, label %return.i, label %endif.8.i
|
|
|
|
|
endif.8.i: ; preds = %no_exit.1.i
|
|
|
|
|
%inc.1.i = add i32 0, 1 ; <i32> [#uses=1]
|
|
|
|
|
br i1 false, label %no_exit.1.i, label %loopentry.3.i.preheader.loopexit
|
|
|
|
|
loopentry.3.i.preheader.loopexit: ; preds = %endif.8.i
|
|
|
|
|
br label %loopentry.3.i.preheader
|
|
|
|
|
loopentry.3.i.preheader: ; preds = %loopentry.3.i.preheader.loopexit, %loopentry.2.i
|
|
|
|
|
%arg_num.0.i.ph13000 = phi i32 [ 0, %loopentry.2.i ], [ %inc.1.i, %loopentry.3.i.preheader.loopexit ] ; <i32> [#uses=0]
|
|
|
|
|
ret void
|
|
|
|
|
return.i: ; preds = %no_exit.1.i
|
|
|
|
|
ret void
|
|
|
|
|
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test9(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: loopentry.3.i.preheader.loopexit:
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: %inc.1.i.le = add i32 0, 1
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK-NEXT: br label %loopentry.3.i.preheader
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
; Potentially trapping instructions may be sunk as long as they are guaranteed
|
|
|
|
|
; to be executed.
|
|
|
|
|
define i32 @test10(i32 %N) {
|
|
|
|
|
Entry:
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop: ; preds = %Loop, %Entry
|
|
|
|
|
%N_addr.0.pn = phi i32 [ %dec, %Loop ], [ %N, %Entry ] ; <i32> [#uses=3]
|
|
|
|
|
%tmp.6 = sdiv i32 %N, %N_addr.0.pn ; <i32> [#uses=1]
|
|
|
|
|
%dec = add i32 %N_addr.0.pn, -1 ; <i32> [#uses=1]
|
|
|
|
|
%tmp.1 = icmp ne i32 %N_addr.0.pn, 0 ; <i1> [#uses=1]
|
|
|
|
|
br i1 %tmp.1, label %Loop, label %Out
|
|
|
|
|
Out: ; preds = %Loop
|
|
|
|
|
ret i32 %tmp.6
|
|
|
|
|
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test10(
|
2009-08-30 22:13:26 +00:00
|
|
|
; CHECK: Out:
|
2014-01-25 04:07:24 +00:00
|
|
|
; CHECK-NEXT: %[[LCSSAPHI:.*]] = phi i32 [ %N_addr.0.pn
|
2014-02-11 12:52:27 +00:00
|
|
|
; CHECK-NEXT: %tmp.6.le = sdiv i32 %N, %[[LCSSAPHI]]
|
|
|
|
|
; CHECK-NEXT: ret i32 %tmp.6.le
|
2009-08-30 22:13:26 +00:00
|
|
|
}
|
|
|
|
|
|
2010-08-29 18:22:25 +00:00
|
|
|
; Should delete, not sink, dead instructions.
|
|
|
|
|
define void @test11() {
|
|
|
|
|
br label %Loop
|
|
|
|
|
Loop:
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
One of several parallel first steps to remove the target type of pointers,
replacing them with a single opaque pointer type.
This adds an explicit type parameter to the gep instruction so that when the
first parameter becomes an opaque pointer type, the type to gep through is
still available to the instructions.
* This doesn't modify gep operators, only instructions (operators will be
handled separately)
* Textual IR changes only. Bitcode (including upgrade) and changing the
in-memory representation will be in separate changes.
* geps of vectors are transformed as:
getelementptr <4 x float*> %x, ...
->getelementptr float, <4 x float*> %x, ...
Then, once the opaque pointer type is introduced, this will ultimately look
like:
getelementptr float, <4 x ptr> %x
with the unambiguous interpretation that it is a vector of pointers to float.
* address spaces remain on the pointer, not the type:
getelementptr float addrspace(1)* %x
->getelementptr float, float addrspace(1)* %x
Then, eventually:
getelementptr float, ptr addrspace(1) %x
Importantly, the massive amount of test case churn has been automated by
same crappy python code. I had to manually update a few test cases that
wouldn't fit the script's model (r228970,r229196,r229197,r229198). The
python script just massages stdin and writes the result to stdout, I
then wrapped that in a shell script to handle replacing files, then
using the usual find+xargs to migrate all the files.
update.py:
import fileinput
import sys
import re
ibrep = re.compile(r"(^.*?[^%\w]getelementptr inbounds )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
normrep = re.compile( r"(^.*?[^%\w]getelementptr )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
def conv(match, line):
if not match:
return line
line = match.groups()[0]
if len(match.groups()[5]) == 0:
line += match.groups()[2]
line += match.groups()[3]
line += ", "
line += match.groups()[1]
line += "\n"
return line
for line in sys.stdin:
if line.find("getelementptr ") == line.find("getelementptr inbounds"):
if line.find("getelementptr inbounds") != line.find("getelementptr inbounds ("):
line = conv(re.match(ibrep, line), line)
elif line.find("getelementptr ") != line.find("getelementptr ("):
line = conv(re.match(normrep, line), line)
sys.stdout.write(line)
apply.sh:
for name in "$@"
do
python3 `dirname "$0"`/update.py < "$name" > "$name.tmp" && mv "$name.tmp" "$name"
rm -f "$name.tmp"
done
The actual commands:
From llvm/src:
find test/ -name *.ll | xargs ./apply.sh
From llvm/src/tools/clang:
find test/ -name *.mm -o -name *.m -o -name *.cpp -o -name *.c | xargs -I '{}' ../../apply.sh "{}"
From llvm/src/tools/polly:
find test/ -name *.ll | xargs ./apply.sh
After that, check-all (with llvm, clang, clang-tools-extra, lld,
compiler-rt, and polly all checked out).
The extra 'rm' in the apply.sh script is due to a few files in clang's test
suite using interesting unicode stuff that my python script was throwing
exceptions on. None of those files needed to be migrated, so it seemed
sufficient to ignore those cases.
Reviewers: rafael, dexonsmith, grosser
Differential Revision: http://reviews.llvm.org/D7636
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230786 91177308-0d34-0410-b5e6-96231b3b80d8
2015-02-27 19:29:02 +00:00
|
|
|
%dead = getelementptr %Ty, %Ty* @X2, i64 0, i32 0
|
2010-08-29 18:22:25 +00:00
|
|
|
br i1 false, label %Loop, label %Out
|
|
|
|
|
Out:
|
|
|
|
|
ret void
|
2013-07-14 01:42:54 +00:00
|
|
|
; CHECK-LABEL: @test11(
|
2010-08-29 18:22:25 +00:00
|
|
|
; CHECK: Out:
|
|
|
|
|
; CHECK-NEXT: ret void
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-11 12:52:27 +00:00
|
|
|
@c = common global [1 x i32] zeroinitializer, align 4
|
|
|
|
|
|
|
|
|
|
; Test a *many* way nested loop with multiple exit blocks both of which exit
|
|
|
|
|
; multiple loop nests. This exercises LCSSA corner cases.
|
|
|
|
|
define i32 @PR18753(i1* %a, i1* %b, i1* %c, i1* %d) {
|
|
|
|
|
entry:
|
|
|
|
|
br label %l1.header
|
|
|
|
|
|
|
|
|
|
l1.header:
|
|
|
|
|
%iv = phi i64 [ %iv.next, %l1.latch ], [ 0, %entry ]
|
[opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
One of several parallel first steps to remove the target type of pointers,
replacing them with a single opaque pointer type.
This adds an explicit type parameter to the gep instruction so that when the
first parameter becomes an opaque pointer type, the type to gep through is
still available to the instructions.
* This doesn't modify gep operators, only instructions (operators will be
handled separately)
* Textual IR changes only. Bitcode (including upgrade) and changing the
in-memory representation will be in separate changes.
* geps of vectors are transformed as:
getelementptr <4 x float*> %x, ...
->getelementptr float, <4 x float*> %x, ...
Then, once the opaque pointer type is introduced, this will ultimately look
like:
getelementptr float, <4 x ptr> %x
with the unambiguous interpretation that it is a vector of pointers to float.
* address spaces remain on the pointer, not the type:
getelementptr float addrspace(1)* %x
->getelementptr float, float addrspace(1)* %x
Then, eventually:
getelementptr float, ptr addrspace(1) %x
Importantly, the massive amount of test case churn has been automated by
same crappy python code. I had to manually update a few test cases that
wouldn't fit the script's model (r228970,r229196,r229197,r229198). The
python script just massages stdin and writes the result to stdout, I
then wrapped that in a shell script to handle replacing files, then
using the usual find+xargs to migrate all the files.
update.py:
import fileinput
import sys
import re
ibrep = re.compile(r"(^.*?[^%\w]getelementptr inbounds )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
normrep = re.compile( r"(^.*?[^%\w]getelementptr )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
def conv(match, line):
if not match:
return line
line = match.groups()[0]
if len(match.groups()[5]) == 0:
line += match.groups()[2]
line += match.groups()[3]
line += ", "
line += match.groups()[1]
line += "\n"
return line
for line in sys.stdin:
if line.find("getelementptr ") == line.find("getelementptr inbounds"):
if line.find("getelementptr inbounds") != line.find("getelementptr inbounds ("):
line = conv(re.match(ibrep, line), line)
elif line.find("getelementptr ") != line.find("getelementptr ("):
line = conv(re.match(normrep, line), line)
sys.stdout.write(line)
apply.sh:
for name in "$@"
do
python3 `dirname "$0"`/update.py < "$name" > "$name.tmp" && mv "$name.tmp" "$name"
rm -f "$name.tmp"
done
The actual commands:
From llvm/src:
find test/ -name *.ll | xargs ./apply.sh
From llvm/src/tools/clang:
find test/ -name *.mm -o -name *.m -o -name *.cpp -o -name *.c | xargs -I '{}' ../../apply.sh "{}"
From llvm/src/tools/polly:
find test/ -name *.ll | xargs ./apply.sh
After that, check-all (with llvm, clang, clang-tools-extra, lld,
compiler-rt, and polly all checked out).
The extra 'rm' in the apply.sh script is due to a few files in clang's test
suite using interesting unicode stuff that my python script was throwing
exceptions on. None of those files needed to be migrated, so it seemed
sufficient to ignore those cases.
Reviewers: rafael, dexonsmith, grosser
Differential Revision: http://reviews.llvm.org/D7636
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230786 91177308-0d34-0410-b5e6-96231b3b80d8
2015-02-27 19:29:02 +00:00
|
|
|
%arrayidx.i = getelementptr inbounds [1 x i32], [1 x i32]* @c, i64 0, i64 %iv
|
2014-02-11 12:52:27 +00:00
|
|
|
br label %l2.header
|
|
|
|
|
|
|
|
|
|
l2.header:
|
|
|
|
|
%x0 = load i1* %c, align 4
|
|
|
|
|
br i1 %x0, label %l1.latch, label %l3.preheader
|
|
|
|
|
|
|
|
|
|
l3.preheader:
|
|
|
|
|
br label %l3.header
|
|
|
|
|
|
|
|
|
|
l3.header:
|
|
|
|
|
%x1 = load i1* %d, align 4
|
|
|
|
|
br i1 %x1, label %l2.latch, label %l4.preheader
|
|
|
|
|
|
|
|
|
|
l4.preheader:
|
|
|
|
|
br label %l4.header
|
|
|
|
|
|
|
|
|
|
l4.header:
|
|
|
|
|
%x2 = load i1* %a
|
|
|
|
|
br i1 %x2, label %l3.latch, label %l4.body
|
|
|
|
|
|
|
|
|
|
l4.body:
|
|
|
|
|
call void @f(i32* %arrayidx.i)
|
|
|
|
|
%x3 = load i1* %b
|
|
|
|
|
%l = trunc i64 %iv to i32
|
|
|
|
|
br i1 %x3, label %l4.latch, label %exit
|
|
|
|
|
|
|
|
|
|
l4.latch:
|
|
|
|
|
call void @g()
|
|
|
|
|
%x4 = load i1* %b, align 4
|
|
|
|
|
br i1 %x4, label %l4.header, label %exit
|
|
|
|
|
|
|
|
|
|
l3.latch:
|
|
|
|
|
br label %l3.header
|
|
|
|
|
|
|
|
|
|
l2.latch:
|
|
|
|
|
br label %l2.header
|
|
|
|
|
|
|
|
|
|
l1.latch:
|
|
|
|
|
%iv.next = add nsw i64 %iv, 1
|
|
|
|
|
br label %l1.header
|
|
|
|
|
|
|
|
|
|
exit:
|
|
|
|
|
%lcssa = phi i32 [ %l, %l4.latch ], [ %l, %l4.body ]
|
|
|
|
|
; CHECK-LABEL: @PR18753(
|
|
|
|
|
; CHECK: exit:
|
|
|
|
|
; CHECK-NEXT: %[[LCSSAPHI:.*]] = phi i64 [ %iv, %l4.latch ], [ %iv, %l4.body ]
|
|
|
|
|
; CHECK-NEXT: %l.le = trunc i64 %[[LCSSAPHI]] to i32
|
|
|
|
|
; CHECK-NEXT: ret i32 %l.le
|
|
|
|
|
|
|
|
|
|
ret i32 %lcssa
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-28 19:47:46 +00:00
|
|
|
; Can't sink stores out of exit blocks containing indirectbr instructions
|
|
|
|
|
; because loop simplify does not create dedicated exits for such blocks. Test
|
|
|
|
|
; that by sinking the store from lab21 to lab22, but not further.
|
|
|
|
|
define void @test12() {
|
|
|
|
|
; CHECK-LABEL: @test12
|
|
|
|
|
br label %lab4
|
|
|
|
|
|
|
|
|
|
lab4:
|
|
|
|
|
br label %lab20
|
|
|
|
|
|
|
|
|
|
lab5:
|
|
|
|
|
br label %lab20
|
|
|
|
|
|
|
|
|
|
lab6:
|
|
|
|
|
br label %lab4
|
|
|
|
|
|
|
|
|
|
lab7:
|
|
|
|
|
br i1 undef, label %lab8, label %lab13
|
|
|
|
|
|
|
|
|
|
lab8:
|
|
|
|
|
br i1 undef, label %lab13, label %lab10
|
|
|
|
|
|
|
|
|
|
lab10:
|
|
|
|
|
br label %lab7
|
|
|
|
|
|
|
|
|
|
lab13:
|
|
|
|
|
ret void
|
|
|
|
|
|
|
|
|
|
lab20:
|
|
|
|
|
br label %lab21
|
|
|
|
|
|
|
|
|
|
lab21:
|
|
|
|
|
; CHECK: lab21:
|
|
|
|
|
; CHECK-NOT: store
|
|
|
|
|
; CHECK: br i1 false, label %lab21, label %lab22
|
|
|
|
|
store i32 36127957, i32* undef, align 4
|
|
|
|
|
br i1 undef, label %lab21, label %lab22
|
|
|
|
|
|
|
|
|
|
lab22:
|
|
|
|
|
; CHECK: lab22:
|
|
|
|
|
; CHECK: store
|
|
|
|
|
; CHECK-NEXT: indirectbr i8* undef
|
|
|
|
|
indirectbr i8* undef, [label %lab5, label %lab6, label %lab7]
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-02 14:22:34 +00:00
|
|
|
; Test that we don't crash when trying to sink stores and there's no preheader
|
|
|
|
|
; available (which is used for creating loads that may be used by the SSA
|
|
|
|
|
; updater)
|
|
|
|
|
define void @test13() {
|
|
|
|
|
; CHECK-LABEL: @test13
|
|
|
|
|
br label %lab59
|
|
|
|
|
|
|
|
|
|
lab19:
|
|
|
|
|
br i1 undef, label %lab20, label %lab38
|
|
|
|
|
|
|
|
|
|
lab20:
|
|
|
|
|
br label %lab60
|
|
|
|
|
|
|
|
|
|
lab21:
|
|
|
|
|
br i1 undef, label %lab22, label %lab38
|
|
|
|
|
|
|
|
|
|
lab22:
|
|
|
|
|
br label %lab38
|
|
|
|
|
|
|
|
|
|
lab38:
|
|
|
|
|
ret void
|
|
|
|
|
|
|
|
|
|
lab59:
|
|
|
|
|
indirectbr i8* undef, [label %lab60, label %lab38]
|
|
|
|
|
|
|
|
|
|
lab60:
|
|
|
|
|
; CHECK: lab60:
|
|
|
|
|
; CHECK: store
|
|
|
|
|
; CHECK-NEXT: indirectbr
|
|
|
|
|
store i32 2145244101, i32* undef, align 4
|
|
|
|
|
indirectbr i8* undef, [label %lab21, label %lab19]
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-11 12:52:27 +00:00
|
|
|
declare void @f(i32*)
|
2010-08-29 18:22:25 +00:00
|
|
|
|
2014-02-11 12:52:27 +00:00
|
|
|
declare void @g()
|
