2014-12-28 21:15:05 +08:00
|
|
|
; RUN: llc < %s -mtriple=x86_64-linux -mattr=+sse2 -mcpu=nehalem | FileCheck %s --check-prefix=SSE
|
|
|
|
; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+sse2 -mcpu=nehalem | FileCheck %s --check-prefix=SSE
|
|
|
|
; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+avx -mcpu=corei7-avx | FileCheck %s --check-prefix=AVX
|
2009-12-18 15:40:29 +08:00
|
|
|
|
|
|
|
define double @t1(float* nocapture %x) nounwind readonly ssp {
|
|
|
|
entry:
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: t1:
|
|
|
|
; SSE: movss ([[A0:%rdi|%rcx]]), %xmm0
|
|
|
|
; SSE: cvtss2sd %xmm0, %xmm0
|
2009-12-18 15:40:29 +08:00
|
|
|
|
2015-02-28 05:17:42 +08:00
|
|
|
%0 = load float, float* %x, align 4
|
2009-12-18 15:40:29 +08:00
|
|
|
%1 = fpext float %0 to double
|
|
|
|
ret double %1
|
|
|
|
}
|
|
|
|
|
2009-12-23 01:47:23 +08:00
|
|
|
define float @t2(double* nocapture %x) nounwind readonly ssp optsize {
|
2009-12-18 15:40:29 +08:00
|
|
|
entry:
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: t2:
|
|
|
|
; SSE: cvtsd2ss ([[A0]]), %xmm0
|
2015-02-28 05:17:42 +08:00
|
|
|
%0 = load double, double* %x, align 8
|
2009-12-18 15:40:29 +08:00
|
|
|
%1 = fptrunc double %0 to float
|
|
|
|
ret float %1
|
|
|
|
}
|
2010-07-13 04:46:04 +08:00
|
|
|
|
|
|
|
define float @squirtf(float* %x) nounwind {
|
|
|
|
entry:
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: squirtf:
|
|
|
|
; SSE: movss ([[A0]]), %xmm0
|
|
|
|
; SSE: sqrtss %xmm0, %xmm0
|
2015-02-28 05:17:42 +08:00
|
|
|
%z = load float, float* %x
|
2010-07-13 04:46:04 +08:00
|
|
|
%t = call float @llvm.sqrt.f32(float %z)
|
|
|
|
ret float %t
|
|
|
|
}
|
|
|
|
|
|
|
|
define double @squirt(double* %x) nounwind {
|
|
|
|
entry:
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: squirt:
|
|
|
|
; SSE: movsd ([[A0]]), %xmm0
|
|
|
|
; SSE: sqrtsd %xmm0, %xmm0
|
2015-02-28 05:17:42 +08:00
|
|
|
%z = load double, double* %x
|
2010-07-13 04:46:04 +08:00
|
|
|
%t = call double @llvm.sqrt.f64(double %z)
|
|
|
|
ret double %t
|
|
|
|
}
|
|
|
|
|
|
|
|
define float @squirtf_size(float* %x) nounwind optsize {
|
|
|
|
entry:
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: squirtf_size:
|
|
|
|
; SSE: sqrtss ([[A0]]), %xmm0
|
2015-02-28 05:17:42 +08:00
|
|
|
%z = load float, float* %x
|
2010-07-13 04:46:04 +08:00
|
|
|
%t = call float @llvm.sqrt.f32(float %z)
|
|
|
|
ret float %t
|
|
|
|
}
|
|
|
|
|
|
|
|
define double @squirt_size(double* %x) nounwind optsize {
|
|
|
|
entry:
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: squirt_size:
|
|
|
|
; SSE: sqrtsd ([[A0]]), %xmm0
|
2015-02-28 05:17:42 +08:00
|
|
|
%z = load double, double* %x
|
2010-07-13 04:46:04 +08:00
|
|
|
%t = call double @llvm.sqrt.f64(double %z)
|
|
|
|
ret double %t
|
|
|
|
}
|
|
|
|
|
|
|
|
declare float @llvm.sqrt.f32(float)
|
|
|
|
declare double @llvm.sqrt.f64(double)
|
2014-12-15 21:18:21 +08:00
|
|
|
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE-LABEL: loopdep1
|
2016-04-05 22:06:20 +08:00
|
|
|
; SSE: for.body{{$}}
|
2014-12-15 21:18:21 +08:00
|
|
|
;
|
|
|
|
; This loop contains two cvtsi2ss instructions that update the same xmm
|
|
|
|
; register. Verify that the execution dependency fix pass breaks those
|
|
|
|
; dependencies by inserting xorps instructions.
|
|
|
|
;
|
|
|
|
; If the register allocator chooses different registers for the two cvtsi2ss
|
|
|
|
; instructions, they are still dependent on themselves.
|
2014-12-28 21:15:05 +08:00
|
|
|
; SSE: xorps [[XMM1:%xmm[0-9]+]]
|
|
|
|
; SSE: , [[XMM1]]
|
|
|
|
; SSE: cvtsi2ssl %{{.*}}, [[XMM1]]
|
|
|
|
; SSE: xorps [[XMM2:%xmm[0-9]+]]
|
|
|
|
; SSE: , [[XMM2]]
|
|
|
|
; SSE: cvtsi2ssl %{{.*}}, [[XMM2]]
|
2014-12-15 21:18:21 +08:00
|
|
|
;
|
|
|
|
define float @loopdep1(i32 %m) nounwind uwtable readnone ssp {
|
|
|
|
entry:
|
|
|
|
%tobool3 = icmp eq i32 %m, 0
|
|
|
|
br i1 %tobool3, label %for.end, label %for.body
|
|
|
|
|
|
|
|
for.body: ; preds = %entry, %for.body
|
|
|
|
%m.addr.07 = phi i32 [ %dec, %for.body ], [ %m, %entry ]
|
|
|
|
%s1.06 = phi float [ %add, %for.body ], [ 0.000000e+00, %entry ]
|
|
|
|
%s2.05 = phi float [ %add2, %for.body ], [ 0.000000e+00, %entry ]
|
|
|
|
%n.04 = phi i32 [ %inc, %for.body ], [ 1, %entry ]
|
|
|
|
%conv = sitofp i32 %n.04 to float
|
|
|
|
%add = fadd float %s1.06, %conv
|
|
|
|
%conv1 = sitofp i32 %m.addr.07 to float
|
|
|
|
%add2 = fadd float %s2.05, %conv1
|
|
|
|
%inc = add nsw i32 %n.04, 1
|
|
|
|
%dec = add nsw i32 %m.addr.07, -1
|
|
|
|
%tobool = icmp eq i32 %dec, 0
|
|
|
|
br i1 %tobool, label %for.end, label %for.body
|
|
|
|
|
|
|
|
for.end: ; preds = %for.body, %entry
|
|
|
|
%s1.0.lcssa = phi float [ 0.000000e+00, %entry ], [ %add, %for.body ]
|
|
|
|
%s2.0.lcssa = phi float [ 0.000000e+00, %entry ], [ %add2, %for.body ]
|
|
|
|
%sub = fsub float %s1.0.lcssa, %s2.0.lcssa
|
|
|
|
ret float %sub
|
|
|
|
}
|
|
|
|
|
2014-12-28 21:15:05 +08:00
|
|
|
; rdar:15221834 False AVX register dependencies cause 5x slowdown on
|
|
|
|
; flops-6. Make sure the unused register read by vcvtsi2sdq is zeroed
|
|
|
|
; to avoid cyclic dependence on a write to the same register in a
|
|
|
|
; previous iteration.
|
|
|
|
|
|
|
|
; AVX-LABEL: loopdep2:
|
|
|
|
; AVX-LABEL: %loop
|
|
|
|
; AVX: vxorps %[[REG:xmm.]], %{{xmm.}}, %{{xmm.}}
|
|
|
|
; AVX: vcvtsi2sdq %{{r[0-9a-x]+}}, %[[REG]], %{{xmm.}}
|
|
|
|
; SSE-LABEL: loopdep2:
|
|
|
|
; SSE-LABEL: %loop
|
|
|
|
; SSE: xorps %[[REG:xmm.]], %[[REG]]
|
|
|
|
; SSE: cvtsi2sdq %{{r[0-9a-x]+}}, %[[REG]]
|
|
|
|
define i64 @loopdep2(i64* nocapture %x, double* nocapture %y) nounwind {
|
|
|
|
entry:
|
2015-02-28 05:17:42 +08:00
|
|
|
%vx = load i64, i64* %x
|
2014-12-28 21:15:05 +08:00
|
|
|
br label %loop
|
|
|
|
loop:
|
|
|
|
%i = phi i64 [ 1, %entry ], [ %inc, %loop ]
|
|
|
|
%s1 = phi i64 [ %vx, %entry ], [ %s2, %loop ]
|
|
|
|
%fi = sitofp i64 %i to double
|
2015-02-28 05:17:42 +08:00
|
|
|
%vy = load double, double* %y
|
2014-12-28 21:15:05 +08:00
|
|
|
%fipy = fadd double %fi, %vy
|
|
|
|
%iipy = fptosi double %fipy to i64
|
|
|
|
%s2 = add i64 %s1, %iipy
|
|
|
|
%inc = add nsw i64 %i, 1
|
|
|
|
%exitcond = icmp eq i64 %inc, 156250000
|
|
|
|
br i1 %exitcond, label %ret, label %loop
|
|
|
|
ret:
|
|
|
|
ret i64 %s2
|
|
|
|
}
|
|
|
|
|
2014-12-15 21:18:21 +08:00
|
|
|
; This loop contains a cvtsi2sd instruction that has a loop-carried
|
|
|
|
; false dependency on an xmm that is modified by other scalar instructions
|
2016-04-05 22:06:20 +08:00
|
|
|
; that follow it in the loop. Additionally, the source of convert is a
|
2014-12-15 21:18:21 +08:00
|
|
|
; memory operand. Verify the execution dependency fix pass breaks this
|
|
|
|
; dependency by inserting a xor before the convert.
|
|
|
|
@x = common global [1024 x double] zeroinitializer, align 16
|
|
|
|
@y = common global [1024 x double] zeroinitializer, align 16
|
|
|
|
@z = common global [1024 x double] zeroinitializer, align 16
|
|
|
|
@w = common global [1024 x double] zeroinitializer, align 16
|
|
|
|
@v = common global [1024 x i32] zeroinitializer, align 16
|
|
|
|
|
2014-12-28 21:15:05 +08:00
|
|
|
define void @loopdep3() {
|
2014-12-15 21:18:21 +08:00
|
|
|
entry:
|
|
|
|
br label %for.cond1.preheader
|
|
|
|
|
|
|
|
for.cond1.preheader: ; preds = %for.inc14, %entry
|
|
|
|
%i.025 = phi i32 [ 0, %entry ], [ %inc15, %for.inc14 ]
|
|
|
|
br label %for.body3
|
|
|
|
|
|
|
|
for.body3:
|
|
|
|
%indvars.iv = phi i64 [ 0, %for.cond1.preheader ], [ %indvars.iv.next, %for.body3 ]
|
[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
|
|
|
%arrayidx = getelementptr inbounds [1024 x i32], [1024 x i32]* @v, i64 0, i64 %indvars.iv
|
2015-02-28 05:17:42 +08:00
|
|
|
%0 = load i32, i32* %arrayidx, align 4
|
2014-12-15 21:18:21 +08:00
|
|
|
%conv = sitofp i32 %0 to double
|
[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
|
|
|
%arrayidx5 = getelementptr inbounds [1024 x double], [1024 x double]* @x, i64 0, i64 %indvars.iv
|
2015-02-28 05:17:42 +08:00
|
|
|
%1 = load double, double* %arrayidx5, align 8
|
2014-12-15 21:18:21 +08:00
|
|
|
%mul = fmul double %conv, %1
|
[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
|
|
|
%arrayidx7 = getelementptr inbounds [1024 x double], [1024 x double]* @y, i64 0, i64 %indvars.iv
|
2015-02-28 05:17:42 +08:00
|
|
|
%2 = load double, double* %arrayidx7, align 8
|
2014-12-15 21:18:21 +08:00
|
|
|
%mul8 = fmul double %mul, %2
|
[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
|
|
|
%arrayidx10 = getelementptr inbounds [1024 x double], [1024 x double]* @z, i64 0, i64 %indvars.iv
|
2015-02-28 05:17:42 +08:00
|
|
|
%3 = load double, double* %arrayidx10, align 8
|
2014-12-15 21:18:21 +08:00
|
|
|
%mul11 = fmul double %mul8, %3
|
[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
|
|
|
%arrayidx13 = getelementptr inbounds [1024 x double], [1024 x double]* @w, i64 0, i64 %indvars.iv
|
2014-12-15 21:18:21 +08:00
|
|
|
store double %mul11, double* %arrayidx13, align 8
|
|
|
|
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
|
|
|
|
%exitcond = icmp eq i64 %indvars.iv.next, 1024
|
|
|
|
br i1 %exitcond, label %for.inc14, label %for.body3
|
|
|
|
|
|
|
|
for.inc14: ; preds = %for.body3
|
|
|
|
%inc15 = add nsw i32 %i.025, 1
|
|
|
|
%exitcond26 = icmp eq i32 %inc15, 100000
|
|
|
|
br i1 %exitcond26, label %for.end16, label %for.cond1.preheader
|
|
|
|
|
|
|
|
for.end16: ; preds = %for.inc14
|
|
|
|
ret void
|
|
|
|
|
2014-12-28 21:15:05 +08:00
|
|
|
;SSE-LABEL:@loopdep3
|
|
|
|
;SSE: xorps [[XMM0:%xmm[0-9]+]], [[XMM0]]
|
|
|
|
;SSE-NEXT: cvtsi2sdl {{.*}}, [[XMM0]]
|
|
|
|
;SSE-NEXT: mulsd {{.*}}, [[XMM0]]
|
|
|
|
;SSE-NEXT: mulsd {{.*}}, [[XMM0]]
|
|
|
|
;SSE-NEXT: mulsd {{.*}}, [[XMM0]]
|
|
|
|
;SSE-NEXT: movsd [[XMM0]],
|
|
|
|
;AVX-LABEL:@loopdep3
|
|
|
|
;AVX: vxorps [[XMM0:%xmm[0-9]+]], [[XMM0]]
|
|
|
|
;AVX-NEXT: vcvtsi2sdl {{.*}}, [[XMM0]], [[XMM0]]
|
|
|
|
;AVX-NEXT: vmulsd {{.*}}, [[XMM0]], [[XMM0]]
|
|
|
|
;AVX-NEXT: vmulsd {{.*}}, [[XMM0]], [[XMM0]]
|
|
|
|
;AVX-NEXT: vmulsd {{.*}}, [[XMM0]], [[XMM0]]
|
|
|
|
;AVX-NEXT: vmovsd [[XMM0]],
|
2014-12-15 21:18:21 +08:00
|
|
|
}
|