2016-02-11 14:02:01 +08:00
|
|
|
; RUN: llc -march=amdgcn < %s | FileCheck -check-prefix=SI -check-prefix=FUNC %s
|
2014-11-15 02:30:06 +08:00
|
|
|
|
2016-02-11 14:02:01 +08:00
|
|
|
declare i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
2014-11-15 02:30:06 +08:00
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
; FUNC-LABEL: {{^}}v_test_imin_sle_i32:
|
2014-11-15 02:30:06 +08:00
|
|
|
; SI: v_min_i32_e32
|
|
|
|
|
define void @v_test_imin_sle_i32(i32 addrspace(1)* %out, i32 addrspace(1)* %aptr, i32 addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
[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
|
|
|
%gep0 = getelementptr i32, i32 addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr i32, i32 addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep = getelementptr i32, i32 addrspace(1)* %out, i32 %tid
|
2015-02-28 05:17:42 +08:00
|
|
|
%a = load i32, i32 addrspace(1)* %gep0, align 4
|
|
|
|
|
%b = load i32, i32 addrspace(1)* %gep1, align 4
|
2014-11-15 02:30:06 +08:00
|
|
|
%cmp = icmp sle i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %outgep, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_i32:
|
2014-11-15 02:30:06 +08:00
|
|
|
; SI: s_min_i32
|
|
|
|
|
define void @s_test_imin_sle_i32(i32 addrspace(1)* %out, i32 %a, i32 %b) nounwind {
|
|
|
|
|
%cmp = icmp sle i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %out, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_v1i32:
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
define void @s_test_imin_sle_v1i32(<1 x i32> addrspace(1)* %out, <1 x i32> %a, <1 x i32> %b) nounwind {
|
|
|
|
|
%cmp = icmp sle <1 x i32> %a, %b
|
|
|
|
|
%val = select <1 x i1> %cmp, <1 x i32> %a, <1 x i32> %b
|
|
|
|
|
store <1 x i32> %val, <1 x i32> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_v4i32:
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
define void @s_test_imin_sle_v4i32(<4 x i32> addrspace(1)* %out, <4 x i32> %a, <4 x i32> %b) nounwind {
|
|
|
|
|
%cmp = icmp sle <4 x i32> %a, %b
|
|
|
|
|
%val = select <4 x i1> %cmp, <4 x i32> %a, <4 x i32> %b
|
|
|
|
|
store <4 x i32> %val, <4 x i32> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_i8:
|
2015-12-19 09:39:48 +08:00
|
|
|
; SI: s_load_dword
|
|
|
|
|
; SI: s_load_dword
|
|
|
|
|
; SI: s_sext_i32_i8
|
|
|
|
|
; SI: s_sext_i32_i8
|
2015-12-12 07:16:47 +08:00
|
|
|
; SI: s_min_i32
|
|
|
|
|
define void @s_test_imin_sle_i8(i8 addrspace(1)* %out, i8 %a, i8 %b) nounwind {
|
|
|
|
|
%cmp = icmp sle i8 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i8 %a, i8 %b
|
|
|
|
|
store i8 %val, i8 addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; XXX - should be able to use s_min if we stop unnecessarily doing
|
|
|
|
|
; extloads with mubuf instructions.
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_v4i8:
|
2015-12-19 09:39:48 +08:00
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
; SI: buffer_load_sbyte
|
|
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
; SI: v_min_i32
|
|
|
|
|
; SI: v_min_i32
|
|
|
|
|
; SI: v_min_i32
|
|
|
|
|
; SI: v_min_i32
|
2015-12-19 09:39:48 +08:00
|
|
|
|
|
|
|
|
; SI: s_endpgm
|
2015-12-12 07:16:47 +08:00
|
|
|
define void @s_test_imin_sle_v4i8(<4 x i8> addrspace(1)* %out, <4 x i8> %a, <4 x i8> %b) nounwind {
|
|
|
|
|
%cmp = icmp sle <4 x i8> %a, %b
|
|
|
|
|
%val = select <4 x i1> %cmp, <4 x i8> %a, <4 x i8> %b
|
|
|
|
|
store <4 x i8> %val, <4 x i8> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_v4i16:
|
|
|
|
|
; SI: v_min_i32
|
|
|
|
|
; SI: v_min_i32
|
|
|
|
|
; SI: v_min_i32
|
|
|
|
|
; SI: v_min_i32
|
|
|
|
|
define void @s_test_imin_sle_v4i16(<4 x i16> addrspace(1)* %out, <4 x i16> %a, <4 x i16> %b) nounwind {
|
|
|
|
|
%cmp = icmp sle <4 x i16> %a, %b
|
|
|
|
|
%val = select <4 x i1> %cmp, <4 x i16> %a, <4 x i16> %b
|
|
|
|
|
store <4 x i16> %val, <4 x i16> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-15 02:30:06 +08:00
|
|
|
; FUNC-LABEL: @v_test_imin_slt_i32
|
|
|
|
|
; SI: v_min_i32_e32
|
|
|
|
|
define void @v_test_imin_slt_i32(i32 addrspace(1)* %out, i32 addrspace(1)* %aptr, i32 addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
[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
|
|
|
%gep0 = getelementptr i32, i32 addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr i32, i32 addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep = getelementptr i32, i32 addrspace(1)* %out, i32 %tid
|
2015-02-28 05:17:42 +08:00
|
|
|
%a = load i32, i32 addrspace(1)* %gep0, align 4
|
|
|
|
|
%b = load i32, i32 addrspace(1)* %gep1, align 4
|
2014-11-15 02:30:06 +08:00
|
|
|
%cmp = icmp slt i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %outgep, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: @s_test_imin_slt_i32
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
define void @s_test_imin_slt_i32(i32 addrspace(1)* %out, i32 %a, i32 %b) nounwind {
|
|
|
|
|
%cmp = icmp slt i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %out, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_slt_v2i32:
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
; SI: s_min_i32
|
|
|
|
|
define void @s_test_imin_slt_v2i32(<2 x i32> addrspace(1)* %out, <2 x i32> %a, <2 x i32> %b) nounwind {
|
|
|
|
|
%cmp = icmp slt <2 x i32> %a, %b
|
|
|
|
|
%val = select <2 x i1> %cmp, <2 x i32> %a, <2 x i32> %b
|
|
|
|
|
store <2 x i32> %val, <2 x i32> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-14 00:43:48 +08:00
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_slt_imm_i32:
|
|
|
|
|
; SI: s_min_i32 {{s[0-9]+}}, {{s[0-9]+}}, 8
|
|
|
|
|
define void @s_test_imin_slt_imm_i32(i32 addrspace(1)* %out, i32 %a) nounwind {
|
|
|
|
|
%cmp = icmp slt i32 %a, 8
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 8
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %out, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_imm_i32:
|
|
|
|
|
; SI: s_min_i32 {{s[0-9]+}}, {{s[0-9]+}}, 8
|
|
|
|
|
define void @s_test_imin_sle_imm_i32(i32 addrspace(1)* %out, i32 %a) nounwind {
|
|
|
|
|
%cmp = icmp sle i32 %a, 8
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 8
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %out, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-15 02:30:06 +08:00
|
|
|
; FUNC-LABEL: @v_test_umin_ule_i32
|
|
|
|
|
; SI: v_min_u32_e32
|
|
|
|
|
define void @v_test_umin_ule_i32(i32 addrspace(1)* %out, i32 addrspace(1)* %aptr, i32 addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
[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
|
|
|
%gep0 = getelementptr i32, i32 addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr i32, i32 addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep = getelementptr i32, i32 addrspace(1)* %out, i32 %tid
|
2015-02-28 05:17:42 +08:00
|
|
|
%a = load i32, i32 addrspace(1)* %gep0, align 4
|
|
|
|
|
%b = load i32, i32 addrspace(1)* %gep1, align 4
|
2014-11-15 02:30:06 +08:00
|
|
|
%cmp = icmp ule i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %outgep, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
; FUNC-LABEL: @v_test_umin_ule_v3i32
|
|
|
|
|
; SI: v_min_u32_e32
|
|
|
|
|
; SI: v_min_u32_e32
|
|
|
|
|
; SI: v_min_u32_e32
|
|
|
|
|
; SI-NOT: v_min_u32_e32
|
|
|
|
|
; SI: s_endpgm
|
|
|
|
|
define void @v_test_umin_ule_v3i32(<3 x i32> addrspace(1)* %out, <3 x i32> addrspace(1)* %aptr, <3 x i32> addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
2015-12-12 07:16:47 +08:00
|
|
|
%gep0 = getelementptr <3 x i32>, <3 x i32> addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr <3 x i32>, <3 x i32> addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep = getelementptr <3 x i32>, <3 x i32> addrspace(1)* %out, i32 %tid
|
|
|
|
|
%a = load <3 x i32>, <3 x i32> addrspace(1)* %gep0
|
|
|
|
|
%b = load <3 x i32>, <3 x i32> addrspace(1)* %gep1
|
|
|
|
|
%cmp = icmp ule <3 x i32> %a, %b
|
|
|
|
|
%val = select <3 x i1> %cmp, <3 x i32> %a, <3 x i32> %b
|
|
|
|
|
store <3 x i32> %val, <3 x i32> addrspace(1)* %outgep
|
|
|
|
|
ret void
|
|
|
|
|
}
|
2014-11-15 02:30:06 +08:00
|
|
|
; FUNC-LABEL: @s_test_umin_ule_i32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
define void @s_test_umin_ule_i32(i32 addrspace(1)* %out, i32 %a, i32 %b) nounwind {
|
|
|
|
|
%cmp = icmp ule i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %out, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: @v_test_umin_ult_i32
|
|
|
|
|
; SI: v_min_u32_e32
|
|
|
|
|
define void @v_test_umin_ult_i32(i32 addrspace(1)* %out, i32 addrspace(1)* %aptr, i32 addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
[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
|
|
|
%gep0 = getelementptr i32, i32 addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr i32, i32 addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep = getelementptr i32, i32 addrspace(1)* %out, i32 %tid
|
2015-02-28 05:17:42 +08:00
|
|
|
%a = load i32, i32 addrspace(1)* %gep0, align 4
|
|
|
|
|
%b = load i32, i32 addrspace(1)* %gep1, align 4
|
2014-11-15 02:30:06 +08:00
|
|
|
%cmp = icmp ult i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %outgep, align 4
|
|
|
|
|
ret void
|
2015-12-19 09:39:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}v_test_umin_ult_i8:
|
|
|
|
|
; SI: buffer_load_ubyte
|
|
|
|
|
; SI: buffer_load_ubyte
|
|
|
|
|
; SI: v_min_u32_e32
|
|
|
|
|
define void @v_test_umin_ult_i8(i8 addrspace(1)* %out, i8 addrspace(1)* %aptr, i8 addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
2015-12-19 09:39:48 +08:00
|
|
|
%gep0 = getelementptr i8, i8 addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr i8, i8 addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep = getelementptr i8, i8 addrspace(1)* %out, i32 %tid
|
|
|
|
|
%a = load i8, i8 addrspace(1)* %gep0, align 1
|
|
|
|
|
%b = load i8, i8 addrspace(1)* %gep1, align 1
|
|
|
|
|
%cmp = icmp ult i8 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i8 %a, i8 %b
|
|
|
|
|
store i8 %val, i8 addrspace(1)* %outgep, align 1
|
|
|
|
|
ret void
|
2014-11-15 02:30:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: @s_test_umin_ult_i32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
define void @s_test_umin_ult_i32(i32 addrspace(1)* %out, i32 %a, i32 %b) nounwind {
|
|
|
|
|
%cmp = icmp ult i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %out, align 4
|
|
|
|
|
ret void
|
|
|
|
|
}
|
2014-12-20 07:15:30 +08:00
|
|
|
|
|
|
|
|
; FUNC-LABEL: @v_test_umin_ult_i32_multi_use
|
|
|
|
|
; SI-NOT: v_min
|
|
|
|
|
; SI: v_cmp_lt_u32
|
|
|
|
|
; SI-NEXT: v_cndmask_b32
|
|
|
|
|
; SI-NOT: v_min
|
|
|
|
|
; SI: s_endpgm
|
|
|
|
|
define void @v_test_umin_ult_i32_multi_use(i32 addrspace(1)* %out0, i1 addrspace(1)* %out1, i32 addrspace(1)* %aptr, i32 addrspace(1)* %bptr) nounwind {
|
2016-02-11 14:02:01 +08:00
|
|
|
%tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
|
[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
|
|
|
%gep0 = getelementptr i32, i32 addrspace(1)* %aptr, i32 %tid
|
|
|
|
|
%gep1 = getelementptr i32, i32 addrspace(1)* %bptr, i32 %tid
|
|
|
|
|
%outgep0 = getelementptr i32, i32 addrspace(1)* %out0, i32 %tid
|
|
|
|
|
%outgep1 = getelementptr i1, i1 addrspace(1)* %out1, i32 %tid
|
2015-02-28 05:17:42 +08:00
|
|
|
%a = load i32, i32 addrspace(1)* %gep0, align 4
|
|
|
|
|
%b = load i32, i32 addrspace(1)* %gep1, align 4
|
2014-12-20 07:15:30 +08:00
|
|
|
%cmp = icmp ult i32 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i32 %a, i32 %b
|
|
|
|
|
store i32 %val, i32 addrspace(1)* %outgep0, align 4
|
|
|
|
|
store i1 %cmp, i1 addrspace(1)* %outgep1
|
|
|
|
|
ret void
|
|
|
|
|
}
|
2015-06-09 08:52:41 +08:00
|
|
|
|
2015-12-12 07:16:47 +08:00
|
|
|
|
|
|
|
|
; FUNC-LABEL: @s_test_umin_ult_v1i32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
define void @s_test_umin_ult_v1i32(<1 x i32> addrspace(1)* %out, <1 x i32> %a, <1 x i32> %b) nounwind {
|
|
|
|
|
%cmp = icmp ult <1 x i32> %a, %b
|
|
|
|
|
%val = select <1 x i1> %cmp, <1 x i32> %a, <1 x i32> %b
|
|
|
|
|
store <1 x i32> %val, <1 x i32> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_umin_ult_v8i32:
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
; SI: s_min_u32
|
|
|
|
|
define void @s_test_umin_ult_v8i32(<8 x i32> addrspace(1)* %out, <8 x i32> %a, <8 x i32> %b) nounwind {
|
|
|
|
|
%cmp = icmp ult <8 x i32> %a, %b
|
|
|
|
|
%val = select <8 x i1> %cmp, <8 x i32> %a, <8 x i32> %b
|
|
|
|
|
store <8 x i32> %val, <8 x i32> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_umin_ult_v8i16:
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
; SI: v_min_u32
|
|
|
|
|
define void @s_test_umin_ult_v8i16(<8 x i16> addrspace(1)* %out, <8 x i16> %a, <8 x i16> %b) nounwind {
|
|
|
|
|
%cmp = icmp ult <8 x i16> %a, %b
|
|
|
|
|
%val = select <8 x i1> %cmp, <8 x i16> %a, <8 x i16> %b
|
|
|
|
|
store <8 x i16> %val, <8 x i16> addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-09 08:52:41 +08:00
|
|
|
; Make sure redundant and removed
|
|
|
|
|
; FUNC-LABEL: {{^}}simplify_demanded_bits_test_umin_ult_i16:
|
|
|
|
|
; SI-DAG: s_load_dword [[A:s[0-9]+]], {{s\[[0-9]+:[0-9]+\]}}, 0xb
|
|
|
|
|
; SI-DAG: s_load_dword [[B:s[0-9]+]], {{s\[[0-9]+:[0-9]+\]}}, 0xc
|
|
|
|
|
; SI: s_min_u32 [[MIN:s[0-9]+]], [[A]], [[B]]
|
2016-03-31 00:35:09 +08:00
|
|
|
; SI: v_mov_b32_e32 [[VMIN:v[0-9]+]], [[MIN]]
|
|
|
|
|
; SI: buffer_store_dword [[VMIN]]
|
2015-06-09 08:52:41 +08:00
|
|
|
define void @simplify_demanded_bits_test_umin_ult_i16(i32 addrspace(1)* %out, i16 zeroext %a, i16 zeroext %b) nounwind {
|
|
|
|
|
%a.ext = zext i16 %a to i32
|
|
|
|
|
%b.ext = zext i16 %b to i32
|
|
|
|
|
%cmp = icmp ult i32 %a.ext, %b.ext
|
|
|
|
|
%val = select i1 %cmp, i32 %a.ext, i32 %b.ext
|
|
|
|
|
%mask = and i32 %val, 65535
|
|
|
|
|
store i32 %mask, i32 addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Make sure redundant sign_extend_inreg removed.
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}simplify_demanded_bits_test_min_slt_i16:
|
|
|
|
|
; SI-DAG: s_load_dword [[A:s[0-9]+]], {{s\[[0-9]+:[0-9]+\]}}, 0xb
|
|
|
|
|
; SI-DAG: s_load_dword [[B:s[0-9]+]], {{s\[[0-9]+:[0-9]+\]}}, 0xc
|
|
|
|
|
; SI: s_min_i32 [[MIN:s[0-9]+]], [[A]], [[B]]
|
2016-03-31 00:35:09 +08:00
|
|
|
; SI: v_mov_b32_e32 [[VMIN:v[0-9]+]], [[MIN]]
|
|
|
|
|
; SI: buffer_store_dword [[VMIN]]
|
2015-06-09 08:52:41 +08:00
|
|
|
define void @simplify_demanded_bits_test_min_slt_i16(i32 addrspace(1)* %out, i16 signext %a, i16 signext %b) nounwind {
|
|
|
|
|
%a.ext = sext i16 %a to i32
|
|
|
|
|
%b.ext = sext i16 %b to i32
|
|
|
|
|
%cmp = icmp slt i32 %a.ext, %b.ext
|
|
|
|
|
%val = select i1 %cmp, i32 %a.ext, i32 %b.ext
|
|
|
|
|
%shl = shl i32 %val, 16
|
|
|
|
|
%sextinreg = ashr i32 %shl, 16
|
|
|
|
|
store i32 %sextinreg, i32 addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; FUNC-LABEL: {{^}}s_test_imin_sle_i16:
|
2015-12-12 07:16:47 +08:00
|
|
|
; SI: s_min_i32
|
2015-06-09 08:52:41 +08:00
|
|
|
define void @s_test_imin_sle_i16(i16 addrspace(1)* %out, i16 %a, i16 %b) nounwind {
|
|
|
|
|
%cmp = icmp sle i16 %a, %b
|
|
|
|
|
%val = select i1 %cmp, i16 %a, i16 %b
|
|
|
|
|
store i16 %val, i16 addrspace(1)* %out
|
|
|
|
|
ret void
|
|
|
|
|
}
|