Switch the SCEV expander and LoopStrengthReduce to use
TargetTransformInfo rather than TargetLowering, removing one of the
primary instances of the layering violation of Transforms depending
directly on Target.
This is a really big deal because LSR used to be a "special" pass that
could only be tested fully using llc and by looking at the full output
of it. It also couldn't run with any other loop passes because it had to
be created by the backend. No longer is this true. LSR is now just
a normal pass and we should probably lift the creation of LSR out of
lib/CodeGen/Passes.cpp and into the PassManagerBuilder. =] I've not done
this, or updated all of the tests to use opt and a triple, because
I suspect someone more familiar with LSR would do a better job. This
change should be essentially without functional impact for normal
compilations, and only change behvaior of targetless compilations.
The conversion required changing all of the LSR code to refer to the TTI
interfaces, which fortunately are very similar to TargetLowering's
interfaces. However, it also allowed us to *always* expect to have some
implementation around. I've pushed that simplification through the pass,
and leveraged it to simplify code somewhat. It required some test
updates for one of two things: either we used to skip some checks
altogether but now we get the default "no" answer for them, or we used
to have no information about the target and now we do have some.
I've also started the process of removing AddrMode, as the TTI interface
doesn't use it any longer. In some cases this simplifies code, and in
others it adds some complexity, but I think it's not a bad tradeoff even
there. Subsequent patches will try to clean this up even further and use
other (more appropriate) abstractions.
Yet again, almost all of the formatting changes brought to you by
clang-format. =]
llvm-svn: 171735
2013-01-07 15:41:08 +01:00
|
|
|
; RUN: opt < %s -loop-reduce -S -mtriple=x86_64-unknown-unknown | grep "phi double" | count 1
|
2008-08-17 21:25:28 +02:00
|
|
|
|
2015-03-04 19:43:29 +01:00
|
|
|
; Provide legal integer types.
|
|
|
|
|
target datalayout = "n8:16:32:64"
|
|
|
|
|
|
|
|
|
|
|
2008-08-17 21:25:28 +02:00
|
|
|
define void @foobar(i32 %n) nounwind {
|
|
|
|
|
entry:
|
|
|
|
|
icmp eq i32 %n, 0 ; <i1>:0 [#uses=2]
|
|
|
|
|
br i1 %0, label %return, label %bb.nph
|
|
|
|
|
|
|
|
|
|
bb.nph: ; preds = %entry
|
|
|
|
|
%umax = select i1 %0, i32 1, i32 %n ; <i32> [#uses=1]
|
|
|
|
|
br label %bb
|
|
|
|
|
|
|
|
|
|
bb: ; preds = %bb, %bb.nph
|
|
|
|
|
%i.03 = phi i32 [ 0, %bb.nph ], [ %indvar.next, %bb ] ; <i32> [#uses=3]
|
|
|
|
|
tail call void @bar( i32 %i.03 ) nounwind
|
|
|
|
|
uitofp i32 %i.03 to double ; <double>:1 [#uses=1]
|
|
|
|
|
tail call void @foo( double %1 ) nounwind
|
|
|
|
|
%indvar.next = add i32 %i.03, 1 ; <i32> [#uses=2]
|
|
|
|
|
%exitcond = icmp eq i32 %indvar.next, %umax ; <i1> [#uses=1]
|
|
|
|
|
br i1 %exitcond, label %return, label %bb
|
|
|
|
|
|
|
|
|
|
return: ; preds = %bb, %entry
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Unable to eliminate cast because the mantissa bits for double are not enough
|
|
|
|
|
; to hold all of i64 IV bits.
|
|
|
|
|
define void @foobar2(i64 %n) nounwind {
|
|
|
|
|
entry:
|
|
|
|
|
icmp eq i64 %n, 0 ; <i1>:0 [#uses=2]
|
|
|
|
|
br i1 %0, label %return, label %bb.nph
|
|
|
|
|
|
|
|
|
|
bb.nph: ; preds = %entry
|
|
|
|
|
%umax = select i1 %0, i64 1, i64 %n ; <i64> [#uses=1]
|
|
|
|
|
br label %bb
|
|
|
|
|
|
|
|
|
|
bb: ; preds = %bb, %bb.nph
|
|
|
|
|
%i.03 = phi i64 [ 0, %bb.nph ], [ %indvar.next, %bb ] ; <i64> [#uses=3]
|
|
|
|
|
trunc i64 %i.03 to i32 ; <i32>:1 [#uses=1]
|
|
|
|
|
tail call void @bar( i32 %1 ) nounwind
|
|
|
|
|
uitofp i64 %i.03 to double ; <double>:2 [#uses=1]
|
|
|
|
|
tail call void @foo( double %2 ) nounwind
|
|
|
|
|
%indvar.next = add i64 %i.03, 1 ; <i64> [#uses=2]
|
|
|
|
|
%exitcond = icmp eq i64 %indvar.next, %umax ; <i1> [#uses=1]
|
|
|
|
|
br i1 %exitcond, label %return, label %bb
|
|
|
|
|
|
|
|
|
|
return: ; preds = %bb, %entry
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Unable to eliminate cast due to potentional overflow.
|
|
|
|
|
define void @foobar3() nounwind {
|
|
|
|
|
entry:
|
[opaque pointer type] Add textual IR support for explicit type parameter to the call instruction
See r230786 and r230794 for similar changes to gep and load
respectively.
Call is a bit different because it often doesn't have a single explicit
type - usually the type is deduced from the arguments, and just the
return type is explicit. In those cases there's no need to change the
IR.
When that's not the case, the IR usually contains the pointer type of
the first operand - but since typed pointers are going away, that
representation is insufficient so I'm just stripping the "pointerness"
of the explicit type away.
This does make the IR a bit weird - it /sort of/ reads like the type of
the first operand: "call void () %x(" but %x is actually of type "void
()*" and will eventually be just of type "ptr". But this seems not too
bad and I don't think it would benefit from repeating the type
("void (), void () * %x(" and then eventually "void (), ptr %x(") as has
been done with gep and load.
This also has a side benefit: since the explicit type is no longer a
pointer, there's no ambiguity between an explicit type and a function
that returns a function pointer. Previously this case needed an explicit
type (eg: a function returning a void() function was written as
"call void () () * @x(" rather than "call void () * @x(" because of the
ambiguity between a function returning a pointer to a void() function
and a function returning void).
No ambiguity means even function pointer return types can just be
written alone, without writing the whole function's type.
This leaves /only/ the varargs case where the explicit type is required.
Given the special type syntax in call instructions, the regex-fu used
for migration was a bit more involved in its own unique way (as every
one of these is) so here it is. Use it in conjunction with the apply.sh
script and associated find/xargs commands I've provided in rr230786 to
migrate your out of tree tests. Do let me know if any of this doesn't
cover your cases & we can iterate on a more general script/regexes to
help others with out of tree tests.
About 9 test cases couldn't be automatically migrated - half of those
were functions returning function pointers, where I just had to manually
delete the function argument types now that we didn't need an explicit
function type there. The other half were typedefs of function types used
in calls - just had to manually drop the * from those.
import fileinput
import sys
import re
pat = re.compile(r'((?:=|:|^|\s)call\s(?:[^@]*?))(\s*$|\s*(?:(?:\[\[[a-zA-Z0-9_]+\]\]|[@%](?:(")?[\\\?@a-zA-Z0-9_.]*?(?(3)"|)|{{.*}}))(?:\(|$)|undef|inttoptr|bitcast|null|asm).*$)')
addrspace_end = re.compile(r"addrspace\(\d+\)\s*\*$")
func_end = re.compile("(?:void.*|\)\s*)\*$")
def conv(match, line):
if not match or re.search(addrspace_end, match.group(1)) or not re.search(func_end, match.group(1)):
return line
return line[:match.start()] + match.group(1)[:match.group(1).rfind('*')].rstrip() + match.group(2) + line[match.end():]
for line in sys.stdin:
sys.stdout.write(conv(re.search(pat, line), line))
llvm-svn: 235145
2015-04-17 01:24:18 +02:00
|
|
|
tail call i32 (...) @nn( ) nounwind ; <i32>:0 [#uses=1]
|
2008-08-17 21:25:28 +02:00
|
|
|
icmp eq i32 %0, 0 ; <i1>:1 [#uses=1]
|
|
|
|
|
br i1 %1, label %return, label %bb
|
|
|
|
|
|
|
|
|
|
bb: ; preds = %bb, %entry
|
|
|
|
|
%i.03 = phi i32 [ 0, %entry ], [ %3, %bb ] ; <i32> [#uses=3]
|
|
|
|
|
tail call void @bar( i32 %i.03 ) nounwind
|
|
|
|
|
uitofp i32 %i.03 to double ; <double>:2 [#uses=1]
|
|
|
|
|
tail call void @foo( double %2 ) nounwind
|
|
|
|
|
add i32 %i.03, 1 ; <i32>:3 [#uses=2]
|
[opaque pointer type] Add textual IR support for explicit type parameter to the call instruction
See r230786 and r230794 for similar changes to gep and load
respectively.
Call is a bit different because it often doesn't have a single explicit
type - usually the type is deduced from the arguments, and just the
return type is explicit. In those cases there's no need to change the
IR.
When that's not the case, the IR usually contains the pointer type of
the first operand - but since typed pointers are going away, that
representation is insufficient so I'm just stripping the "pointerness"
of the explicit type away.
This does make the IR a bit weird - it /sort of/ reads like the type of
the first operand: "call void () %x(" but %x is actually of type "void
()*" and will eventually be just of type "ptr". But this seems not too
bad and I don't think it would benefit from repeating the type
("void (), void () * %x(" and then eventually "void (), ptr %x(") as has
been done with gep and load.
This also has a side benefit: since the explicit type is no longer a
pointer, there's no ambiguity between an explicit type and a function
that returns a function pointer. Previously this case needed an explicit
type (eg: a function returning a void() function was written as
"call void () () * @x(" rather than "call void () * @x(" because of the
ambiguity between a function returning a pointer to a void() function
and a function returning void).
No ambiguity means even function pointer return types can just be
written alone, without writing the whole function's type.
This leaves /only/ the varargs case where the explicit type is required.
Given the special type syntax in call instructions, the regex-fu used
for migration was a bit more involved in its own unique way (as every
one of these is) so here it is. Use it in conjunction with the apply.sh
script and associated find/xargs commands I've provided in rr230786 to
migrate your out of tree tests. Do let me know if any of this doesn't
cover your cases & we can iterate on a more general script/regexes to
help others with out of tree tests.
About 9 test cases couldn't be automatically migrated - half of those
were functions returning function pointers, where I just had to manually
delete the function argument types now that we didn't need an explicit
function type there. The other half were typedefs of function types used
in calls - just had to manually drop the * from those.
import fileinput
import sys
import re
pat = re.compile(r'((?:=|:|^|\s)call\s(?:[^@]*?))(\s*$|\s*(?:(?:\[\[[a-zA-Z0-9_]+\]\]|[@%](?:(")?[\\\?@a-zA-Z0-9_.]*?(?(3)"|)|{{.*}}))(?:\(|$)|undef|inttoptr|bitcast|null|asm).*$)')
addrspace_end = re.compile(r"addrspace\(\d+\)\s*\*$")
func_end = re.compile("(?:void.*|\)\s*)\*$")
def conv(match, line):
if not match or re.search(addrspace_end, match.group(1)) or not re.search(func_end, match.group(1)):
return line
return line[:match.start()] + match.group(1)[:match.group(1).rfind('*')].rstrip() + match.group(2) + line[match.end():]
for line in sys.stdin:
sys.stdout.write(conv(re.search(pat, line), line))
llvm-svn: 235145
2015-04-17 01:24:18 +02:00
|
|
|
tail call i32 (...) @nn( ) nounwind ; <i32>:4 [#uses=1]
|
2008-08-17 21:25:28 +02:00
|
|
|
icmp ugt i32 %4, %3 ; <i1>:5 [#uses=1]
|
|
|
|
|
br i1 %5, label %bb, label %return
|
|
|
|
|
|
|
|
|
|
return: ; preds = %bb, %entry
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
; Unable to eliminate cast due to overflow.
|
|
|
|
|
define void @foobar4() nounwind {
|
|
|
|
|
entry:
|
|
|
|
|
br label %bb.nph
|
|
|
|
|
|
|
|
|
|
bb.nph: ; preds = %entry
|
|
|
|
|
br label %bb
|
|
|
|
|
|
|
|
|
|
bb: ; preds = %bb, %bb.nph
|
|
|
|
|
%i.03 = phi i8 [ 0, %bb.nph ], [ %indvar.next, %bb ] ; <i32> [#uses=3]
|
|
|
|
|
%tmp2 = sext i8 %i.03 to i32 ; <i32>:0 [#uses=1]
|
|
|
|
|
tail call void @bar( i32 %tmp2 ) nounwind
|
|
|
|
|
%tmp3 = uitofp i8 %i.03 to double ; <double>:1 [#uses=1]
|
|
|
|
|
tail call void @foo( double %tmp3 ) nounwind
|
|
|
|
|
%indvar.next = add i8 %i.03, 1 ; <i32> [#uses=2]
|
|
|
|
|
%tmp = sext i8 %indvar.next to i32
|
|
|
|
|
%exitcond = icmp eq i32 %tmp, 32767 ; <i1> [#uses=1]
|
|
|
|
|
br i1 %exitcond, label %return, label %bb
|
|
|
|
|
|
|
|
|
|
return: ; preds = %bb, %entry
|
|
|
|
|
ret void
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
declare void @bar(i32)
|
|
|
|
|
|
|
|
|
|
declare void @foo(double)
|
|
|
|
|
|
|
|
|
|
declare i32 @nn(...)
|
|
|
|
|
|
