2014-02-06 12:37:03 +08:00
|
|
|
; RUN: opt -disable-output -passes=print-cg %s 2>&1 | FileCheck %s
|
|
|
|
;
|
|
|
|
; Basic validation of the call graph analysis used in the new pass manager.
|
|
|
|
|
|
|
|
define void @f() {
|
|
|
|
; CHECK-LABEL: Call edges in function: f
|
|
|
|
; CHECK-NOT: ->
|
|
|
|
|
|
|
|
entry:
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
|
|
|
|
; A bunch more functions just to make it easier to test several call edges at once.
|
|
|
|
define void @f1() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f2() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f3() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f4() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f5() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f6() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f7() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f8() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f9() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f10() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f11() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
define void @f12() {
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
|
|
|
|
declare i32 @__gxx_personality_v0(...)
|
|
|
|
|
|
|
|
define void @test0() {
|
|
|
|
; CHECK-LABEL: Call edges in function: test0
|
|
|
|
; CHECK-NEXT: -> f
|
|
|
|
; CHECK-NOT: ->
|
|
|
|
|
|
|
|
entry:
|
|
|
|
call void @f()
|
|
|
|
call void @f()
|
|
|
|
call void @f()
|
|
|
|
call void @f()
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
|
|
|
|
define void ()* @test1(void ()** %x) {
|
|
|
|
; CHECK-LABEL: Call edges in function: test1
|
|
|
|
; CHECK-NEXT: -> f12
|
|
|
|
; CHECK-NEXT: -> f11
|
|
|
|
; CHECK-NEXT: -> f10
|
|
|
|
; CHECK-NEXT: -> f7
|
|
|
|
; CHECK-NEXT: -> f9
|
|
|
|
; CHECK-NEXT: -> f8
|
|
|
|
; CHECK-NEXT: -> f6
|
|
|
|
; CHECK-NEXT: -> f5
|
|
|
|
; CHECK-NEXT: -> f4
|
|
|
|
; CHECK-NEXT: -> f3
|
|
|
|
; CHECK-NEXT: -> f2
|
|
|
|
; CHECK-NEXT: -> f1
|
|
|
|
; CHECK-NOT: ->
|
|
|
|
|
|
|
|
entry:
|
|
|
|
br label %next
|
|
|
|
|
|
|
|
dead:
|
|
|
|
br label %next
|
|
|
|
|
|
|
|
next:
|
|
|
|
phi void ()* [ @f1, %entry ], [ @f2, %dead ]
|
|
|
|
select i1 true, void ()* @f3, void ()* @f4
|
|
|
|
store void ()* @f5, void ()** %x
|
|
|
|
call void @f6()
|
[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 07:24:18 +08:00
|
|
|
call void (void ()*, void ()*) bitcast (void ()* @f7 to void (void ()*, void ()*)*)(void ()* @f8, void ()* @f9)
|
2014-02-06 12:37:03 +08:00
|
|
|
invoke void @f10() to label %exit unwind label %unwind
|
|
|
|
|
|
|
|
exit:
|
|
|
|
ret void ()* @f11
|
|
|
|
|
|
|
|
unwind:
|
|
|
|
%res = landingpad { i8*, i32 } personality i32 (...)* @__gxx_personality_v0
|
|
|
|
cleanup
|
|
|
|
resume { i8*, i32 } { i8* bitcast (void ()* @f12 to i8*), i32 42 }
|
|
|
|
}
|
|
|
|
|
|
|
|
@g = global void ()* @f1
|
|
|
|
@g1 = global [4 x void ()*] [void ()* @f2, void ()* @f3, void ()* @f4, void ()* @f5]
|
|
|
|
@g2 = global {i8, void ()*, i8} {i8 1, void ()* @f6, i8 2}
|
|
|
|
@h = constant void ()* @f7
|
|
|
|
|
|
|
|
define void @test2() {
|
|
|
|
; CHECK-LABEL: Call edges in function: test2
|
|
|
|
; CHECK-NEXT: -> f7
|
|
|
|
; CHECK-NEXT: -> f6
|
|
|
|
; CHECK-NEXT: -> f5
|
|
|
|
; CHECK-NEXT: -> f4
|
|
|
|
; CHECK-NEXT: -> f3
|
|
|
|
; CHECK-NEXT: -> f2
|
|
|
|
; CHECK-NEXT: -> f1
|
|
|
|
; CHECK-NOT: ->
|
|
|
|
|
2015-02-28 05:17:42 +08:00
|
|
|
load i8*, i8** bitcast (void ()** @g to i8**)
|
2015-03-14 02:20:45 +08:00
|
|
|
load i8*, i8** bitcast (void ()** getelementptr ([4 x void ()*], [4 x void ()*]* @g1, i32 0, i32 2) to i8**)
|
|
|
|
load i8*, i8** bitcast (void ()** getelementptr ({i8, void ()*, i8}, {i8, void ()*, i8}* @g2, i32 0, i32 1) to i8**)
|
2015-02-28 05:17:42 +08:00
|
|
|
load i8*, i8** bitcast (void ()** @h to i8**)
|
2014-02-06 12:37:03 +08:00
|
|
|
ret void
|
|
|
|
}
|
[LCG] Add support for building persistent and connected SCCs to the
LazyCallGraph. This is the start of the whole point of this different
abstraction, but it is just the initial bits. Here is a run-down of
what's going on here. I'm planning to incorporate some (or all) of this
into comments going forward, hopefully with better editing and wording.
=]
The crux of the problem with the traditional way of building SCCs is
that they are ephemeral. The new pass manager however really needs the
ability to associate analysis passes and results of analysis passes with
SCCs in order to expose these analysis passes to the SCC passes. Making
this work is kind-of the whole point of the new pass manager. =]
So, when we're building SCCs for the call graph, we actually want to
build persistent nodes that stick around and can be reasoned about
later. We'd also like the ability to walk the SCC graph in more complex
ways than just the traditional postorder traversal of the current CGSCC
walk. That means that in addition to being persistent, the SCCs need to
be connected into a useful graph structure.
However, we still want the SCCs to be formed lazily where possible.
These constraints are quite hard to satisfy with the SCC iterator. Also,
using that would bypass our ability to actually add data to the nodes of
the call graph to facilite implementing the Tarjan walk. So I've
re-implemented things in a more direct and embedded way. This
immediately makes it easy to get the persistence and connectivity
correct, and it also allows leveraging the existing nodes to simplify
the algorithm. I've worked somewhat to make this implementation more
closely follow the traditional paper's nomenclature and strategy,
although it is still a bit obtuse because it isn't recursive, using
an explicit stack and a tail call instead, and it is interruptable,
resuming each time we need another SCC.
The other tricky bit here, and what actually took almost all the time
and trials and errors I spent building this, is exactly *what* graph
structure to build for the SCCs. The naive thing to build is the call
graph in its newly acyclic form. I wrote about 4 versions of this which
did precisely this. Inevitably, when I experimented with them across
various use cases, they became incredibly awkward. It was all
implementable, but it felt like a complete wrong fit. Square peg, round
hole. There were two overriding aspects that pushed me in a different
direction:
1) We want to discover the SCC graph in a postorder fashion. That means
the root node will be the *last* node we find. Using the call-SCC DAG
as the graph structure of the SCCs results in an orphaned graph until
we discover a root.
2) We will eventually want to walk the SCC graph in parallel, exploring
distinct sub-graphs independently, and synchronizing at merge points.
This again is not helped by the call-SCC DAG structure.
The structure which, quite surprisingly, ended up being completely
natural to use is the *inverse* of the call-SCC DAG. We add the leaf
SCCs to the graph as "roots", and have edges to the caller SCCs. Once
I switched to building this structure, everything just fell into place
elegantly.
Aside from general cleanups (there are FIXMEs and too few comments
overall) that are still needed, the other missing piece of this is
support for iterating across levels of the SCC graph. These will become
useful for implementing #2, but they aren't an immediate priority.
Once SCCs are in good shape, I'll be working on adding mutation support
for incremental updates and adding the pass manager that this analysis
enables.
llvm-svn: 206581
2014-04-18 18:50:32 +08:00
|
|
|
|
|
|
|
; Verify the SCCs formed.
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f7
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f6
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f5
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f4
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f3
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f2
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f1
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: test2
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f12
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f11
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f10
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f9
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f8
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: test1
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: f
|
|
|
|
;
|
|
|
|
; CHECK-LABEL: SCC with 1 functions:
|
|
|
|
; CHECK-NEXT: test0
|