2015-01-16 09:03:22 +08:00
|
|
|
; RUN: opt -verify-loop-info -irce-print-changed-loops -irce < %s 2>&1 | FileCheck %s
|
|
|
|
|
|
|
|
|
|
; This test checks if we update the LoopInfo correctly in the presence
|
|
|
|
|
; of parents, uncles and cousins.
|
|
|
|
|
|
|
|
|
|
; Function Attrs: alwaysinline
|
|
|
|
|
define void @inner_loop(i32* %arr, i32* %a_len_ptr, i32 %n) #0 {
|
|
|
|
|
; CHECK: irce: in function inner_loop: constrained Loop at depth 1 containing: %loop<header><exiting>,%in.bounds<latch><exiting>
|
|
|
|
|
|
|
|
|
|
entry:
|
2015-02-28 05:17:42 +08:00
|
|
|
%len = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
loop: ; preds = %in.bounds, %entry
|
|
|
|
|
%idx = phi i32 [ 0, %entry ], [ %idx.next, %in.bounds ]
|
|
|
|
|
%idx.next = add i32 %idx, 1
|
|
|
|
|
%abc = icmp slt i32 %idx, %len
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc, label %in.bounds, label %out.of.bounds, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds: ; preds = %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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr = getelementptr i32, i32* %arr, i32 %idx
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr
|
|
|
|
|
%next = icmp slt i32 %idx.next, %n
|
|
|
|
|
br i1 %next, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
out.of.bounds: ; preds = %loop
|
|
|
|
|
ret void
|
|
|
|
|
|
|
|
|
|
exit: ; preds = %in.bounds, %entry
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Function Attrs: alwaysinline
|
|
|
|
|
define void @with_parent(i32* %arr, i32* %a_len_ptr, i32 %n, i32 %parent.count) #0 {
|
|
|
|
|
; CHECK: irce: in function with_parent: constrained Loop at depth 2 containing: %loop.i<header><exiting>,%in.bounds.i<latch><exiting>
|
|
|
|
|
|
|
|
|
|
entry:
|
|
|
|
|
br label %loop
|
|
|
|
|
|
|
|
|
|
loop: ; preds = %inner_loop.exit, %entry
|
|
|
|
|
%idx = phi i32 [ 0, %entry ], [ %idx.next, %inner_loop.exit ]
|
|
|
|
|
%idx.next = add i32 %idx, 1
|
|
|
|
|
%next = icmp ult i32 %idx.next, %parent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i, label %loop.i, label %exit.i
|
|
|
|
|
|
|
|
|
|
loop.i: ; preds = %in.bounds.i, %loop
|
|
|
|
|
%idx.i = phi i32 [ 0, %loop ], [ %idx.next.i, %in.bounds.i ]
|
|
|
|
|
%idx.next.i = add i32 %idx.i, 1
|
|
|
|
|
%abc.i = icmp slt i32 %idx.i, %len.i
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i, label %in.bounds.i, label %out.of.bounds.i, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i: ; preds = %loop.i
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i = getelementptr i32, i32* %arr, i32 %idx.i
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i
|
|
|
|
|
%next.i = icmp slt i32 %idx.next.i, %n
|
|
|
|
|
br i1 %next.i, label %loop.i, label %exit.i
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i: ; preds = %loop.i
|
|
|
|
|
br label %inner_loop.exit
|
|
|
|
|
|
|
|
|
|
exit.i: ; preds = %in.bounds.i, %loop
|
|
|
|
|
br label %inner_loop.exit
|
|
|
|
|
|
|
|
|
|
inner_loop.exit: ; preds = %exit.i, %out.of.bounds.i
|
|
|
|
|
br i1 %next, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
exit: ; preds = %inner_loop.exit
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Function Attrs: alwaysinline
|
|
|
|
|
define void @with_grandparent(i32* %arr, i32* %a_len_ptr, i32 %n, i32 %parent.count, i32 %grandparent.count) #0 {
|
|
|
|
|
; CHECK: irce: in function with_grandparent: constrained Loop at depth 3 containing: %loop.i.i<header><exiting>,%in.bounds.i.i<latch><exiting>
|
|
|
|
|
|
|
|
|
|
entry:
|
|
|
|
|
br label %loop
|
|
|
|
|
|
|
|
|
|
loop: ; preds = %with_parent.exit, %entry
|
|
|
|
|
%idx = phi i32 [ 0, %entry ], [ %idx.next, %with_parent.exit ]
|
|
|
|
|
%idx.next = add i32 %idx, 1
|
|
|
|
|
%next = icmp ult i32 %idx.next, %grandparent.count
|
|
|
|
|
br label %loop.i
|
|
|
|
|
|
|
|
|
|
loop.i: ; preds = %inner_loop.exit.i, %loop
|
|
|
|
|
%idx.i = phi i32 [ 0, %loop ], [ %idx.next.i, %inner_loop.exit.i ]
|
|
|
|
|
%idx.next.i = add i32 %idx.i, 1
|
|
|
|
|
%next.i = icmp ult i32 %idx.next.i, %parent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i.i = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i.i = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i.i, label %loop.i.i, label %exit.i.i
|
|
|
|
|
|
|
|
|
|
loop.i.i: ; preds = %in.bounds.i.i, %loop.i
|
|
|
|
|
%idx.i.i = phi i32 [ 0, %loop.i ], [ %idx.next.i.i, %in.bounds.i.i ]
|
|
|
|
|
%idx.next.i.i = add i32 %idx.i.i, 1
|
|
|
|
|
%abc.i.i = icmp slt i32 %idx.i.i, %len.i.i
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i.i, label %in.bounds.i.i, label %out.of.bounds.i.i, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i.i: ; preds = %loop.i.i
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i.i = getelementptr i32, i32* %arr, i32 %idx.i.i
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i.i
|
|
|
|
|
%next.i.i = icmp slt i32 %idx.next.i.i, %n
|
|
|
|
|
br i1 %next.i.i, label %loop.i.i, label %exit.i.i
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i.i: ; preds = %loop.i.i
|
|
|
|
|
br label %inner_loop.exit.i
|
|
|
|
|
|
|
|
|
|
exit.i.i: ; preds = %in.bounds.i.i, %loop.i
|
|
|
|
|
br label %inner_loop.exit.i
|
|
|
|
|
|
|
|
|
|
inner_loop.exit.i: ; preds = %exit.i.i, %out.of.bounds.i.i
|
|
|
|
|
br i1 %next.i, label %loop.i, label %with_parent.exit
|
|
|
|
|
|
|
|
|
|
with_parent.exit: ; preds = %inner_loop.exit.i
|
|
|
|
|
br i1 %next, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
exit: ; preds = %with_parent.exit
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Function Attrs: alwaysinline
|
|
|
|
|
define void @with_sibling(i32* %arr, i32* %a_len_ptr, i32 %n, i32 %parent.count) #0 {
|
|
|
|
|
; CHECK: irce: in function with_sibling: constrained Loop at depth 2 containing: %loop.i<header><exiting>,%in.bounds.i<latch><exiting>
|
|
|
|
|
; CHECK: irce: in function with_sibling: constrained Loop at depth 2 containing: %loop.i6<header><exiting>,%in.bounds.i9<latch><exiting>
|
|
|
|
|
|
|
|
|
|
entry:
|
|
|
|
|
br label %loop
|
|
|
|
|
|
|
|
|
|
loop: ; preds = %inner_loop.exit12, %entry
|
|
|
|
|
%idx = phi i32 [ 0, %entry ], [ %idx.next, %inner_loop.exit12 ]
|
|
|
|
|
%idx.next = add i32 %idx, 1
|
|
|
|
|
%next = icmp ult i32 %idx.next, %parent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i, label %loop.i, label %exit.i
|
|
|
|
|
|
|
|
|
|
loop.i: ; preds = %in.bounds.i, %loop
|
|
|
|
|
%idx.i = phi i32 [ 0, %loop ], [ %idx.next.i, %in.bounds.i ]
|
|
|
|
|
%idx.next.i = add i32 %idx.i, 1
|
|
|
|
|
%abc.i = icmp slt i32 %idx.i, %len.i
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i, label %in.bounds.i, label %out.of.bounds.i, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i: ; preds = %loop.i
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i = getelementptr i32, i32* %arr, i32 %idx.i
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i
|
|
|
|
|
%next.i = icmp slt i32 %idx.next.i, %n
|
|
|
|
|
br i1 %next.i, label %loop.i, label %exit.i
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i: ; preds = %loop.i
|
|
|
|
|
br label %inner_loop.exit
|
|
|
|
|
|
|
|
|
|
exit.i: ; preds = %in.bounds.i, %loop
|
|
|
|
|
br label %inner_loop.exit
|
|
|
|
|
|
|
|
|
|
inner_loop.exit: ; preds = %exit.i, %out.of.bounds.i
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i1 = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i2 = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i2, label %loop.i6, label %exit.i11
|
|
|
|
|
|
|
|
|
|
loop.i6: ; preds = %in.bounds.i9, %inner_loop.exit
|
|
|
|
|
%idx.i3 = phi i32 [ 0, %inner_loop.exit ], [ %idx.next.i4, %in.bounds.i9 ]
|
|
|
|
|
%idx.next.i4 = add i32 %idx.i3, 1
|
|
|
|
|
%abc.i5 = icmp slt i32 %idx.i3, %len.i1
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i5, label %in.bounds.i9, label %out.of.bounds.i10, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i9: ; preds = %loop.i6
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i7 = getelementptr i32, i32* %arr, i32 %idx.i3
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i7
|
|
|
|
|
%next.i8 = icmp slt i32 %idx.next.i4, %n
|
|
|
|
|
br i1 %next.i8, label %loop.i6, label %exit.i11
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i10: ; preds = %loop.i6
|
|
|
|
|
br label %inner_loop.exit12
|
|
|
|
|
|
|
|
|
|
exit.i11: ; preds = %in.bounds.i9, %inner_loop.exit
|
|
|
|
|
br label %inner_loop.exit12
|
|
|
|
|
|
|
|
|
|
inner_loop.exit12: ; preds = %exit.i11, %out.of.bounds.i10
|
|
|
|
|
br i1 %next, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
exit: ; preds = %inner_loop.exit12
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Function Attrs: alwaysinline
|
|
|
|
|
define void @with_cousin(i32* %arr, i32* %a_len_ptr, i32 %n, i32 %parent.count, i32 %grandparent.count) #0 {
|
|
|
|
|
; CHECK: irce: in function with_cousin: constrained Loop at depth 3 containing: %loop.i.i<header><exiting>,%in.bounds.i.i<latch><exiting>
|
|
|
|
|
; CHECK: irce: in function with_cousin: constrained Loop at depth 3 containing: %loop.i.i10<header><exiting>,%in.bounds.i.i13<latch><exiting>
|
|
|
|
|
|
|
|
|
|
entry:
|
|
|
|
|
br label %loop
|
|
|
|
|
|
|
|
|
|
loop: ; preds = %with_parent.exit17, %entry
|
|
|
|
|
%idx = phi i32 [ 0, %entry ], [ %idx.next, %with_parent.exit17 ]
|
|
|
|
|
%idx.next = add i32 %idx, 1
|
|
|
|
|
%next = icmp ult i32 %idx.next, %grandparent.count
|
|
|
|
|
br label %loop.i
|
|
|
|
|
|
|
|
|
|
loop.i: ; preds = %inner_loop.exit.i, %loop
|
|
|
|
|
%idx.i = phi i32 [ 0, %loop ], [ %idx.next.i, %inner_loop.exit.i ]
|
|
|
|
|
%idx.next.i = add i32 %idx.i, 1
|
|
|
|
|
%next.i = icmp ult i32 %idx.next.i, %parent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i.i = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i.i = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i.i, label %loop.i.i, label %exit.i.i
|
|
|
|
|
|
|
|
|
|
loop.i.i: ; preds = %in.bounds.i.i, %loop.i
|
|
|
|
|
%idx.i.i = phi i32 [ 0, %loop.i ], [ %idx.next.i.i, %in.bounds.i.i ]
|
|
|
|
|
%idx.next.i.i = add i32 %idx.i.i, 1
|
|
|
|
|
%abc.i.i = icmp slt i32 %idx.i.i, %len.i.i
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i.i, label %in.bounds.i.i, label %out.of.bounds.i.i, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i.i: ; preds = %loop.i.i
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i.i = getelementptr i32, i32* %arr, i32 %idx.i.i
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i.i
|
|
|
|
|
%next.i.i = icmp slt i32 %idx.next.i.i, %n
|
|
|
|
|
br i1 %next.i.i, label %loop.i.i, label %exit.i.i
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i.i: ; preds = %loop.i.i
|
|
|
|
|
br label %inner_loop.exit.i
|
|
|
|
|
|
|
|
|
|
exit.i.i: ; preds = %in.bounds.i.i, %loop.i
|
|
|
|
|
br label %inner_loop.exit.i
|
|
|
|
|
|
|
|
|
|
inner_loop.exit.i: ; preds = %exit.i.i, %out.of.bounds.i.i
|
|
|
|
|
br i1 %next.i, label %loop.i, label %with_parent.exit
|
|
|
|
|
|
|
|
|
|
with_parent.exit: ; preds = %inner_loop.exit.i
|
|
|
|
|
br label %loop.i6
|
|
|
|
|
|
|
|
|
|
loop.i6: ; preds = %inner_loop.exit.i16, %with_parent.exit
|
|
|
|
|
%idx.i1 = phi i32 [ 0, %with_parent.exit ], [ %idx.next.i2, %inner_loop.exit.i16 ]
|
|
|
|
|
%idx.next.i2 = add i32 %idx.i1, 1
|
|
|
|
|
%next.i3 = icmp ult i32 %idx.next.i2, %parent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i.i4 = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i.i5 = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i.i5, label %loop.i.i10, label %exit.i.i15
|
|
|
|
|
|
|
|
|
|
loop.i.i10: ; preds = %in.bounds.i.i13, %loop.i6
|
|
|
|
|
%idx.i.i7 = phi i32 [ 0, %loop.i6 ], [ %idx.next.i.i8, %in.bounds.i.i13 ]
|
|
|
|
|
%idx.next.i.i8 = add i32 %idx.i.i7, 1
|
|
|
|
|
%abc.i.i9 = icmp slt i32 %idx.i.i7, %len.i.i4
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i.i9, label %in.bounds.i.i13, label %out.of.bounds.i.i14, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i.i13: ; preds = %loop.i.i10
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i.i11 = getelementptr i32, i32* %arr, i32 %idx.i.i7
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i.i11
|
|
|
|
|
%next.i.i12 = icmp slt i32 %idx.next.i.i8, %n
|
|
|
|
|
br i1 %next.i.i12, label %loop.i.i10, label %exit.i.i15
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i.i14: ; preds = %loop.i.i10
|
|
|
|
|
br label %inner_loop.exit.i16
|
|
|
|
|
|
|
|
|
|
exit.i.i15: ; preds = %in.bounds.i.i13, %loop.i6
|
|
|
|
|
br label %inner_loop.exit.i16
|
|
|
|
|
|
|
|
|
|
inner_loop.exit.i16: ; preds = %exit.i.i15, %out.of.bounds.i.i14
|
|
|
|
|
br i1 %next.i3, label %loop.i6, label %with_parent.exit17
|
|
|
|
|
|
|
|
|
|
with_parent.exit17: ; preds = %inner_loop.exit.i16
|
|
|
|
|
br i1 %next, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
exit: ; preds = %with_parent.exit17
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Function Attrs: alwaysinline
|
|
|
|
|
define void @with_uncle(i32* %arr, i32* %a_len_ptr, i32 %n, i32 %parent.count, i32 %grandparent.count) #0 {
|
|
|
|
|
; CHECK: irce: in function with_uncle: constrained Loop at depth 2 containing: %loop.i<header><exiting>,%in.bounds.i<latch><exiting>
|
|
|
|
|
; CHECK: irce: in function with_uncle: constrained Loop at depth 3 containing: %loop.i.i<header><exiting>,%in.bounds.i.i<latch><exiting>
|
|
|
|
|
|
|
|
|
|
entry:
|
|
|
|
|
br label %loop
|
|
|
|
|
|
|
|
|
|
loop: ; preds = %with_parent.exit, %entry
|
|
|
|
|
%idx = phi i32 [ 0, %entry ], [ %idx.next, %with_parent.exit ]
|
|
|
|
|
%idx.next = add i32 %idx, 1
|
|
|
|
|
%next = icmp ult i32 %idx.next, %grandparent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i, label %loop.i, label %exit.i
|
|
|
|
|
|
|
|
|
|
loop.i: ; preds = %in.bounds.i, %loop
|
|
|
|
|
%idx.i = phi i32 [ 0, %loop ], [ %idx.next.i, %in.bounds.i ]
|
|
|
|
|
%idx.next.i = add i32 %idx.i, 1
|
|
|
|
|
%abc.i = icmp slt i32 %idx.i, %len.i
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i, label %in.bounds.i, label %out.of.bounds.i, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i: ; preds = %loop.i
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i = getelementptr i32, i32* %arr, i32 %idx.i
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i
|
|
|
|
|
%next.i = icmp slt i32 %idx.next.i, %n
|
|
|
|
|
br i1 %next.i, label %loop.i, label %exit.i
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i: ; preds = %loop.i
|
|
|
|
|
br label %inner_loop.exit
|
|
|
|
|
|
|
|
|
|
exit.i: ; preds = %in.bounds.i, %loop
|
|
|
|
|
br label %inner_loop.exit
|
|
|
|
|
|
|
|
|
|
inner_loop.exit: ; preds = %exit.i, %out.of.bounds.i
|
|
|
|
|
br label %loop.i4
|
|
|
|
|
|
|
|
|
|
loop.i4: ; preds = %inner_loop.exit.i, %inner_loop.exit
|
|
|
|
|
%idx.i1 = phi i32 [ 0, %inner_loop.exit ], [ %idx.next.i2, %inner_loop.exit.i ]
|
|
|
|
|
%idx.next.i2 = add i32 %idx.i1, 1
|
|
|
|
|
%next.i3 = icmp ult i32 %idx.next.i2, %parent.count
|
2015-02-28 05:17:42 +08:00
|
|
|
%len.i.i = load i32, i32* %a_len_ptr, !range !0
|
2015-01-16 09:03:22 +08:00
|
|
|
%first.itr.check.i.i = icmp sgt i32 %n, 0
|
|
|
|
|
br i1 %first.itr.check.i.i, label %loop.i.i, label %exit.i.i
|
|
|
|
|
|
|
|
|
|
loop.i.i: ; preds = %in.bounds.i.i, %loop.i4
|
|
|
|
|
%idx.i.i = phi i32 [ 0, %loop.i4 ], [ %idx.next.i.i, %in.bounds.i.i ]
|
|
|
|
|
%idx.next.i.i = add i32 %idx.i.i, 1
|
|
|
|
|
%abc.i.i = icmp slt i32 %idx.i.i, %len.i.i
|
2015-01-28 05:38:12 +08:00
|
|
|
br i1 %abc.i.i, label %in.bounds.i.i, label %out.of.bounds.i.i, !prof !1
|
2015-01-16 09:03:22 +08:00
|
|
|
|
|
|
|
|
in.bounds.i.i: ; preds = %loop.i.i
|
[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
llvm-svn: 230786
2015-02-28 03:29:02 +08:00
|
|
|
%addr.i.i = getelementptr i32, i32* %arr, i32 %idx.i.i
|
2015-01-16 09:03:22 +08:00
|
|
|
store i32 0, i32* %addr.i.i
|
|
|
|
|
%next.i.i = icmp slt i32 %idx.next.i.i, %n
|
|
|
|
|
br i1 %next.i.i, label %loop.i.i, label %exit.i.i
|
|
|
|
|
|
|
|
|
|
out.of.bounds.i.i: ; preds = %loop.i.i
|
|
|
|
|
br label %inner_loop.exit.i
|
|
|
|
|
|
|
|
|
|
exit.i.i: ; preds = %in.bounds.i.i, %loop.i4
|
|
|
|
|
br label %inner_loop.exit.i
|
|
|
|
|
|
|
|
|
|
inner_loop.exit.i: ; preds = %exit.i.i, %out.of.bounds.i.i
|
|
|
|
|
br i1 %next.i3, label %loop.i4, label %with_parent.exit
|
|
|
|
|
|
|
|
|
|
with_parent.exit: ; preds = %inner_loop.exit.i
|
|
|
|
|
br i1 %next, label %loop, label %exit
|
|
|
|
|
|
|
|
|
|
exit: ; preds = %with_parent.exit
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
attributes #0 = { alwaysinline }
|
|
|
|
|
|
|
|
|
|
!0 = !{i32 0, i32 2147483647}
|
2015-01-28 05:38:12 +08:00
|
|
|
!1 = !{!"branch_weights", i32 64, i32 4}
|