diff options
author | David Blaikie <dblaikie@gmail.com> | 2015-02-27 19:29:02 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2015-02-27 19:29:02 +0000 |
commit | 198d8baafbfdfcf5a5e219602a5d94ed263973b4 (patch) | |
tree | 1c76a588765bdfffb32fbce3c05cf18009be4f64 /test/CodeGen/X86/ragreedy-hoist-spill.ll | |
parent | 56f3b7f2fd1505ecf94bed8cae92375cdcde4efe (diff) |
[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
Diffstat (limited to 'test/CodeGen/X86/ragreedy-hoist-spill.ll')
-rw-r--r-- | test/CodeGen/X86/ragreedy-hoist-spill.ll | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/CodeGen/X86/ragreedy-hoist-spill.ll b/test/CodeGen/X86/ragreedy-hoist-spill.ll index 57afb4152db..454680f134b 100644 --- a/test/CodeGen/X86/ragreedy-hoist-spill.ll +++ b/test/CodeGen/X86/ragreedy-hoist-spill.ll @@ -18,7 +18,7 @@ define i8* @SyFgets(i8* %line, i64 %length, i64 %fid) { entry: %sub.ptr.rhs.cast646 = ptrtoint i8* %line to i64 %old = alloca [512 x i8], align 16 - %0 = getelementptr inbounds [512 x i8]* %old, i64 0, i64 0 + %0 = getelementptr inbounds [512 x i8], [512 x i8]* %old, i64 0, i64 0 switch i64 %fid, label %if.then [ i64 2, label %if.end i64 0, label %if.end @@ -58,7 +58,7 @@ if.then.i2712: unreachable SyTime.exit2720: - %add.ptr = getelementptr [512 x i8]* %old, i64 0, i64 512 + %add.ptr = getelementptr [512 x i8], [512 x i8]* %old, i64 0, i64 512 %cmp293427 = icmp ult i8* %0, %add.ptr br i1 %cmp293427, label %for.body.lr.ph, label %while.body.preheader @@ -67,8 +67,8 @@ for.body.lr.ph: br label %while.body.preheader while.body.preheader: - %add.ptr1603 = getelementptr [512 x i8]* null, i64 0, i64 512 - %echo.i3101 = getelementptr [16 x %struct.TMP.1]* @syBuf, i64 0, i64 %fid, i32 1 + %add.ptr1603 = getelementptr [512 x i8], [512 x i8]* null, i64 0, i64 512 + %echo.i3101 = getelementptr [16 x %struct.TMP.1], [16 x %struct.TMP.1]* @syBuf, i64 0, i64 %fid, i32 1 %1 = xor i64 %sub.ptr.rhs.cast646, -1 br label %do.body @@ -210,7 +210,7 @@ land.lhs.true504: br i1 undef, label %do.body479.backedge, label %if.end517 do.body479.backedge: - %incdec.ptr480 = getelementptr i8* %incdec.ptr4803316, i64 1 + %incdec.ptr480 = getelementptr i8, i8* %incdec.ptr4803316, i64 1 %cmp483 = icmp eq i8 undef, 0 br i1 %cmp483, label %if.end517, label %do.body479.backedge.land.rhs485_crit_edge @@ -245,7 +245,7 @@ for.end552: %s.2.lcssa = phi i8* [ undef, %for.cond542.preheader ], [ %q.4, %for.body545 ] %sub.ptr.lhs.cast553 = ptrtoint i8* %s.2.lcssa to i64 %sub.ptr.sub555 = sub i64 %sub.ptr.lhs.cast553, 0 - %arrayidx556 = getelementptr i8* null, i64 %sub.ptr.sub555 + %arrayidx556 = getelementptr i8, i8* null, i64 %sub.ptr.sub555 store i8 0, i8* %arrayidx556, align 1, !tbaa !5 br label %while.cond197.backedge @@ -361,9 +361,9 @@ while.end1693: for.body1723: %q.303203 = phi i8* [ getelementptr inbounds ([8192 x i8]* @syHistory, i64 0, i64 8189), %if.then1477 ], [ %incdec.ptr1730, %for.body1723 ] - %add.ptr1728 = getelementptr i8* %q.303203, i64 %idx.neg1727 + %add.ptr1728 = getelementptr i8, i8* %q.303203, i64 %idx.neg1727 %5 = load i8* %add.ptr1728, align 1, !tbaa !5 - %incdec.ptr1730 = getelementptr i8* %q.303203, i64 -1 + %incdec.ptr1730 = getelementptr i8, i8* %q.303203, i64 -1 br label %for.body1723 cleanup: |