mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 19:23:23 +01:00
0d99339102
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
89 lines
3.6 KiB
LLVM
89 lines
3.6 KiB
LLVM
; RUN: opt -loop-reduce -S < %s | FileCheck %s
|
|
;
|
|
; <rdar://10619599> "SelectionDAGBuilder shouldn't visit PHI nodes!" assert.
|
|
; <rdar://10655343> SCEVExpander segfault on simple test case
|
|
|
|
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-f128:128:128-n8:16:32"
|
|
target triple = "i386-apple-darwin"
|
|
|
|
; LSR should convert the inner loop (bb7.us) IV (j.01.us) into float*.
|
|
; This involves a nested AddRec, the outer AddRec's loop invariant components
|
|
; cannot find a preheader, so they should be expanded in the loop header
|
|
; (bb7.lr.ph.us) below the existing phi i.12.us.
|
|
; Currently, LSR won't kick in on such loops.
|
|
; CHECK-LABEL: @nopreheader(
|
|
; CHECK: bb7.us:
|
|
; CHECK-NOT: phi float*
|
|
; CHECK: %j.01.us = phi i32
|
|
; CHECK-NOT: phi float*
|
|
define void @nopreheader(float* nocapture %a, i32 %n) nounwind {
|
|
entry:
|
|
%0 = sdiv i32 %n, undef
|
|
indirectbr i8* undef, [label %bb10.preheader]
|
|
|
|
bb10.preheader: ; preds = %bb4
|
|
indirectbr i8* undef, [label %bb8.preheader.lr.ph, label %return]
|
|
|
|
bb8.preheader.lr.ph: ; preds = %bb10.preheader
|
|
indirectbr i8* null, [label %bb7.lr.ph.us, label %bb9]
|
|
|
|
bb7.lr.ph.us: ; preds = %bb9.us, %bb8.preheader.lr.ph
|
|
%i.12.us = phi i32 [ %2, %bb9.us ], [ 0, %bb8.preheader.lr.ph ]
|
|
%tmp30 = mul i32 %0, %i.12.us
|
|
indirectbr i8* undef, [label %bb7.us]
|
|
|
|
bb7.us: ; preds = %bb7.lr.ph.us, %bb7.us
|
|
%j.01.us = phi i32 [ 0, %bb7.lr.ph.us ], [ %1, %bb7.us ]
|
|
%tmp31 = add i32 %tmp30, %j.01.us
|
|
%scevgep9 = getelementptr float, float* %a, i32 %tmp31
|
|
store float undef, float* %scevgep9, align 1
|
|
%1 = add nsw i32 %j.01.us, 1
|
|
indirectbr i8* undef, [label %bb9.us, label %bb7.us]
|
|
|
|
bb9.us: ; preds = %bb7.us
|
|
%2 = add nsw i32 %i.12.us, 1
|
|
indirectbr i8* undef, [label %bb7.lr.ph.us, label %return]
|
|
|
|
bb9: ; preds = %bb9, %bb8.preheader.lr.ph
|
|
indirectbr i8* undef, [label %bb9, label %return]
|
|
|
|
return: ; preds = %bb9, %bb9.us, %bb10.preheader
|
|
ret void
|
|
}
|
|
|
|
; In this case, SCEVExpander simply cannot materialize the AddRecExpr
|
|
; that LSR picks. We must detect that %bb8.preheader does not have a
|
|
; preheader and avoid performing LSR on %bb7.
|
|
; CHECK-LABEL: @nopreheader2(
|
|
; CHECK: bb7:
|
|
; CHECK: %indvar = phi i32
|
|
define fastcc void @nopreheader2([200 x i32]* nocapture %Array2) nounwind {
|
|
entry:
|
|
indirectbr i8* undef, [label %bb]
|
|
|
|
bb: ; preds = %bb, %entry
|
|
indirectbr i8* undef, [label %bb3, label %bb]
|
|
|
|
bb3: ; preds = %bb3, %bb
|
|
indirectbr i8* undef, [label %bb8.preheader, label %bb3]
|
|
|
|
bb8.preheader: ; preds = %bb9, %bb3
|
|
%indvar5 = phi i32 [ %indvar.next6, %bb9 ], [ 0, %bb3 ]
|
|
%tmp26 = add i32 %indvar5, 13
|
|
indirectbr i8* null, [label %bb7]
|
|
|
|
bb7: ; preds = %bb8.preheader, %bb7
|
|
%indvar = phi i32 [ 0, %bb8.preheader ], [ %indvar.next, %bb7 ]
|
|
%scevgep = getelementptr [200 x i32], [200 x i32]* %Array2, i32 %tmp26, i32 %indvar
|
|
store i32 undef, i32* %scevgep, align 4
|
|
%indvar.next = add i32 %indvar, 1
|
|
indirectbr i8* undef, [label %bb9, label %bb7]
|
|
|
|
bb9: ; preds = %bb7
|
|
%indvar.next6 = add i32 %indvar5, 1
|
|
indirectbr i8* undef, [label %return, label %bb8.preheader]
|
|
|
|
return: ; preds = %bb9
|
|
ret void
|
|
}
|