2015-02-26 19:35:15 +01:00
|
|
|
; RUN: llc --march=mips64 -mcpu=mips64r2 < %s | FileCheck %s
|
|
|
|
|
|
|
|
|
|
; Generated from the C program:
|
|
|
|
|
;
|
|
|
|
|
; #include <stdio.h>
|
|
|
|
|
; #include <string.h>
|
|
|
|
|
;
|
|
|
|
|
; struct SmallStruct_1b1s {
|
|
|
|
|
; char x1;
|
|
|
|
|
; short x2;
|
|
|
|
|
; };
|
|
|
|
|
;
|
|
|
|
|
; struct SmallStruct_1b1i {
|
|
|
|
|
; char x1;
|
|
|
|
|
; int x2;
|
|
|
|
|
; };
|
|
|
|
|
;
|
|
|
|
|
; struct SmallStruct_1b1s1b {
|
|
|
|
|
; char x1;
|
|
|
|
|
; short x2;
|
|
|
|
|
; char x3;
|
|
|
|
|
; };
|
|
|
|
|
;
|
|
|
|
|
; struct SmallStruct_1s1i {
|
|
|
|
|
; short x1;
|
|
|
|
|
; int x2;
|
|
|
|
|
; };
|
|
|
|
|
;
|
|
|
|
|
; struct SmallStruct_3b1s {
|
|
|
|
|
; char x1;
|
|
|
|
|
; char x2;
|
|
|
|
|
; char x3;
|
|
|
|
|
; short x4;
|
|
|
|
|
; };
|
|
|
|
|
;
|
|
|
|
|
; void varArgF_SmallStruct(char* c, ...);
|
|
|
|
|
;
|
|
|
|
|
; void smallStruct_1b1s(struct SmallStruct_1b1s* ss)
|
|
|
|
|
; {
|
|
|
|
|
; varArgF_SmallStruct("", *ss);
|
|
|
|
|
; }
|
|
|
|
|
;
|
|
|
|
|
; void smallStruct_1b1i(struct SmallStruct_1b1i* ss)
|
|
|
|
|
; {
|
|
|
|
|
; varArgF_SmallStruct("", *ss);
|
|
|
|
|
; }
|
|
|
|
|
;
|
|
|
|
|
; void smallStruct_1b1s1b(struct SmallStruct_1b1s1b* ss)
|
|
|
|
|
; {
|
|
|
|
|
; varArgF_SmallStruct("", *ss);
|
|
|
|
|
; }
|
|
|
|
|
;
|
|
|
|
|
; void smallStruct_1s1i(struct SmallStruct_1s1i* ss)
|
|
|
|
|
; {
|
|
|
|
|
; varArgF_SmallStruct("", *ss);
|
|
|
|
|
; }
|
|
|
|
|
;
|
|
|
|
|
; void smallStruct_3b1s(struct SmallStruct_3b1s* ss)
|
|
|
|
|
; {
|
|
|
|
|
; varArgF_SmallStruct("", *ss);
|
|
|
|
|
; }
|
|
|
|
|
|
|
|
|
|
%struct.SmallStruct_1b1s = type { i8, i16 }
|
|
|
|
|
%struct.SmallStruct_1b1i = type { i8, i32 }
|
|
|
|
|
%struct.SmallStruct_1b1s1b = type { i8, i16, i8 }
|
|
|
|
|
%struct.SmallStruct_1s1i = type { i16, i32 }
|
|
|
|
|
%struct.SmallStruct_3b1s = type { i8, i8, i8, i16 }
|
|
|
|
|
|
|
|
|
|
@.str = private unnamed_addr constant [3 x i8] c"01\00", align 1
|
|
|
|
|
|
|
|
|
|
declare void @varArgF_SmallStruct(i8* %c, ...)
|
|
|
|
|
|
|
|
|
|
define void @smallStruct_1b1s(%struct.SmallStruct_1b1s* %ss) #0 {
|
|
|
|
|
entry:
|
|
|
|
|
%ss.addr = alloca %struct.SmallStruct_1b1s*, align 8
|
|
|
|
|
store %struct.SmallStruct_1b1s* %ss, %struct.SmallStruct_1b1s** %ss.addr, align 8
|
2015-02-27 22:17:42 +01:00
|
|
|
%0 = load %struct.SmallStruct_1b1s*, %struct.SmallStruct_1b1s** %ss.addr, align 8
|
2015-02-26 19:35:15 +01:00
|
|
|
%1 = bitcast %struct.SmallStruct_1b1s* %0 to { i32 }*
|
[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-27 20:29:02 +01:00
|
|
|
%2 = getelementptr { i32 }, { i32 }* %1, i32 0, i32 0
|
2015-02-27 22:17:42 +01:00
|
|
|
%3 = load i32, i32* %2, align 1
|
2015-03-13 19:20:45 +01:00
|
|
|
call void (i8*, ...)* @varArgF_SmallStruct(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), i32 inreg %3)
|
2015-02-26 19:35:15 +01:00
|
|
|
ret void
|
|
|
|
|
; CHECK-LABEL: smallStruct_1b1s:
|
|
|
|
|
; CHECK: dsll $[[R1:[0-9]+]], $[[R2:[0-9]+]], 32
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define void @smallStruct_1b1i(%struct.SmallStruct_1b1i* %ss) #0 {
|
|
|
|
|
entry:
|
|
|
|
|
%ss.addr = alloca %struct.SmallStruct_1b1i*, align 8
|
|
|
|
|
store %struct.SmallStruct_1b1i* %ss, %struct.SmallStruct_1b1i** %ss.addr, align 8
|
2015-02-27 22:17:42 +01:00
|
|
|
%0 = load %struct.SmallStruct_1b1i*, %struct.SmallStruct_1b1i** %ss.addr, align 8
|
2015-02-26 19:35:15 +01:00
|
|
|
%1 = bitcast %struct.SmallStruct_1b1i* %0 to { i64 }*
|
[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-27 20:29:02 +01:00
|
|
|
%2 = getelementptr { i64 }, { i64 }* %1, i32 0, i32 0
|
2015-02-27 22:17:42 +01:00
|
|
|
%3 = load i64, i64* %2, align 1
|
2015-03-13 19:20:45 +01:00
|
|
|
call void (i8*, ...)* @varArgF_SmallStruct(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), i64 inreg %3)
|
2015-02-26 19:35:15 +01:00
|
|
|
ret void
|
|
|
|
|
; CHECK-LABEL: smallStruct_1b1i:
|
|
|
|
|
; CHECK-NOT: dsll
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define void @smallStruct_1b1s1b(%struct.SmallStruct_1b1s1b* %ss) #0 {
|
|
|
|
|
entry:
|
|
|
|
|
%ss.addr = alloca %struct.SmallStruct_1b1s1b*, align 8
|
|
|
|
|
%.coerce = alloca { i48 }
|
|
|
|
|
store %struct.SmallStruct_1b1s1b* %ss, %struct.SmallStruct_1b1s1b** %ss.addr, align 8
|
2015-02-27 22:17:42 +01:00
|
|
|
%0 = load %struct.SmallStruct_1b1s1b*, %struct.SmallStruct_1b1s1b** %ss.addr, align 8
|
2015-02-26 19:35:15 +01:00
|
|
|
%1 = bitcast { i48 }* %.coerce to i8*
|
|
|
|
|
%2 = bitcast %struct.SmallStruct_1b1s1b* %0 to i8*
|
|
|
|
|
call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* %2, i64 6, i32 0, i1 false)
|
[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-27 20:29:02 +01:00
|
|
|
%3 = getelementptr { i48 }, { i48 }* %.coerce, i32 0, i32 0
|
2015-02-27 22:17:42 +01:00
|
|
|
%4 = load i48, i48* %3, align 1
|
2015-03-13 19:20:45 +01:00
|
|
|
call void (i8*, ...)* @varArgF_SmallStruct(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), i48 inreg %4)
|
2015-02-26 19:35:15 +01:00
|
|
|
ret void
|
|
|
|
|
; CHECK-LABEL: smallStruct_1b1s1b:
|
|
|
|
|
; CHECK: dsll $[[R1:[0-9]+]], $[[R2:[0-9]+]], 16
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #1
|
|
|
|
|
|
|
|
|
|
define void @smallStruct_1s1i(%struct.SmallStruct_1s1i* %ss) #0 {
|
|
|
|
|
entry:
|
|
|
|
|
%ss.addr = alloca %struct.SmallStruct_1s1i*, align 8
|
|
|
|
|
store %struct.SmallStruct_1s1i* %ss, %struct.SmallStruct_1s1i** %ss.addr, align 8
|
2015-02-27 22:17:42 +01:00
|
|
|
%0 = load %struct.SmallStruct_1s1i*, %struct.SmallStruct_1s1i** %ss.addr, align 8
|
2015-02-26 19:35:15 +01:00
|
|
|
%1 = bitcast %struct.SmallStruct_1s1i* %0 to { i64 }*
|
[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-27 20:29:02 +01:00
|
|
|
%2 = getelementptr { i64 }, { i64 }* %1, i32 0, i32 0
|
2015-02-27 22:17:42 +01:00
|
|
|
%3 = load i64, i64* %2, align 1
|
2015-03-13 19:20:45 +01:00
|
|
|
call void (i8*, ...)* @varArgF_SmallStruct(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), i64 inreg %3)
|
2015-02-26 19:35:15 +01:00
|
|
|
ret void
|
|
|
|
|
; CHECK-LABEL: smallStruct_1s1i:
|
|
|
|
|
; CHECK-NOT: dsll
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
define void @smallStruct_3b1s(%struct.SmallStruct_3b1s* %ss) #0 {
|
|
|
|
|
entry:
|
|
|
|
|
%ss.addr = alloca %struct.SmallStruct_3b1s*, align 8
|
|
|
|
|
%.coerce = alloca { i48 }
|
|
|
|
|
store %struct.SmallStruct_3b1s* %ss, %struct.SmallStruct_3b1s** %ss.addr, align 8
|
2015-02-27 22:17:42 +01:00
|
|
|
%0 = load %struct.SmallStruct_3b1s*, %struct.SmallStruct_3b1s** %ss.addr, align 8
|
2015-02-26 19:35:15 +01:00
|
|
|
%1 = bitcast { i48 }* %.coerce to i8*
|
|
|
|
|
%2 = bitcast %struct.SmallStruct_3b1s* %0 to i8*
|
|
|
|
|
call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* %2, i64 6, i32 0, i1 false)
|
[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-27 20:29:02 +01:00
|
|
|
%3 = getelementptr { i48 }, { i48 }* %.coerce, i32 0, i32 0
|
2015-02-27 22:17:42 +01:00
|
|
|
%4 = load i48, i48* %3, align 1
|
2015-03-13 19:20:45 +01:00
|
|
|
call void (i8*, ...)* @varArgF_SmallStruct(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), i48 inreg %4)
|
2015-02-26 19:35:15 +01:00
|
|
|
ret void
|
|
|
|
|
; CHECK-LABEL: smallStruct_3b1s:
|
|
|
|
|
; CHECK: dsll $[[R1:[0-9]+]], $[[R2:[0-9]+]], 16
|
|
|
|
|
}
|
