author | trims |
Thu, 27 May 2010 19:08:38 -0700 | |
changeset 5547 | f4b087cbb361 |
parent 5534 | 9bea9ee28dfc |
child 5914 | 8363e7e6915a |
permissions | -rw-r--r-- |
1 | 1 |
/* |
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5534
diff
changeset
|
2 |
* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5534
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5534
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5534
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
25 |
#include "incls/_precompiled.incl" |
|
26 |
#include "incls/_escape.cpp.incl" |
|
27 |
||
28 |
void PointsToNode::add_edge(uint targIdx, PointsToNode::EdgeType et) { |
|
29 |
uint v = (targIdx << EdgeShift) + ((uint) et); |
|
30 |
if (_edges == NULL) { |
|
31 |
Arena *a = Compile::current()->comp_arena(); |
|
32 |
_edges = new(a) GrowableArray<uint>(a, INITIAL_EDGE_COUNT, 0, 0); |
|
33 |
} |
|
34 |
_edges->append_if_missing(v); |
|
35 |
} |
|
36 |
||
37 |
void PointsToNode::remove_edge(uint targIdx, PointsToNode::EdgeType et) { |
|
38 |
uint v = (targIdx << EdgeShift) + ((uint) et); |
|
39 |
||
40 |
_edges->remove(v); |
|
41 |
} |
|
42 |
||
43 |
#ifndef PRODUCT |
|
250 | 44 |
static const char *node_type_names[] = { |
1 | 45 |
"UnknownType", |
46 |
"JavaObject", |
|
47 |
"LocalVar", |
|
48 |
"Field" |
|
49 |
}; |
|
50 |
||
250 | 51 |
static const char *esc_names[] = { |
1 | 52 |
"UnknownEscape", |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
53 |
"NoEscape", |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
54 |
"ArgEscape", |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
55 |
"GlobalEscape" |
1 | 56 |
}; |
57 |
||
250 | 58 |
static const char *edge_type_suffix[] = { |
1 | 59 |
"?", // UnknownEdge |
60 |
"P", // PointsToEdge |
|
61 |
"D", // DeferredEdge |
|
62 |
"F" // FieldEdge |
|
63 |
}; |
|
64 |
||
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
65 |
void PointsToNode::dump(bool print_state) const { |
1 | 66 |
NodeType nt = node_type(); |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
67 |
tty->print("%s ", node_type_names[(int) nt]); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
68 |
if (print_state) { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
69 |
EscapeState es = escape_state(); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
70 |
tty->print("%s %s ", esc_names[(int) es], _scalar_replaceable ? "":"NSR"); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
71 |
} |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
72 |
tty->print("[["); |
1 | 73 |
for (uint i = 0; i < edge_count(); i++) { |
74 |
tty->print(" %d%s", edge_target(i), edge_type_suffix[(int) edge_type(i)]); |
|
75 |
} |
|
76 |
tty->print("]] "); |
|
77 |
if (_node == NULL) |
|
78 |
tty->print_cr("<null>"); |
|
79 |
else |
|
80 |
_node->dump(); |
|
81 |
} |
|
82 |
#endif |
|
83 |
||
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
84 |
ConnectionGraph::ConnectionGraph(Compile * C) : |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
85 |
_nodes(C->comp_arena(), C->unique(), C->unique(), PointsToNode()), |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
86 |
_processed(C->comp_arena()), |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
87 |
_collecting(true), |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
88 |
_compile(C), |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
89 |
_node_map(C->comp_arena()) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
90 |
|
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
91 |
_phantom_object = C->top()->_idx, |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
92 |
add_node(C->top(), PointsToNode::JavaObject, PointsToNode::GlobalEscape,true); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
93 |
|
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
94 |
// Add ConP(#NULL) and ConN(#NULL) nodes. |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
95 |
PhaseGVN* igvn = C->initial_gvn(); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
96 |
Node* oop_null = igvn->zerocon(T_OBJECT); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
97 |
_oop_null = oop_null->_idx; |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
98 |
assert(_oop_null < C->unique(), "should be created already"); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
99 |
add_node(oop_null, PointsToNode::JavaObject, PointsToNode::NoEscape, true); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
100 |
|
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
101 |
if (UseCompressedOops) { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
102 |
Node* noop_null = igvn->zerocon(T_NARROWOOP); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
103 |
_noop_null = noop_null->_idx; |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
104 |
assert(_noop_null < C->unique(), "should be created already"); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
105 |
add_node(noop_null, PointsToNode::JavaObject, PointsToNode::NoEscape, true); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
106 |
} |
1 | 107 |
} |
108 |
||
109 |
void ConnectionGraph::add_pointsto_edge(uint from_i, uint to_i) { |
|
110 |
PointsToNode *f = ptnode_adr(from_i); |
|
111 |
PointsToNode *t = ptnode_adr(to_i); |
|
112 |
||
113 |
assert(f->node_type() != PointsToNode::UnknownType && t->node_type() != PointsToNode::UnknownType, "node types must be set"); |
|
114 |
assert(f->node_type() == PointsToNode::LocalVar || f->node_type() == PointsToNode::Field, "invalid source of PointsTo edge"); |
|
115 |
assert(t->node_type() == PointsToNode::JavaObject, "invalid destination of PointsTo edge"); |
|
116 |
f->add_edge(to_i, PointsToNode::PointsToEdge); |
|
117 |
} |
|
118 |
||
119 |
void ConnectionGraph::add_deferred_edge(uint from_i, uint to_i) { |
|
120 |
PointsToNode *f = ptnode_adr(from_i); |
|
121 |
PointsToNode *t = ptnode_adr(to_i); |
|
122 |
||
123 |
assert(f->node_type() != PointsToNode::UnknownType && t->node_type() != PointsToNode::UnknownType, "node types must be set"); |
|
124 |
assert(f->node_type() == PointsToNode::LocalVar || f->node_type() == PointsToNode::Field, "invalid source of Deferred edge"); |
|
125 |
assert(t->node_type() == PointsToNode::LocalVar || t->node_type() == PointsToNode::Field, "invalid destination of Deferred edge"); |
|
126 |
// don't add a self-referential edge, this can occur during removal of |
|
127 |
// deferred edges |
|
128 |
if (from_i != to_i) |
|
129 |
f->add_edge(to_i, PointsToNode::DeferredEdge); |
|
130 |
} |
|
131 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
132 |
int ConnectionGraph::address_offset(Node* adr, PhaseTransform *phase) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
133 |
const Type *adr_type = phase->type(adr); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
134 |
if (adr->is_AddP() && adr_type->isa_oopptr() == NULL && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
135 |
adr->in(AddPNode::Address)->is_Proj() && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
136 |
adr->in(AddPNode::Address)->in(0)->is_Allocate()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
137 |
// We are computing a raw address for a store captured by an Initialize |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
138 |
// compute an appropriate address type. AddP cases #3 and #5 (see below). |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
139 |
int offs = (int)phase->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
140 |
assert(offs != Type::OffsetBot || |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
141 |
adr->in(AddPNode::Address)->in(0)->is_AllocateArray(), |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
142 |
"offset must be a constant or it is initialization of array"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
143 |
return offs; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
144 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
145 |
const TypePtr *t_ptr = adr_type->isa_ptr(); |
1 | 146 |
assert(t_ptr != NULL, "must be a pointer type"); |
147 |
return t_ptr->offset(); |
|
148 |
} |
|
149 |
||
150 |
void ConnectionGraph::add_field_edge(uint from_i, uint to_i, int offset) { |
|
151 |
PointsToNode *f = ptnode_adr(from_i); |
|
152 |
PointsToNode *t = ptnode_adr(to_i); |
|
153 |
||
154 |
assert(f->node_type() != PointsToNode::UnknownType && t->node_type() != PointsToNode::UnknownType, "node types must be set"); |
|
155 |
assert(f->node_type() == PointsToNode::JavaObject, "invalid destination of Field edge"); |
|
156 |
assert(t->node_type() == PointsToNode::Field, "invalid destination of Field edge"); |
|
157 |
assert (t->offset() == -1 || t->offset() == offset, "conflicting field offsets"); |
|
158 |
t->set_offset(offset); |
|
159 |
||
160 |
f->add_edge(to_i, PointsToNode::FieldEdge); |
|
161 |
} |
|
162 |
||
163 |
void ConnectionGraph::set_escape_state(uint ni, PointsToNode::EscapeState es) { |
|
164 |
PointsToNode *npt = ptnode_adr(ni); |
|
165 |
PointsToNode::EscapeState old_es = npt->escape_state(); |
|
166 |
if (es > old_es) |
|
167 |
npt->set_escape_state(es); |
|
168 |
} |
|
169 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
170 |
void ConnectionGraph::add_node(Node *n, PointsToNode::NodeType nt, |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
171 |
PointsToNode::EscapeState es, bool done) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
172 |
PointsToNode* ptadr = ptnode_adr(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
173 |
ptadr->_node = n; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
174 |
ptadr->set_node_type(nt); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
175 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
176 |
// inline set_escape_state(idx, es); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
177 |
PointsToNode::EscapeState old_es = ptadr->escape_state(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
178 |
if (es > old_es) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
179 |
ptadr->set_escape_state(es); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
180 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
181 |
if (done) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
182 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
183 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
184 |
|
1 | 185 |
PointsToNode::EscapeState ConnectionGraph::escape_state(Node *n, PhaseTransform *phase) { |
186 |
uint idx = n->_idx; |
|
187 |
PointsToNode::EscapeState es; |
|
188 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
189 |
// If we are still collecting or there were no non-escaping allocations |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
190 |
// we don't know the answer yet |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
191 |
if (_collecting) |
1 | 192 |
return PointsToNode::UnknownEscape; |
193 |
||
194 |
// if the node was created after the escape computation, return |
|
195 |
// UnknownEscape |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
196 |
if (idx >= nodes_size()) |
1 | 197 |
return PointsToNode::UnknownEscape; |
198 |
||
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
199 |
es = ptnode_adr(idx)->escape_state(); |
1 | 200 |
|
201 |
// if we have already computed a value, return it |
|
1613
be097ec639a2
6775880: EA +DeoptimizeALot: assert(mon_info->owner()->is_locked(),"object must be locked now")
kvn
parents:
1069
diff
changeset
|
202 |
if (es != PointsToNode::UnknownEscape && |
be097ec639a2
6775880: EA +DeoptimizeALot: assert(mon_info->owner()->is_locked(),"object must be locked now")
kvn
parents:
1069
diff
changeset
|
203 |
ptnode_adr(idx)->node_type() == PointsToNode::JavaObject) |
1 | 204 |
return es; |
205 |
||
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
206 |
// PointsTo() calls n->uncast() which can return a new ideal node. |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
207 |
if (n->uncast()->_idx >= nodes_size()) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
208 |
return PointsToNode::UnknownEscape; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
209 |
|
1 | 210 |
// compute max escape state of anything this node could point to |
211 |
VectorSet ptset(Thread::current()->resource_area()); |
|
212 |
PointsTo(ptset, n, phase); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
213 |
for(VectorSetI i(&ptset); i.test() && es != PointsToNode::GlobalEscape; ++i) { |
1 | 214 |
uint pt = i.elem; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
215 |
PointsToNode::EscapeState pes = ptnode_adr(pt)->escape_state(); |
1 | 216 |
if (pes > es) |
217 |
es = pes; |
|
218 |
} |
|
219 |
// cache the computed escape state |
|
220 |
assert(es != PointsToNode::UnknownEscape, "should have computed an escape state"); |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
221 |
ptnode_adr(idx)->set_escape_state(es); |
1 | 222 |
return es; |
223 |
} |
|
224 |
||
225 |
void ConnectionGraph::PointsTo(VectorSet &ptset, Node * n, PhaseTransform *phase) { |
|
226 |
VectorSet visited(Thread::current()->resource_area()); |
|
227 |
GrowableArray<uint> worklist; |
|
228 |
||
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
229 |
#ifdef ASSERT |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
230 |
Node *orig_n = n; |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
231 |
#endif |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
232 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
233 |
n = n->uncast(); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
234 |
PointsToNode* npt = ptnode_adr(n->_idx); |
1 | 235 |
|
236 |
// If we have a JavaObject, return just that object |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
237 |
if (npt->node_type() == PointsToNode::JavaObject) { |
1 | 238 |
ptset.set(n->_idx); |
239 |
return; |
|
240 |
} |
|
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
241 |
#ifdef ASSERT |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
242 |
if (npt->_node == NULL) { |
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
243 |
if (orig_n != n) |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
244 |
orig_n->dump(); |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
245 |
n->dump(); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
246 |
assert(npt->_node != NULL, "unregistered node"); |
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
247 |
} |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
248 |
#endif |
1 | 249 |
worklist.push(n->_idx); |
250 |
while(worklist.length() > 0) { |
|
251 |
int ni = worklist.pop(); |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
252 |
if (visited.test_set(ni)) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
253 |
continue; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
254 |
|
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
255 |
PointsToNode* pn = ptnode_adr(ni); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
256 |
// ensure that all inputs of a Phi have been processed |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
257 |
assert(!_collecting || !pn->_node->is_Phi() || _processed.test(ni),""); |
1 | 258 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
259 |
int edges_processed = 0; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
260 |
uint e_cnt = pn->edge_count(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
261 |
for (uint e = 0; e < e_cnt; e++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
262 |
uint etgt = pn->edge_target(e); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
263 |
PointsToNode::EdgeType et = pn->edge_type(e); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
264 |
if (et == PointsToNode::PointsToEdge) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
265 |
ptset.set(etgt); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
266 |
edges_processed++; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
267 |
} else if (et == PointsToNode::DeferredEdge) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
268 |
worklist.push(etgt); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
269 |
edges_processed++; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
270 |
} else { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
271 |
assert(false,"neither PointsToEdge or DeferredEdge"); |
1 | 272 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
273 |
} |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
274 |
if (edges_processed == 0) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
275 |
// no deferred or pointsto edges found. Assume the value was set |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
276 |
// outside this method. Add the phantom object to the pointsto set. |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
277 |
ptset.set(_phantom_object); |
1 | 278 |
} |
279 |
} |
|
280 |
} |
|
281 |
||
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
282 |
void ConnectionGraph::remove_deferred(uint ni, GrowableArray<uint>* deferred_edges, VectorSet* visited) { |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
283 |
// This method is most expensive during ConnectionGraph construction. |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
284 |
// Reuse vectorSet and an additional growable array for deferred edges. |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
285 |
deferred_edges->clear(); |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
286 |
visited->Clear(); |
1 | 287 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
288 |
visited->set(ni); |
1 | 289 |
PointsToNode *ptn = ptnode_adr(ni); |
290 |
||
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
291 |
// Mark current edges as visited and move deferred edges to separate array. |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
292 |
for (uint i = 0; i < ptn->edge_count(); ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
293 |
uint t = ptn->edge_target(i); |
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
294 |
#ifdef ASSERT |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
295 |
assert(!visited->test_set(t), "expecting no duplications"); |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
296 |
#else |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
297 |
visited->set(t); |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
298 |
#endif |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
299 |
if (ptn->edge_type(i) == PointsToNode::DeferredEdge) { |
1 | 300 |
ptn->remove_edge(t, PointsToNode::DeferredEdge); |
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
301 |
deferred_edges->append(t); |
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
302 |
} else { |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
303 |
i++; |
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
304 |
} |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
305 |
} |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
306 |
for (int next = 0; next < deferred_edges->length(); ++next) { |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
307 |
uint t = deferred_edges->at(next); |
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
308 |
PointsToNode *ptt = ptnode_adr(t); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
309 |
uint e_cnt = ptt->edge_count(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
310 |
for (uint e = 0; e < e_cnt; e++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
311 |
uint etgt = ptt->edge_target(e); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
312 |
if (visited->test_set(etgt)) |
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
313 |
continue; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
314 |
|
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
315 |
PointsToNode::EdgeType et = ptt->edge_type(e); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
316 |
if (et == PointsToNode::PointsToEdge) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
317 |
add_pointsto_edge(ni, etgt); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
318 |
if(etgt == _phantom_object) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
319 |
// Special case - field set outside (globally escaping). |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
320 |
ptn->set_escape_state(PointsToNode::GlobalEscape); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
321 |
} |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
322 |
} else if (et == PointsToNode::DeferredEdge) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
323 |
deferred_edges->append(etgt); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
324 |
} else { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
325 |
assert(false,"invalid connection graph"); |
1 | 326 |
} |
327 |
} |
|
328 |
} |
|
329 |
} |
|
330 |
||
331 |
||
332 |
// Add an edge to node given by "to_i" from any field of adr_i whose offset |
|
333 |
// matches "offset" A deferred edge is added if to_i is a LocalVar, and |
|
334 |
// a pointsto edge is added if it is a JavaObject |
|
335 |
||
336 |
void ConnectionGraph::add_edge_from_fields(uint adr_i, uint to_i, int offs) { |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
337 |
PointsToNode* an = ptnode_adr(adr_i); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
338 |
PointsToNode* to = ptnode_adr(to_i); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
339 |
bool deferred = (to->node_type() == PointsToNode::LocalVar); |
1 | 340 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
341 |
for (uint fe = 0; fe < an->edge_count(); fe++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
342 |
assert(an->edge_type(fe) == PointsToNode::FieldEdge, "expecting a field edge"); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
343 |
int fi = an->edge_target(fe); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
344 |
PointsToNode* pf = ptnode_adr(fi); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
345 |
int po = pf->offset(); |
1 | 346 |
if (po == offs || po == Type::OffsetBot || offs == Type::OffsetBot) { |
347 |
if (deferred) |
|
348 |
add_deferred_edge(fi, to_i); |
|
349 |
else |
|
350 |
add_pointsto_edge(fi, to_i); |
|
351 |
} |
|
352 |
} |
|
353 |
} |
|
354 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
355 |
// Add a deferred edge from node given by "from_i" to any field of adr_i |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
356 |
// whose offset matches "offset". |
1 | 357 |
void ConnectionGraph::add_deferred_edge_to_fields(uint from_i, uint adr_i, int offs) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
358 |
PointsToNode* an = ptnode_adr(adr_i); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
359 |
for (uint fe = 0; fe < an->edge_count(); fe++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
360 |
assert(an->edge_type(fe) == PointsToNode::FieldEdge, "expecting a field edge"); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
361 |
int fi = an->edge_target(fe); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
362 |
PointsToNode* pf = ptnode_adr(fi); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
363 |
int po = pf->offset(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
364 |
if (pf->edge_count() == 0) { |
1 | 365 |
// we have not seen any stores to this field, assume it was set outside this method |
366 |
add_pointsto_edge(fi, _phantom_object); |
|
367 |
} |
|
368 |
if (po == offs || po == Type::OffsetBot || offs == Type::OffsetBot) { |
|
369 |
add_deferred_edge(from_i, fi); |
|
370 |
} |
|
371 |
} |
|
372 |
} |
|
373 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
374 |
// Helper functions |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
375 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
376 |
static Node* get_addp_base(Node *addp) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
377 |
assert(addp->is_AddP(), "must be AddP"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
378 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
379 |
// AddP cases for Base and Address inputs: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
380 |
// case #1. Direct object's field reference: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
381 |
// Allocate |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
382 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
383 |
// Proj #5 ( oop result ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
384 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
385 |
// CheckCastPP (cast to instance type) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
386 |
// | | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
387 |
// AddP ( base == address ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
388 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
389 |
// case #2. Indirect object's field reference: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
390 |
// Phi |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
391 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
392 |
// CastPP (cast to instance type) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
393 |
// | | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
394 |
// AddP ( base == address ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
395 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
396 |
// case #3. Raw object's field reference for Initialize node: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
397 |
// Allocate |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
398 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
399 |
// Proj #5 ( oop result ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
400 |
// top | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
401 |
// \ | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
402 |
// AddP ( base == top ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
403 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
404 |
// case #4. Array's element reference: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
405 |
// {CheckCastPP | CastPP} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
406 |
// | | | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
407 |
// | AddP ( array's element offset ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
408 |
// | | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
409 |
// AddP ( array's offset ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
410 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
411 |
// case #5. Raw object's field reference for arraycopy stub call: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
412 |
// The inline_native_clone() case when the arraycopy stub is called |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
413 |
// after the allocation before Initialize and CheckCastPP nodes. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
414 |
// Allocate |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
415 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
416 |
// Proj #5 ( oop result ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
417 |
// | | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
418 |
// AddP ( base == address ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
419 |
// |
250 | 420 |
// case #6. Constant Pool, ThreadLocal, CastX2P or |
421 |
// Raw object's field reference: |
|
422 |
// {ConP, ThreadLocal, CastX2P, raw Load} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
423 |
// top | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
424 |
// \ | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
425 |
// AddP ( base == top ) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
426 |
// |
250 | 427 |
// case #7. Klass's field reference. |
428 |
// LoadKlass |
|
429 |
// | | |
|
430 |
// AddP ( base == address ) |
|
431 |
// |
|
590
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
432 |
// case #8. narrow Klass's field reference. |
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
433 |
// LoadNKlass |
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
434 |
// | |
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
435 |
// DecodeN |
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
436 |
// | | |
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
437 |
// AddP ( base == address ) |
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
438 |
// |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
439 |
Node *base = addp->in(AddPNode::Base)->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
440 |
if (base->is_top()) { // The AddP case #3 and #6. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
441 |
base = addp->in(AddPNode::Address)->uncast(); |
3804 | 442 |
while (base->is_AddP()) { |
443 |
// Case #6 (unsafe access) may have several chained AddP nodes. |
|
444 |
assert(base->in(AddPNode::Base)->is_top(), "expected unsafe access address only"); |
|
445 |
base = base->in(AddPNode::Address)->uncast(); |
|
446 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
447 |
assert(base->Opcode() == Op_ConP || base->Opcode() == Op_ThreadLocal || |
594
9f4474e5dbaf
6705887: Compressed Oops: generate x64 addressing and implicit null checks with narrow oops
kvn
parents:
590
diff
changeset
|
448 |
base->Opcode() == Op_CastX2P || base->is_DecodeN() || |
250 | 449 |
(base->is_Mem() && base->bottom_type() == TypeRawPtr::NOTNULL) || |
450 |
(base->is_Proj() && base->in(0)->is_Allocate()), "sanity"); |
|
1 | 451 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
452 |
return base; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
453 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
454 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
455 |
static Node* find_second_addp(Node* addp, Node* n) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
456 |
assert(addp->is_AddP() && addp->outcnt() > 0, "Don't process dead nodes"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
457 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
458 |
Node* addp2 = addp->raw_out(0); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
459 |
if (addp->outcnt() == 1 && addp2->is_AddP() && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
460 |
addp2->in(AddPNode::Base) == n && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
461 |
addp2->in(AddPNode::Address) == addp) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
462 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
463 |
assert(addp->in(AddPNode::Base) == n, "expecting the same base"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
464 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
465 |
// Find array's offset to push it on worklist first and |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
466 |
// as result process an array's element offset first (pushed second) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
467 |
// to avoid CastPP for the array's offset. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
468 |
// Otherwise the inserted CastPP (LocalVar) will point to what |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
469 |
// the AddP (Field) points to. Which would be wrong since |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
470 |
// the algorithm expects the CastPP has the same point as |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
471 |
// as AddP's base CheckCastPP (LocalVar). |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
472 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
473 |
// ArrayAllocation |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
474 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
475 |
// CheckCastPP |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
476 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
477 |
// memProj (from ArrayAllocation CheckCastPP) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
478 |
// | || |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
479 |
// | || Int (element index) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
480 |
// | || | ConI (log(element size)) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
481 |
// | || | / |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
482 |
// | || LShift |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
483 |
// | || / |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
484 |
// | AddP (array's element offset) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
485 |
// | | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
486 |
// | | ConI (array's offset: #12(32-bits) or #24(64-bits)) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
487 |
// | / / |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
488 |
// AddP (array's offset) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
489 |
// | |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
490 |
// Load/Store (memory operation on array's element) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
491 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
492 |
return addp2; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
493 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
494 |
return NULL; |
1 | 495 |
} |
496 |
||
497 |
// |
|
498 |
// Adjust the type and inputs of an AddP which computes the |
|
499 |
// address of a field of an instance |
|
500 |
// |
|
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
501 |
bool ConnectionGraph::split_AddP(Node *addp, Node *base, PhaseGVN *igvn) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
502 |
const TypeOopPtr *base_t = igvn->type(base)->isa_oopptr(); |
769 | 503 |
assert(base_t != NULL && base_t->is_known_instance(), "expecting instance oopptr"); |
1 | 504 |
const TypeOopPtr *t = igvn->type(addp)->isa_oopptr(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
505 |
if (t == NULL) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
506 |
// We are computing a raw address for a store captured by an Initialize |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
507 |
// compute an appropriate address type (cases #3 and #5). |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
508 |
assert(igvn->type(addp) == TypeRawPtr::NOTNULL, "must be raw pointer"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
509 |
assert(addp->in(AddPNode::Address)->is_Proj(), "base of raw address must be result projection from allocation"); |
1068
720698d9c89b
6741738: TypePtr::add_offset() set incorrect offset when the add overflows
kvn
parents:
1055
diff
changeset
|
510 |
intptr_t offs = (int)igvn->find_intptr_t_con(addp->in(AddPNode::Offset), Type::OffsetBot); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
511 |
assert(offs != Type::OffsetBot, "offset must be a constant"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
512 |
t = base_t->add_offset(offs)->is_oopptr(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
513 |
} |
769 | 514 |
int inst_id = base_t->instance_id(); |
515 |
assert(!t->is_known_instance() || t->instance_id() == inst_id, |
|
1 | 516 |
"old type must be non-instance or match new type"); |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
517 |
|
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
518 |
// The type 't' could be subclass of 'base_t'. |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
519 |
// As result t->offset() could be large then base_t's size and it will |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
520 |
// cause the failure in add_offset() with narrow oops since TypeOopPtr() |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
521 |
// constructor verifies correctness of the offset. |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
522 |
// |
2131 | 523 |
// It could happened on subclass's branch (from the type profiling |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
524 |
// inlining) which was not eliminated during parsing since the exactness |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
525 |
// of the allocation type was not propagated to the subclass type check. |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
526 |
// |
3907
2a567f035d5c
6879362: assert(!klass_is_exact(),"only non-exact klass")
kvn
parents:
3804
diff
changeset
|
527 |
// Or the type 't' could be not related to 'base_t' at all. |
2a567f035d5c
6879362: assert(!klass_is_exact(),"only non-exact klass")
kvn
parents:
3804
diff
changeset
|
528 |
// It could happened when CHA type is different from MDO type on a dead path |
2a567f035d5c
6879362: assert(!klass_is_exact(),"only non-exact klass")
kvn
parents:
3804
diff
changeset
|
529 |
// (for example, from instanceof check) which is not collapsed during parsing. |
2a567f035d5c
6879362: assert(!klass_is_exact(),"only non-exact klass")
kvn
parents:
3804
diff
changeset
|
530 |
// |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
531 |
// Do nothing for such AddP node and don't process its users since |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
532 |
// this code branch will go away. |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
533 |
// |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
534 |
if (!t->is_known_instance() && |
3907
2a567f035d5c
6879362: assert(!klass_is_exact(),"only non-exact klass")
kvn
parents:
3804
diff
changeset
|
535 |
!base_t->klass()->is_subtype_of(t->klass())) { |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
536 |
return false; // bail out |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
537 |
} |
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
538 |
|
1 | 539 |
const TypeOopPtr *tinst = base_t->add_offset(t->offset())->is_oopptr(); |
4432
29b057bf202d
6896352: CTW fails hotspot/src/share/vm/opto/escape.cpp:1155
kvn
parents:
3907
diff
changeset
|
540 |
// Do NOT remove the next line: ensure a new alias index is allocated |
29b057bf202d
6896352: CTW fails hotspot/src/share/vm/opto/escape.cpp:1155
kvn
parents:
3907
diff
changeset
|
541 |
// for the instance type. Note: C++ will not remove it since the call |
29b057bf202d
6896352: CTW fails hotspot/src/share/vm/opto/escape.cpp:1155
kvn
parents:
3907
diff
changeset
|
542 |
// has side effect. |
1 | 543 |
int alias_idx = _compile->get_alias_index(tinst); |
544 |
igvn->set_type(addp, tinst); |
|
545 |
// record the allocation in the node map |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
546 |
assert(ptnode_adr(addp->_idx)->_node != NULL, "should be registered"); |
1 | 547 |
set_map(addp->_idx, get_map(base->_idx)); |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
548 |
|
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
549 |
// Set addp's Base and Address to 'base'. |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
550 |
Node *abase = addp->in(AddPNode::Base); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
551 |
Node *adr = addp->in(AddPNode::Address); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
552 |
if (adr->is_Proj() && adr->in(0)->is_Allocate() && |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
553 |
adr->in(0)->_idx == (uint)inst_id) { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
554 |
// Skip AddP cases #3 and #5. |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
555 |
} else { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
556 |
assert(!abase->is_top(), "sanity"); // AddP case #3 |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
557 |
if (abase != base) { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
558 |
igvn->hash_delete(addp); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
559 |
addp->set_req(AddPNode::Base, base); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
560 |
if (abase == adr) { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
561 |
addp->set_req(AddPNode::Address, base); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
562 |
} else { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
563 |
// AddP case #4 (adr is array's element offset AddP node) |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
564 |
#ifdef ASSERT |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
565 |
const TypeOopPtr *atype = igvn->type(adr)->isa_oopptr(); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
566 |
assert(adr->is_AddP() && atype != NULL && |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
567 |
atype->instance_id() == inst_id, "array's element offset should be processed first"); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
568 |
#endif |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
569 |
} |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
570 |
igvn->hash_insert(addp); |
1 | 571 |
} |
572 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
573 |
// Put on IGVN worklist since at least addp's type was changed above. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
574 |
record_for_optimizer(addp); |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
575 |
return true; |
1 | 576 |
} |
577 |
||
578 |
// |
|
579 |
// Create a new version of orig_phi if necessary. Returns either the newly |
|
580 |
// created phi or an existing phi. Sets create_new to indicate wheter a new |
|
581 |
// phi was created. Cache the last newly created phi in the node map. |
|
582 |
// |
|
583 |
PhiNode *ConnectionGraph::create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn, bool &new_created) { |
|
584 |
Compile *C = _compile; |
|
585 |
new_created = false; |
|
586 |
int phi_alias_idx = C->get_alias_index(orig_phi->adr_type()); |
|
587 |
// nothing to do if orig_phi is bottom memory or matches alias_idx |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
588 |
if (phi_alias_idx == alias_idx) { |
1 | 589 |
return orig_phi; |
590 |
} |
|
3268
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
591 |
// Have we recently created a Phi for this alias index? |
1 | 592 |
PhiNode *result = get_map_phi(orig_phi->_idx); |
593 |
if (result != NULL && C->get_alias_index(result->adr_type()) == alias_idx) { |
|
594 |
return result; |
|
595 |
} |
|
3268
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
596 |
// Previous check may fail when the same wide memory Phi was split into Phis |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
597 |
// for different memory slices. Search all Phis for this region. |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
598 |
if (result != NULL) { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
599 |
Node* region = orig_phi->in(0); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
600 |
for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
601 |
Node* phi = region->fast_out(i); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
602 |
if (phi->is_Phi() && |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
603 |
C->get_alias_index(phi->as_Phi()->adr_type()) == alias_idx) { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
604 |
assert(phi->_idx >= nodes_size(), "only new Phi per instance memory slice"); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
605 |
return phi->as_Phi(); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
606 |
} |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
607 |
} |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
608 |
} |
211
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
609 |
if ((int)C->unique() + 2*NodeLimitFudgeFactor > MaxNodeLimit) { |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
610 |
if (C->do_escape_analysis() == true && !C->failing()) { |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
611 |
// Retry compilation without escape analysis. |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
612 |
// If this is the first failure, the sentinel string will "stick" |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
613 |
// to the Compile object, and the C2Compiler will see it and retry. |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
614 |
C->record_failure(C2Compiler::retry_no_escape_analysis()); |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
615 |
} |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
616 |
return NULL; |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
617 |
} |
1 | 618 |
orig_phi_worklist.append_if_missing(orig_phi); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
619 |
const TypePtr *atype = C->get_adr_type(alias_idx); |
1 | 620 |
result = PhiNode::make(orig_phi->in(0), NULL, Type::MEMORY, atype); |
3268
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2871
diff
changeset
|
621 |
C->copy_node_notes_to(result, orig_phi); |
1 | 622 |
igvn->set_type(result, result->bottom_type()); |
623 |
record_for_optimizer(result); |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
624 |
|
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
625 |
debug_only(Node* pn = ptnode_adr(orig_phi->_idx)->_node;) |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
626 |
assert(pn == NULL || pn == orig_phi, "wrong node"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
627 |
set_map(orig_phi->_idx, result); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
628 |
ptnode_adr(orig_phi->_idx)->_node = orig_phi; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
629 |
|
1 | 630 |
new_created = true; |
631 |
return result; |
|
632 |
} |
|
633 |
||
634 |
// |
|
635 |
// Return a new version of Memory Phi "orig_phi" with the inputs having the |
|
636 |
// specified alias index. |
|
637 |
// |
|
638 |
PhiNode *ConnectionGraph::split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn) { |
|
639 |
||
640 |
assert(alias_idx != Compile::AliasIdxBot, "can't split out bottom memory"); |
|
641 |
Compile *C = _compile; |
|
642 |
bool new_phi_created; |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
643 |
PhiNode *result = create_split_phi(orig_phi, alias_idx, orig_phi_worklist, igvn, new_phi_created); |
1 | 644 |
if (!new_phi_created) { |
645 |
return result; |
|
646 |
} |
|
647 |
||
648 |
GrowableArray<PhiNode *> phi_list; |
|
649 |
GrowableArray<uint> cur_input; |
|
650 |
||
651 |
PhiNode *phi = orig_phi; |
|
652 |
uint idx = 1; |
|
653 |
bool finished = false; |
|
654 |
while(!finished) { |
|
655 |
while (idx < phi->req()) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
656 |
Node *mem = find_inst_mem(phi->in(idx), alias_idx, orig_phi_worklist, igvn); |
1 | 657 |
if (mem != NULL && mem->is_Phi()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
658 |
PhiNode *newphi = create_split_phi(mem->as_Phi(), alias_idx, orig_phi_worklist, igvn, new_phi_created); |
1 | 659 |
if (new_phi_created) { |
660 |
// found an phi for which we created a new split, push current one on worklist and begin |
|
661 |
// processing new one |
|
662 |
phi_list.push(phi); |
|
663 |
cur_input.push(idx); |
|
664 |
phi = mem->as_Phi(); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
665 |
result = newphi; |
1 | 666 |
idx = 1; |
667 |
continue; |
|
668 |
} else { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
669 |
mem = newphi; |
1 | 670 |
} |
671 |
} |
|
211
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
672 |
if (C->failing()) { |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
673 |
return NULL; |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
674 |
} |
1 | 675 |
result->set_req(idx++, mem); |
676 |
} |
|
677 |
#ifdef ASSERT |
|
678 |
// verify that the new Phi has an input for each input of the original |
|
679 |
assert( phi->req() == result->req(), "must have same number of inputs."); |
|
680 |
assert( result->in(0) != NULL && result->in(0) == phi->in(0), "regions must match"); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
681 |
#endif |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
682 |
// Check if all new phi's inputs have specified alias index. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
683 |
// Otherwise use old phi. |
1 | 684 |
for (uint i = 1; i < phi->req(); i++) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
685 |
Node* in = result->in(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
686 |
assert((phi->in(i) == NULL) == (in == NULL), "inputs must correspond."); |
1 | 687 |
} |
688 |
// we have finished processing a Phi, see if there are any more to do |
|
689 |
finished = (phi_list.length() == 0 ); |
|
690 |
if (!finished) { |
|
691 |
phi = phi_list.pop(); |
|
692 |
idx = cur_input.pop(); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
693 |
PhiNode *prev_result = get_map_phi(phi->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
694 |
prev_result->set_req(idx++, result); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
695 |
result = prev_result; |
1 | 696 |
} |
697 |
} |
|
698 |
return result; |
|
699 |
} |
|
700 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
701 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
702 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
703 |
// The next methods are derived from methods in MemNode. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
704 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
705 |
static Node *step_through_mergemem(MergeMemNode *mmem, int alias_idx, const TypeOopPtr *tinst) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
706 |
Node *mem = mmem; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
707 |
// TypeInstPtr::NOTNULL+any is an OOP with unknown offset - generally |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
708 |
// means an array I have not precisely typed yet. Do not do any |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
709 |
// alias stuff with it any time soon. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
710 |
if( tinst->base() != Type::AnyPtr && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
711 |
!(tinst->klass()->is_java_lang_Object() && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
712 |
tinst->offset() == Type::OffsetBot) ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
713 |
mem = mmem->memory_at(alias_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
714 |
// Update input if it is progress over what we have now |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
715 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
716 |
return mem; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
717 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
718 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
719 |
// |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
720 |
// Move memory users to their memory slices. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
721 |
// |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
722 |
void ConnectionGraph::move_inst_mem(Node* n, GrowableArray<PhiNode *> &orig_phis, PhaseGVN *igvn) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
723 |
Compile* C = _compile; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
724 |
|
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
725 |
const TypePtr* tp = igvn->type(n->in(MemNode::Address))->isa_ptr(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
726 |
assert(tp != NULL, "ptr type"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
727 |
int alias_idx = C->get_alias_index(tp); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
728 |
int general_idx = C->get_general_index(alias_idx); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
729 |
|
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
730 |
// Move users first |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
731 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
732 |
Node* use = n->fast_out(i); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
733 |
if (use->is_MergeMem()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
734 |
MergeMemNode* mmem = use->as_MergeMem(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
735 |
assert(n == mmem->memory_at(alias_idx), "should be on instance memory slice"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
736 |
if (n != mmem->memory_at(general_idx) || alias_idx == general_idx) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
737 |
continue; // Nothing to do |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
738 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
739 |
// Replace previous general reference to mem node. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
740 |
uint orig_uniq = C->unique(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
741 |
Node* m = find_inst_mem(n, general_idx, orig_phis, igvn); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
742 |
assert(orig_uniq == C->unique(), "no new nodes"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
743 |
mmem->set_memory_at(general_idx, m); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
744 |
--imax; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
745 |
--i; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
746 |
} else if (use->is_MemBar()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
747 |
assert(!use->is_Initialize(), "initializing stores should not be moved"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
748 |
if (use->req() > MemBarNode::Precedent && |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
749 |
use->in(MemBarNode::Precedent) == n) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
750 |
// Don't move related membars. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
751 |
record_for_optimizer(use); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
752 |
continue; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
753 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
754 |
tp = use->as_MemBar()->adr_type()->isa_ptr(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
755 |
if (tp != NULL && C->get_alias_index(tp) == alias_idx || |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
756 |
alias_idx == general_idx) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
757 |
continue; // Nothing to do |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
758 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
759 |
// Move to general memory slice. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
760 |
uint orig_uniq = C->unique(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
761 |
Node* m = find_inst_mem(n, general_idx, orig_phis, igvn); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
762 |
assert(orig_uniq == C->unique(), "no new nodes"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
763 |
igvn->hash_delete(use); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
764 |
imax -= use->replace_edge(n, m); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
765 |
igvn->hash_insert(use); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
766 |
record_for_optimizer(use); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
767 |
--i; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
768 |
#ifdef ASSERT |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
769 |
} else if (use->is_Mem()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
770 |
if (use->Opcode() == Op_StoreCM && use->in(MemNode::OopStore) == n) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
771 |
// Don't move related cardmark. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
772 |
continue; |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
773 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
774 |
// Memory nodes should have new memory input. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
775 |
tp = igvn->type(use->in(MemNode::Address))->isa_ptr(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
776 |
assert(tp != NULL, "ptr type"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
777 |
int idx = C->get_alias_index(tp); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
778 |
assert(get_map(use->_idx) != NULL || idx == alias_idx, |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
779 |
"Following memory nodes should have new memory input or be on the same memory slice"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
780 |
} else if (use->is_Phi()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
781 |
// Phi nodes should be split and moved already. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
782 |
tp = use->as_Phi()->adr_type()->isa_ptr(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
783 |
assert(tp != NULL, "ptr type"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
784 |
int idx = C->get_alias_index(tp); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
785 |
assert(idx == alias_idx, "Following Phi nodes should be on the same memory slice"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
786 |
} else { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
787 |
use->dump(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
788 |
assert(false, "should not be here"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
789 |
#endif |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
790 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
791 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
792 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
793 |
|
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
794 |
// |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
795 |
// Search memory chain of "mem" to find a MemNode whose address |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
796 |
// is the specified alias index. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
797 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
798 |
Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArray<PhiNode *> &orig_phis, PhaseGVN *phase) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
799 |
if (orig_mem == NULL) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
800 |
return orig_mem; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
801 |
Compile* C = phase->C; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
802 |
const TypeOopPtr *tinst = C->get_adr_type(alias_idx)->isa_oopptr(); |
769 | 803 |
bool is_instance = (tinst != NULL) && tinst->is_known_instance(); |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
804 |
Node *start_mem = C->start()->proj_out(TypeFunc::Memory); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
805 |
Node *prev = NULL; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
806 |
Node *result = orig_mem; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
807 |
while (prev != result) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
808 |
prev = result; |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
809 |
if (result == start_mem) |
2131 | 810 |
break; // hit one of our sentinels |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
811 |
if (result->is_Mem()) { |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
812 |
const Type *at = phase->type(result->in(MemNode::Address)); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
813 |
if (at != Type::TOP) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
814 |
assert (at->isa_ptr() != NULL, "pointer type required."); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
815 |
int idx = C->get_alias_index(at->is_ptr()); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
816 |
if (idx == alias_idx) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
817 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
818 |
} |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
819 |
result = result->in(MemNode::Memory); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
820 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
821 |
if (!is_instance) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
822 |
continue; // don't search further for non-instance types |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
823 |
// skip over a call which does not affect this memory slice |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
824 |
if (result->is_Proj() && result->as_Proj()->_con == TypeFunc::Memory) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
825 |
Node *proj_in = result->in(0); |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
826 |
if (proj_in->is_Allocate() && proj_in->_idx == (uint)tinst->instance_id()) { |
2131 | 827 |
break; // hit one of our sentinels |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
828 |
} else if (proj_in->is_Call()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
829 |
CallNode *call = proj_in->as_Call(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
830 |
if (!call->may_modify(tinst, phase)) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
831 |
result = call->in(TypeFunc::Memory); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
832 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
833 |
} else if (proj_in->is_Initialize()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
834 |
AllocateNode* alloc = proj_in->as_Initialize()->allocation(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
835 |
// Stop if this is the initialization for the object instance which |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
836 |
// which contains this memory slice, otherwise skip over it. |
769 | 837 |
if (alloc == NULL || alloc->_idx != (uint)tinst->instance_id()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
838 |
result = proj_in->in(TypeFunc::Memory); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
839 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
840 |
} else if (proj_in->is_MemBar()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
841 |
result = proj_in->in(TypeFunc::Memory); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
842 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
843 |
} else if (result->is_MergeMem()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
844 |
MergeMemNode *mmem = result->as_MergeMem(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
845 |
result = step_through_mergemem(mmem, alias_idx, tinst); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
846 |
if (result == mmem->base_memory()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
847 |
// Didn't find instance memory, search through general slice recursively. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
848 |
result = mmem->memory_at(C->get_general_index(alias_idx)); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
849 |
result = find_inst_mem(result, alias_idx, orig_phis, phase); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
850 |
if (C->failing()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
851 |
return NULL; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
852 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
853 |
mmem->set_memory_at(alias_idx, result); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
854 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
855 |
} else if (result->is_Phi() && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
856 |
C->get_alias_index(result->as_Phi()->adr_type()) != alias_idx) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
857 |
Node *un = result->as_Phi()->unique_input(phase); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
858 |
if (un != NULL) { |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
859 |
orig_phis.append_if_missing(result->as_Phi()); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
860 |
result = un; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
861 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
862 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
863 |
} |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
864 |
} else if (result->is_ClearArray()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
865 |
if (!ClearArrayNode::step_through(&result, (uint)tinst->instance_id(), phase)) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
866 |
// Can not bypass initialization of the instance |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
867 |
// we are looking for. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
868 |
break; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
869 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
870 |
// Otherwise skip it (the call updated 'result' value). |
2110
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
871 |
} else if (result->Opcode() == Op_SCMemProj) { |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
872 |
assert(result->in(0)->is_LoadStore(), "sanity"); |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
873 |
const Type *at = phase->type(result->in(0)->in(MemNode::Address)); |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
874 |
if (at != Type::TOP) { |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
875 |
assert (at->isa_ptr() != NULL, "pointer type required."); |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
876 |
int idx = C->get_alias_index(at->is_ptr()); |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
877 |
assert(idx != alias_idx, "Object is not scalar replaceable if a LoadStore node access its field"); |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
878 |
break; |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
879 |
} |
40e42c95ac39
6802499: EA: assert(false,"unknown node on this path")
kvn
parents:
1613
diff
changeset
|
880 |
result = result->in(0)->in(MemNode::Memory); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
881 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
882 |
} |
955 | 883 |
if (result->is_Phi()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
884 |
PhiNode *mphi = result->as_Phi(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
885 |
assert(mphi->bottom_type() == Type::MEMORY, "memory phi required"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
886 |
const TypePtr *t = mphi->adr_type(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
887 |
if (C->get_alias_index(t) != alias_idx) { |
955 | 888 |
// Create a new Phi with the specified alias index type. |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
889 |
result = split_memory_phi(mphi, alias_idx, orig_phis, phase); |
955 | 890 |
} else if (!is_instance) { |
891 |
// Push all non-instance Phis on the orig_phis worklist to update inputs |
|
892 |
// during Phase 4 if needed. |
|
893 |
orig_phis.append_if_missing(mphi); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
894 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
895 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
896 |
// the result is either MemNode, PhiNode, InitializeNode. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
897 |
return result; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
898 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
899 |
|
1 | 900 |
// |
901 |
// Convert the types of unescaped object to instance types where possible, |
|
902 |
// propagate the new type information through the graph, and update memory |
|
903 |
// edges and MergeMem inputs to reflect the new type. |
|
904 |
// |
|
905 |
// We start with allocations (and calls which may be allocations) on alloc_worklist. |
|
906 |
// The processing is done in 4 phases: |
|
907 |
// |
|
908 |
// Phase 1: Process possible allocations from alloc_worklist. Create instance |
|
909 |
// types for the CheckCastPP for allocations where possible. |
|
910 |
// Propagate the the new types through users as follows: |
|
911 |
// casts and Phi: push users on alloc_worklist |
|
912 |
// AddP: cast Base and Address inputs to the instance type |
|
913 |
// push any AddP users on alloc_worklist and push any memnode |
|
914 |
// users onto memnode_worklist. |
|
915 |
// Phase 2: Process MemNode's from memnode_worklist. compute new address type and |
|
916 |
// search the Memory chain for a store with the appropriate type |
|
917 |
// address type. If a Phi is found, create a new version with |
|
2131 | 918 |
// the appropriate memory slices from each of the Phi inputs. |
1 | 919 |
// For stores, process the users as follows: |
920 |
// MemNode: push on memnode_worklist |
|
921 |
// MergeMem: push on mergemem_worklist |
|
922 |
// Phase 3: Process MergeMem nodes from mergemem_worklist. Walk each memory slice |
|
923 |
// moving the first node encountered of each instance type to the |
|
924 |
// the input corresponding to its alias index. |
|
925 |
// appropriate memory slice. |
|
926 |
// Phase 4: Update the inputs of non-instance memory Phis and the Memory input of memnodes. |
|
927 |
// |
|
928 |
// In the following example, the CheckCastPP nodes are the cast of allocation |
|
929 |
// results and the allocation of node 29 is unescaped and eligible to be an |
|
930 |
// instance type. |
|
931 |
// |
|
932 |
// We start with: |
|
933 |
// |
|
934 |
// 7 Parm #memory |
|
935 |
// 10 ConI "12" |
|
936 |
// 19 CheckCastPP "Foo" |
|
937 |
// 20 AddP _ 19 19 10 Foo+12 alias_index=4 |
|
938 |
// 29 CheckCastPP "Foo" |
|
939 |
// 30 AddP _ 29 29 10 Foo+12 alias_index=4 |
|
940 |
// |
|
941 |
// 40 StoreP 25 7 20 ... alias_index=4 |
|
942 |
// 50 StoreP 35 40 30 ... alias_index=4 |
|
943 |
// 60 StoreP 45 50 20 ... alias_index=4 |
|
944 |
// 70 LoadP _ 60 30 ... alias_index=4 |
|
945 |
// 80 Phi 75 50 60 Memory alias_index=4 |
|
946 |
// 90 LoadP _ 80 30 ... alias_index=4 |
|
947 |
// 100 LoadP _ 80 20 ... alias_index=4 |
|
948 |
// |
|
949 |
// |
|
950 |
// Phase 1 creates an instance type for node 29 assigning it an instance id of 24 |
|
951 |
// and creating a new alias index for node 30. This gives: |
|
952 |
// |
|
953 |
// 7 Parm #memory |
|
954 |
// 10 ConI "12" |
|
955 |
// 19 CheckCastPP "Foo" |
|
956 |
// 20 AddP _ 19 19 10 Foo+12 alias_index=4 |
|
957 |
// 29 CheckCastPP "Foo" iid=24 |
|
958 |
// 30 AddP _ 29 29 10 Foo+12 alias_index=6 iid=24 |
|
959 |
// |
|
960 |
// 40 StoreP 25 7 20 ... alias_index=4 |
|
961 |
// 50 StoreP 35 40 30 ... alias_index=6 |
|
962 |
// 60 StoreP 45 50 20 ... alias_index=4 |
|
963 |
// 70 LoadP _ 60 30 ... alias_index=6 |
|
964 |
// 80 Phi 75 50 60 Memory alias_index=4 |
|
965 |
// 90 LoadP _ 80 30 ... alias_index=6 |
|
966 |
// 100 LoadP _ 80 20 ... alias_index=4 |
|
967 |
// |
|
968 |
// In phase 2, new memory inputs are computed for the loads and stores, |
|
969 |
// And a new version of the phi is created. In phase 4, the inputs to |
|
970 |
// node 80 are updated and then the memory nodes are updated with the |
|
971 |
// values computed in phase 2. This results in: |
|
972 |
// |
|
973 |
// 7 Parm #memory |
|
974 |
// 10 ConI "12" |
|
975 |
// 19 CheckCastPP "Foo" |
|
976 |
// 20 AddP _ 19 19 10 Foo+12 alias_index=4 |
|
977 |
// 29 CheckCastPP "Foo" iid=24 |
|
978 |
// 30 AddP _ 29 29 10 Foo+12 alias_index=6 iid=24 |
|
979 |
// |
|
980 |
// 40 StoreP 25 7 20 ... alias_index=4 |
|
981 |
// 50 StoreP 35 7 30 ... alias_index=6 |
|
982 |
// 60 StoreP 45 40 20 ... alias_index=4 |
|
983 |
// 70 LoadP _ 50 30 ... alias_index=6 |
|
984 |
// 80 Phi 75 40 60 Memory alias_index=4 |
|
985 |
// 120 Phi 75 50 50 Memory alias_index=6 |
|
986 |
// 90 LoadP _ 120 30 ... alias_index=6 |
|
987 |
// 100 LoadP _ 80 20 ... alias_index=4 |
|
988 |
// |
|
989 |
void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist) { |
|
990 |
GrowableArray<Node *> memnode_worklist; |
|
991 |
GrowableArray<PhiNode *> orig_phis; |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
992 |
|
1 | 993 |
PhaseGVN *igvn = _compile->initial_gvn(); |
994 |
uint new_index_start = (uint) _compile->num_alias_types(); |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
995 |
Arena* arena = Thread::current()->resource_area(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
996 |
VectorSet visited(arena); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
997 |
VectorSet ptset(arena); |
1 | 998 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
999 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1000 |
// Phase 1: Process possible allocations from alloc_worklist. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1001 |
// Create instance types for the CheckCastPP for allocations where possible. |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1002 |
// |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1003 |
// (Note: don't forget to change the order of the second AddP node on |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1004 |
// the alloc_worklist if the order of the worklist processing is changed, |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1005 |
// see the comment in find_second_addp().) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1006 |
// |
1 | 1007 |
while (alloc_worklist.length() != 0) { |
1008 |
Node *n = alloc_worklist.pop(); |
|
1009 |
uint ni = n->_idx; |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1010 |
const TypeOopPtr* tinst = NULL; |
1 | 1011 |
if (n->is_Call()) { |
1012 |
CallNode *alloc = n->as_Call(); |
|
1013 |
// copy escape information to call node |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1014 |
PointsToNode* ptn = ptnode_adr(alloc->_idx); |
1 | 1015 |
PointsToNode::EscapeState es = escape_state(alloc, igvn); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1016 |
// We have an allocation or call which returns a Java object, |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1017 |
// see if it is unescaped. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1018 |
if (es != PointsToNode::NoEscape || !ptn->_scalar_replaceable) |
1 | 1019 |
continue; |
2871
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1020 |
|
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1021 |
// Find CheckCastPP for the allocate or for the return value of a call |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1022 |
n = alloc->result_cast(); |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1023 |
if (n == NULL) { // No uses except Initialize node |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1024 |
if (alloc->is_Allocate()) { |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1025 |
// Set the scalar_replaceable flag for allocation |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1026 |
// so it could be eliminated if it has no uses. |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1027 |
alloc->as_Allocate()->_is_scalar_replaceable = true; |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1028 |
} |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1029 |
continue; |
212
cd4963e67949
6667612: (Escape Analysis) disable loop cloning if it has a scalar replaceable allocation
kvn
parents:
211
diff
changeset
|
1030 |
} |
2871
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1031 |
if (!n->is_CheckCastPP()) { // not unique CheckCastPP. |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1032 |
assert(!alloc->is_Allocate(), "allocation should have unique type"); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1033 |
continue; |
2871
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1034 |
} |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1035 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1036 |
// The inline code for Object.clone() casts the allocation result to |
955 | 1037 |
// java.lang.Object and then to the actual type of the allocated |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1038 |
// object. Detect this case and use the second cast. |
955 | 1039 |
// Also detect j.l.reflect.Array.newInstance(jobject, jint) case when |
1040 |
// the allocation result is cast to java.lang.Object and then |
|
1041 |
// to the actual Array type. |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1042 |
if (alloc->is_Allocate() && n->as_Type()->type() == TypeInstPtr::NOTNULL |
955 | 1043 |
&& (alloc->is_AllocateArray() || |
1044 |
igvn->type(alloc->in(AllocateNode::KlassNode)) != TypeKlassPtr::OBJECT)) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1045 |
Node *cast2 = NULL; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1046 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1047 |
Node *use = n->fast_out(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1048 |
if (use->is_CheckCastPP()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1049 |
cast2 = use; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1050 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1051 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1052 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1053 |
if (cast2 != NULL) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1054 |
n = cast2; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1055 |
} else { |
2871
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1056 |
// Non-scalar replaceable if the allocation type is unknown statically |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1057 |
// (reflection allocation), the object can't be restored during |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1058 |
// deoptimization without precise type. |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1059 |
continue; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1060 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1061 |
} |
2871
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1062 |
if (alloc->is_Allocate()) { |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1063 |
// Set the scalar_replaceable flag for allocation |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1064 |
// so it could be eliminated. |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1065 |
alloc->as_Allocate()->_is_scalar_replaceable = true; |
519e22b6900d
6836054: java/util/Arrays/CopyMethods.java fails on solaris-sparc with IllegalArgumentException
kvn
parents:
2131
diff
changeset
|
1066 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1067 |
set_escape_state(n->_idx, es); |
955 | 1068 |
// in order for an object to be scalar-replaceable, it must be: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1069 |
// - a direct allocation (not a call returning an object) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1070 |
// - non-escaping |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1071 |
// - eligible to be a unique type |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1072 |
// - not determined to be ineligible by escape analysis |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1073 |
assert(ptnode_adr(alloc->_idx)->_node != NULL && |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1074 |
ptnode_adr(n->_idx)->_node != NULL, "should be registered"); |
1 | 1075 |
set_map(alloc->_idx, n); |
1076 |
set_map(n->_idx, alloc); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1077 |
const TypeOopPtr *t = igvn->type(n)->isa_oopptr(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1078 |
if (t == NULL) |
1 | 1079 |
continue; // not a TypeInstPtr |
955 | 1080 |
tinst = t->cast_to_exactness(true)->is_oopptr()->cast_to_instance_id(ni); |
1 | 1081 |
igvn->hash_delete(n); |
1082 |
igvn->set_type(n, tinst); |
|
1083 |
n->raise_bottom_type(tinst); |
|
1084 |
igvn->hash_insert(n); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1085 |
record_for_optimizer(n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1086 |
if (alloc->is_Allocate() && ptn->_scalar_replaceable && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1087 |
(t->isa_instptr() || t->isa_aryptr())) { |
589 | 1088 |
|
1089 |
// First, put on the worklist all Field edges from Connection Graph |
|
1090 |
// which is more accurate then putting immediate users from Ideal Graph. |
|
1091 |
for (uint e = 0; e < ptn->edge_count(); e++) { |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1092 |
Node *use = ptnode_adr(ptn->edge_target(e))->_node; |
589 | 1093 |
assert(ptn->edge_type(e) == PointsToNode::FieldEdge && use->is_AddP(), |
1094 |
"only AddP nodes are Field edges in CG"); |
|
1095 |
if (use->outcnt() > 0) { // Don't process dead nodes |
|
1096 |
Node* addp2 = find_second_addp(use, use->in(AddPNode::Base)); |
|
1097 |
if (addp2 != NULL) { |
|
1098 |
assert(alloc->is_AllocateArray(),"array allocation was expected"); |
|
1099 |
alloc_worklist.append_if_missing(addp2); |
|
1100 |
} |
|
1101 |
alloc_worklist.append_if_missing(use); |
|
1102 |
} |
|
1103 |
} |
|
1104 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1105 |
// An allocation may have an Initialize which has raw stores. Scan |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1106 |
// the users of the raw allocation result and push AddP users |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1107 |
// on alloc_worklist. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1108 |
Node *raw_result = alloc->proj_out(TypeFunc::Parms); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1109 |
assert (raw_result != NULL, "must have an allocation result"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1110 |
for (DUIterator_Fast imax, i = raw_result->fast_outs(imax); i < imax; i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1111 |
Node *use = raw_result->fast_out(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1112 |
if (use->is_AddP() && use->outcnt() > 0) { // Don't process dead nodes |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1113 |
Node* addp2 = find_second_addp(use, raw_result); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1114 |
if (addp2 != NULL) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1115 |
assert(alloc->is_AllocateArray(),"array allocation was expected"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1116 |
alloc_worklist.append_if_missing(addp2); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1117 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1118 |
alloc_worklist.append_if_missing(use); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1119 |
} else if (use->is_MemBar()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1120 |
memnode_worklist.append_if_missing(use); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1121 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1122 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1123 |
} |
1 | 1124 |
} else if (n->is_AddP()) { |
1125 |
ptset.Clear(); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1126 |
PointsTo(ptset, get_addp_base(n), igvn); |
1 | 1127 |
assert(ptset.Size() == 1, "AddP address is unique"); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1128 |
uint elem = ptset.getelem(); // Allocation node's index |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1129 |
if (elem == _phantom_object) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1130 |
assert(false, "escaped allocation"); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1131 |
continue; // Assume the value was set outside this method. |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1132 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1133 |
Node *base = get_map(elem); // CheckCastPP node |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1134 |
if (!split_AddP(n, base, igvn)) continue; // wrong type from dead path |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1135 |
tinst = igvn->type(base)->isa_oopptr(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1136 |
} else if (n->is_Phi() || |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1137 |
n->is_CheckCastPP() || |
594
9f4474e5dbaf
6705887: Compressed Oops: generate x64 addressing and implicit null checks with narrow oops
kvn
parents:
590
diff
changeset
|
1138 |
n->is_EncodeP() || |
9f4474e5dbaf
6705887: Compressed Oops: generate x64 addressing and implicit null checks with narrow oops
kvn
parents:
590
diff
changeset
|
1139 |
n->is_DecodeN() || |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1140 |
(n->is_ConstraintCast() && n->Opcode() == Op_CastPP)) { |
1 | 1141 |
if (visited.test_set(n->_idx)) { |
1142 |
assert(n->is_Phi(), "loops only through Phi's"); |
|
1143 |
continue; // already processed |
|
1144 |
} |
|
1145 |
ptset.Clear(); |
|
1146 |
PointsTo(ptset, n, igvn); |
|
1147 |
if (ptset.Size() == 1) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1148 |
uint elem = ptset.getelem(); // Allocation node's index |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1149 |
if (elem == _phantom_object) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1150 |
assert(false, "escaped allocation"); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1151 |
continue; // Assume the value was set outside this method. |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1152 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1153 |
Node *val = get_map(elem); // CheckCastPP node |
1 | 1154 |
TypeNode *tn = n->as_Type(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1155 |
tinst = igvn->type(val)->isa_oopptr(); |
769 | 1156 |
assert(tinst != NULL && tinst->is_known_instance() && |
1157 |
(uint)tinst->instance_id() == elem , "instance type expected."); |
|
589 | 1158 |
|
1159 |
const Type *tn_type = igvn->type(tn); |
|
769 | 1160 |
const TypeOopPtr *tn_t; |
1161 |
if (tn_type->isa_narrowoop()) { |
|
1162 |
tn_t = tn_type->make_ptr()->isa_oopptr(); |
|
1163 |
} else { |
|
1164 |
tn_t = tn_type->isa_oopptr(); |
|
1165 |
} |
|
1 | 1166 |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1167 |
if (tn_t != NULL && tinst->klass()->is_subtype_of(tn_t->klass())) { |
589 | 1168 |
if (tn_type->isa_narrowoop()) { |
1169 |
tn_type = tinst->make_narrowoop(); |
|
1170 |
} else { |
|
1171 |
tn_type = tinst; |
|
1172 |
} |
|
1 | 1173 |
igvn->hash_delete(tn); |
589 | 1174 |
igvn->set_type(tn, tn_type); |
1175 |
tn->set_type(tn_type); |
|
1 | 1176 |
igvn->hash_insert(tn); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1177 |
record_for_optimizer(n); |
1055
f4fb9fb08038
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
kvn
parents:
961
diff
changeset
|
1178 |
} else { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1179 |
assert(tn_type == TypePtr::NULL_PTR || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1180 |
tn_t != NULL && !tinst->klass()->is_subtype_of(tn_t->klass()), |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1181 |
"unexpected type"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1182 |
continue; // Skip dead path with different type |
1 | 1183 |
} |
1184 |
} |
|
1185 |
} else { |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1186 |
debug_only(n->dump();) |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1187 |
assert(false, "EA: unexpected node"); |
1 | 1188 |
continue; |
1189 |
} |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1190 |
// push allocation's users on appropriate worklist |
1 | 1191 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
1192 |
Node *use = n->fast_out(i); |
|
1193 |
if(use->is_Mem() && use->in(MemNode::Address) == n) { |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1194 |
// Load/store to instance's field |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1195 |
memnode_worklist.append_if_missing(use); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1196 |
} else if (use->is_MemBar()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1197 |
memnode_worklist.append_if_missing(use); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1198 |
} else if (use->is_AddP() && use->outcnt() > 0) { // No dead nodes |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1199 |
Node* addp2 = find_second_addp(use, n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1200 |
if (addp2 != NULL) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1201 |
alloc_worklist.append_if_missing(addp2); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1202 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1203 |
alloc_worklist.append_if_missing(use); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1204 |
} else if (use->is_Phi() || |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1205 |
use->is_CheckCastPP() || |
594
9f4474e5dbaf
6705887: Compressed Oops: generate x64 addressing and implicit null checks with narrow oops
kvn
parents:
590
diff
changeset
|
1206 |
use->is_EncodeP() || |
9f4474e5dbaf
6705887: Compressed Oops: generate x64 addressing and implicit null checks with narrow oops
kvn
parents:
590
diff
changeset
|
1207 |
use->is_DecodeN() || |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1208 |
(use->is_ConstraintCast() && use->Opcode() == Op_CastPP)) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1209 |
alloc_worklist.append_if_missing(use); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1210 |
#ifdef ASSERT |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1211 |
} else if (use->is_Mem()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1212 |
assert(use->in(MemNode::Address) != n, "EA: missing allocation reference path"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1213 |
} else if (use->is_MergeMem()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1214 |
assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1215 |
} else if (use->is_SafePoint()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1216 |
// Look for MergeMem nodes for calls which reference unique allocation |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1217 |
// (through CheckCastPP nodes) even for debug info. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1218 |
Node* m = use->in(TypeFunc::Memory); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1219 |
if (m->is_MergeMem()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1220 |
assert(_mergemem_worklist.contains(m->as_MergeMem()), "EA: missing MergeMem node in the worklist"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1221 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1222 |
} else { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1223 |
uint op = use->Opcode(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1224 |
if (!(op == Op_CmpP || op == Op_Conv2B || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1225 |
op == Op_CastP2X || op == Op_StoreCM || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1226 |
op == Op_FastLock || op == Op_AryEq || op == Op_StrComp || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1227 |
op == Op_StrEquals || op == Op_StrIndexOf)) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1228 |
n->dump(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1229 |
use->dump(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1230 |
assert(false, "EA: missing allocation reference path"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1231 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1232 |
#endif |
1 | 1233 |
} |
1234 |
} |
|
1235 |
||
1236 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1237 |
// New alias types were created in split_AddP(). |
1 | 1238 |
uint new_index_end = (uint) _compile->num_alias_types(); |
1239 |
||
1240 |
// Phase 2: Process MemNode's from memnode_worklist. compute new address type and |
|
1241 |
// compute new values for Memory inputs (the Memory inputs are not |
|
1242 |
// actually updated until phase 4.) |
|
1243 |
if (memnode_worklist.length() == 0) |
|
1244 |
return; // nothing to do |
|
1245 |
||
1246 |
while (memnode_worklist.length() != 0) { |
|
1247 |
Node *n = memnode_worklist.pop(); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1248 |
if (visited.test_set(n->_idx)) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1249 |
continue; |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1250 |
if (n->is_Phi() || n->is_ClearArray()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1251 |
// we don't need to do anything, but the users must be pushed |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1252 |
} else if (n->is_MemBar()) { // Initialize, MemBar nodes |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1253 |
// we don't need to do anything, but the users must be pushed |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1254 |
n = n->as_MemBar()->proj_out(TypeFunc::Memory); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1255 |
if (n == NULL) |
1 | 1256 |
continue; |
1257 |
} else { |
|
1258 |
assert(n->is_Mem(), "memory node required."); |
|
1259 |
Node *addr = n->in(MemNode::Address); |
|
1260 |
const Type *addr_t = igvn->type(addr); |
|
1261 |
if (addr_t == Type::TOP) |
|
1262 |
continue; |
|
1263 |
assert (addr_t->isa_ptr() != NULL, "pointer type required."); |
|
1264 |
int alias_idx = _compile->get_alias_index(addr_t->is_ptr()); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1265 |
assert ((uint)alias_idx < new_index_end, "wrong alias index"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1266 |
Node *mem = find_inst_mem(n->in(MemNode::Memory), alias_idx, orig_phis, igvn); |
211
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
1267 |
if (_compile->failing()) { |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
1268 |
return; |
e2b60448c234
6667610: (Escape Analysis) retry compilation without EA if it fails
kvn
parents:
1
diff
changeset
|
1269 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1270 |
if (mem != n->in(MemNode::Memory)) { |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1271 |
// We delay the memory edge update since we need old one in |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1272 |
// MergeMem code below when instances memory slices are separated. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1273 |
debug_only(Node* pn = ptnode_adr(n->_idx)->_node;) |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1274 |
assert(pn == NULL || pn == n, "wrong node"); |
1 | 1275 |
set_map(n->_idx, mem); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1276 |
ptnode_adr(n->_idx)->_node = n; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1277 |
} |
1 | 1278 |
if (n->is_Load()) { |
1279 |
continue; // don't push users |
|
1280 |
} else if (n->is_LoadStore()) { |
|
1281 |
// get the memory projection |
|
1282 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
|
1283 |
Node *use = n->fast_out(i); |
|
1284 |
if (use->Opcode() == Op_SCMemProj) { |
|
1285 |
n = use; |
|
1286 |
break; |
|
1287 |
} |
|
1288 |
} |
|
1289 |
assert(n->Opcode() == Op_SCMemProj, "memory projection required"); |
|
1290 |
} |
|
1291 |
} |
|
1292 |
// push user on appropriate worklist |
|
1293 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
|
1294 |
Node *use = n->fast_out(i); |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1295 |
if (use->is_Phi() || use->is_ClearArray()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1296 |
memnode_worklist.append_if_missing(use); |
1 | 1297 |
} else if(use->is_Mem() && use->in(MemNode::Memory) == n) { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1298 |
if (use->Opcode() == Op_StoreCM) // Ignore cardmark stores |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1299 |
continue; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1300 |
memnode_worklist.append_if_missing(use); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1301 |
} else if (use->is_MemBar()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1302 |
memnode_worklist.append_if_missing(use); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1303 |
#ifdef ASSERT |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1304 |
} else if(use->is_Mem()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1305 |
assert(use->in(MemNode::Memory) != n, "EA: missing memory path"); |
1 | 1306 |
} else if (use->is_MergeMem()) { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1307 |
assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1308 |
} else { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1309 |
uint op = use->Opcode(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1310 |
if (!(op == Op_StoreCM || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1311 |
(op == Op_CallLeaf && use->as_CallLeaf()->_name != NULL && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1312 |
strcmp(use->as_CallLeaf()->_name, "g1_wb_pre") == 0) || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1313 |
op == Op_AryEq || op == Op_StrComp || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1314 |
op == Op_StrEquals || op == Op_StrIndexOf)) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1315 |
n->dump(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1316 |
use->dump(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1317 |
assert(false, "EA: missing memory path"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1318 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1319 |
#endif |
1 | 1320 |
} |
1321 |
} |
|
1322 |
} |
|
1323 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1324 |
// Phase 3: Process MergeMem nodes from mergemem_worklist. |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1325 |
// Walk each memory slice moving the first node encountered of each |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1326 |
// instance type to the the input corresponding to its alias index. |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1327 |
uint length = _mergemem_worklist.length(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1328 |
for( uint next = 0; next < length; ++next ) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1329 |
MergeMemNode* nmm = _mergemem_worklist.at(next); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1330 |
assert(!visited.test_set(nmm->_idx), "should not be visited before"); |
1 | 1331 |
// Note: we don't want to use MergeMemStream here because we only want to |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1332 |
// scan inputs which exist at the start, not ones we add during processing. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1333 |
// Note 2: MergeMem may already contains instance memory slices added |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1334 |
// during find_inst_mem() call when memory nodes were processed above. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1335 |
igvn->hash_delete(nmm); |
1 | 1336 |
uint nslices = nmm->req(); |
1337 |
for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1338 |
Node* mem = nmm->in(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1339 |
Node* cur = NULL; |
1 | 1340 |
if (mem == NULL || mem->is_top()) |
1341 |
continue; |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1342 |
// First, update mergemem by moving memory nodes to corresponding slices |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1343 |
// if their type became more precise since this mergemem was created. |
1 | 1344 |
while (mem->is_Mem()) { |
1345 |
const Type *at = igvn->type(mem->in(MemNode::Address)); |
|
1346 |
if (at != Type::TOP) { |
|
1347 |
assert (at->isa_ptr() != NULL, "pointer type required."); |
|
1348 |
uint idx = (uint)_compile->get_alias_index(at->is_ptr()); |
|
1349 |
if (idx == i) { |
|
1350 |
if (cur == NULL) |
|
1351 |
cur = mem; |
|
1352 |
} else { |
|
1353 |
if (idx >= nmm->req() || nmm->is_empty_memory(nmm->in(idx))) { |
|
1354 |
nmm->set_memory_at(idx, mem); |
|
1355 |
} |
|
1356 |
} |
|
1357 |
} |
|
1358 |
mem = mem->in(MemNode::Memory); |
|
1359 |
} |
|
1360 |
nmm->set_memory_at(i, (cur != NULL) ? cur : mem); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1361 |
// Find any instance of the current type if we haven't encountered |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1362 |
// already a memory slice of the instance along the memory chain. |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1363 |
for (uint ni = new_index_start; ni < new_index_end; ni++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1364 |
if((uint)_compile->get_general_index(ni) == i) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1365 |
Node *m = (ni >= nmm->req()) ? nmm->empty_memory() : nmm->in(ni); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1366 |
if (nmm->is_empty_memory(m)) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1367 |
Node* result = find_inst_mem(mem, ni, orig_phis, igvn); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1368 |
if (_compile->failing()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1369 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1370 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1371 |
nmm->set_memory_at(ni, result); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1372 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1373 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1374 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1375 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1376 |
// Find the rest of instances values |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1377 |
for (uint ni = new_index_start; ni < new_index_end; ni++) { |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1378 |
const TypeOopPtr *tinst = _compile->get_adr_type(ni)->isa_oopptr(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1379 |
Node* result = step_through_mergemem(nmm, ni, tinst); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1380 |
if (result == nmm->base_memory()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1381 |
// Didn't find instance memory, search through general slice recursively. |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1382 |
result = nmm->memory_at(_compile->get_general_index(ni)); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1383 |
result = find_inst_mem(result, ni, orig_phis, igvn); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1384 |
if (_compile->failing()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1385 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1386 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1387 |
nmm->set_memory_at(ni, result); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1388 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1389 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1390 |
igvn->hash_insert(nmm); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1391 |
record_for_optimizer(nmm); |
1 | 1392 |
} |
1393 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1394 |
// Phase 4: Update the inputs of non-instance memory Phis and |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1395 |
// the Memory input of memnodes |
1 | 1396 |
// First update the inputs of any non-instance Phi's from |
1397 |
// which we split out an instance Phi. Note we don't have |
|
1398 |
// to recursively process Phi's encounted on the input memory |
|
1399 |
// chains as is done in split_memory_phi() since they will |
|
1400 |
// also be processed here. |
|
955 | 1401 |
for (int j = 0; j < orig_phis.length(); j++) { |
1402 |
PhiNode *phi = orig_phis.at(j); |
|
1 | 1403 |
int alias_idx = _compile->get_alias_index(phi->adr_type()); |
1404 |
igvn->hash_delete(phi); |
|
1405 |
for (uint i = 1; i < phi->req(); i++) { |
|
1406 |
Node *mem = phi->in(i); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1407 |
Node *new_mem = find_inst_mem(mem, alias_idx, orig_phis, igvn); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1408 |
if (_compile->failing()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1409 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1410 |
} |
1 | 1411 |
if (mem != new_mem) { |
1412 |
phi->set_req(i, new_mem); |
|
1413 |
} |
|
1414 |
} |
|
1415 |
igvn->hash_insert(phi); |
|
1416 |
record_for_optimizer(phi); |
|
1417 |
} |
|
1418 |
||
1419 |
// Update the memory inputs of MemNodes with the value we computed |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1420 |
// in Phase 2 and move stores memory users to corresponding memory slices. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1421 |
#ifdef ASSERT |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1422 |
visited.Clear(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1423 |
Node_Stack old_mems(arena, _compile->unique() >> 2); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1424 |
#endif |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1425 |
for (uint i = 0; i < nodes_size(); i++) { |
1 | 1426 |
Node *nmem = get_map(i); |
1427 |
if (nmem != NULL) { |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1428 |
Node *n = ptnode_adr(i)->_node; |
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1429 |
assert(n != NULL, "sanity"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1430 |
if (n->is_Mem()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1431 |
#ifdef ASSERT |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1432 |
Node* old_mem = n->in(MemNode::Memory); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1433 |
if (!visited.test_set(old_mem->_idx)) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1434 |
old_mems.push(old_mem, old_mem->outcnt()); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1435 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1436 |
#endif |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1437 |
assert(n->in(MemNode::Memory) != nmem, "sanity"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1438 |
if (!n->is_Load()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1439 |
// Move memory users of a store first. |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1440 |
move_inst_mem(n, orig_phis, igvn); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1441 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1442 |
// Now update memory input |
1 | 1443 |
igvn->hash_delete(n); |
1444 |
n->set_req(MemNode::Memory, nmem); |
|
1445 |
igvn->hash_insert(n); |
|
1446 |
record_for_optimizer(n); |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1447 |
} else { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1448 |
assert(n->is_Allocate() || n->is_CheckCastPP() || |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1449 |
n->is_AddP() || n->is_Phi(), "unknown node used for set_map()"); |
1 | 1450 |
} |
1451 |
} |
|
1452 |
} |
|
4471
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1453 |
#ifdef ASSERT |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1454 |
// Verify that memory was split correctly |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1455 |
while (old_mems.is_nonempty()) { |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1456 |
Node* old_mem = old_mems.node(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1457 |
uint old_cnt = old_mems.index(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1458 |
old_mems.pop(); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1459 |
assert(old_cnt = old_mem->outcnt(), "old mem could be lost"); |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1460 |
} |
78c7cc2ae5dd
6896727: nsk/logging/LoggingPermission/LoggingPermission/logperm002 fails with G1, EscapeAnalisys
kvn
parents:
4470
diff
changeset
|
1461 |
#endif |
1 | 1462 |
} |
1463 |
||
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1464 |
bool ConnectionGraph::has_candidates(Compile *C) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1465 |
// EA brings benefits only when the code has allocations and/or locks which |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1466 |
// are represented by ideal Macro nodes. |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1467 |
int cnt = C->macro_count(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1468 |
for( int i=0; i < cnt; i++ ) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1469 |
Node *n = C->macro_node(i); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1470 |
if ( n->is_Allocate() ) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1471 |
return true; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1472 |
if( n->is_Lock() ) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1473 |
Node* obj = n->as_Lock()->obj_node()->uncast(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1474 |
if( !(obj->is_Parm() || obj->is_Con()) ) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1475 |
return true; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1476 |
} |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1477 |
} |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1478 |
return false; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1479 |
} |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1480 |
|
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1481 |
bool ConnectionGraph::compute_escape() { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1482 |
Compile* C = _compile; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1483 |
|
589 | 1484 |
// 1. Populate Connection Graph (CG) with Ideal nodes. |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1485 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1486 |
Unique_Node_List worklist_init; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1487 |
worklist_init.map(C->unique(), NULL); // preallocate space |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1488 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1489 |
// Initialize worklist |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1490 |
if (C->root() != NULL) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1491 |
worklist_init.push(C->root()); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1492 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1493 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1494 |
GrowableArray<int> cg_worklist; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1495 |
PhaseGVN* igvn = C->initial_gvn(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1496 |
bool has_allocations = false; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1497 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1498 |
// Push all useful nodes onto CG list and set their type. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1499 |
for( uint next = 0; next < worklist_init.size(); ++next ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1500 |
Node* n = worklist_init.at(next); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1501 |
record_for_escape_analysis(n, igvn); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1502 |
// Only allocations and java static calls results are checked |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1503 |
// for an escape status. See process_call_result() below. |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1504 |
if (n->is_Allocate() || n->is_CallStaticJava() && |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1505 |
ptnode_adr(n->_idx)->node_type() == PointsToNode::JavaObject) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1506 |
has_allocations = true; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1507 |
} |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1508 |
if(n->is_AddP()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1509 |
// Collect address nodes which directly reference an allocation. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1510 |
// Use them during stage 3 below to build initial connection graph |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1511 |
// field edges. Other field edges could be added after StoreP/LoadP |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1512 |
// nodes are processed during stage 4 below. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1513 |
Node* base = get_addp_base(n); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1514 |
if(base->is_Proj() && base->in(0)->is_Allocate()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1515 |
cg_worklist.append(n->_idx); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1516 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1517 |
} else if (n->is_MergeMem()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1518 |
// Collect all MergeMem nodes to add memory slices for |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1519 |
// scalar replaceable objects in split_unique_types(). |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1520 |
_mergemem_worklist.append(n->as_MergeMem()); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1521 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1522 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1523 |
Node* m = n->fast_out(i); // Get user |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1524 |
worklist_init.push(m); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1525 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1526 |
} |
1 | 1527 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1528 |
if (!has_allocations) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1529 |
_collecting = false; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1530 |
return false; // Nothing to do. |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1531 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1532 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1533 |
// 2. First pass to create simple CG edges (doesn't require to walk CG). |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1534 |
uint delayed_size = _delayed_worklist.size(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1535 |
for( uint next = 0; next < delayed_size; ++next ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1536 |
Node* n = _delayed_worklist.at(next); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1537 |
build_connection_graph(n, igvn); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1538 |
} |
1 | 1539 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1540 |
// 3. Pass to create fields edges (Allocate -F-> AddP). |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1541 |
uint cg_length = cg_worklist.length(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1542 |
for( uint next = 0; next < cg_length; ++next ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1543 |
int ni = cg_worklist.at(next); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1544 |
build_connection_graph(ptnode_adr(ni)->_node, igvn); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1545 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1546 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1547 |
cg_worklist.clear(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1548 |
cg_worklist.append(_phantom_object); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1549 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1550 |
// 4. Build Connection Graph which need |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1551 |
// to walk the connection graph. |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1552 |
for (uint ni = 0; ni < nodes_size(); ni++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1553 |
PointsToNode* ptn = ptnode_adr(ni); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1554 |
Node *n = ptn->_node; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1555 |
if (n != NULL) { // Call, AddP, LoadP, StoreP |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1556 |
build_connection_graph(n, igvn); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1557 |
if (ptn->node_type() != PointsToNode::UnknownType) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1558 |
cg_worklist.append(n->_idx); // Collect CG nodes |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1559 |
} |
1 | 1560 |
} |
1561 |
||
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1562 |
Arena* arena = Thread::current()->resource_area(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1563 |
VectorSet ptset(arena); |
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
1564 |
GrowableArray<uint> deferred_edges; |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1565 |
VectorSet visited(arena); |
1 | 1566 |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1567 |
// 5. Remove deferred edges from the graph and adjust |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1568 |
// escape state of nonescaping objects. |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1569 |
cg_length = cg_worklist.length(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1570 |
for( uint next = 0; next < cg_length; ++next ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1571 |
int ni = cg_worklist.at(next); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1572 |
PointsToNode* ptn = ptnode_adr(ni); |
1 | 1573 |
PointsToNode::NodeType nt = ptn->node_type(); |
1574 |
if (nt == PointsToNode::LocalVar || nt == PointsToNode::Field) { |
|
348
905c4cbf5d6a
6681577: PIT: some VM tests fails with -XX:+AggressiveOpts in 6u5p b01
kvn
parents:
238
diff
changeset
|
1575 |
remove_deferred(ni, &deferred_edges, &visited); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1576 |
Node *n = ptn->_node; |
1 | 1577 |
if (n->is_AddP()) { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1578 |
// Search for objects which are not scalar replaceable |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1579 |
// and adjust their escape state. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1580 |
verify_escape_state(ni, ptset, igvn); |
1 | 1581 |
} |
1582 |
} |
|
1583 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1584 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1585 |
// 6. Propagate escape states. |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1586 |
GrowableArray<int> worklist; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1587 |
bool has_non_escaping_obj = false; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1588 |
|
1 | 1589 |
// push all GlobalEscape nodes on the worklist |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1590 |
for( uint next = 0; next < cg_length; ++next ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1591 |
int nk = cg_worklist.at(next); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1592 |
if (ptnode_adr(nk)->escape_state() == PointsToNode::GlobalEscape) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1593 |
worklist.push(nk); |
1 | 1594 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1595 |
// mark all nodes reachable from GlobalEscape nodes |
1 | 1596 |
while(worklist.length() > 0) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1597 |
PointsToNode* ptn = ptnode_adr(worklist.pop()); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1598 |
uint e_cnt = ptn->edge_count(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1599 |
for (uint ei = 0; ei < e_cnt; ei++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1600 |
uint npi = ptn->edge_target(ei); |
1 | 1601 |
PointsToNode *np = ptnode_adr(npi); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1602 |
if (np->escape_state() < PointsToNode::GlobalEscape) { |
1 | 1603 |
np->set_escape_state(PointsToNode::GlobalEscape); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1604 |
worklist.push(npi); |
1 | 1605 |
} |
1606 |
} |
|
1607 |
} |
|
1608 |
||
1609 |
// push all ArgEscape nodes on the worklist |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1610 |
for( uint next = 0; next < cg_length; ++next ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1611 |
int nk = cg_worklist.at(next); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1612 |
if (ptnode_adr(nk)->escape_state() == PointsToNode::ArgEscape) |
1 | 1613 |
worklist.push(nk); |
1614 |
} |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1615 |
// mark all nodes reachable from ArgEscape nodes |
1 | 1616 |
while(worklist.length() > 0) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1617 |
PointsToNode* ptn = ptnode_adr(worklist.pop()); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1618 |
if (ptn->node_type() == PointsToNode::JavaObject) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1619 |
has_non_escaping_obj = true; // Non GlobalEscape |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1620 |
uint e_cnt = ptn->edge_count(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1621 |
for (uint ei = 0; ei < e_cnt; ei++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1622 |
uint npi = ptn->edge_target(ei); |
1 | 1623 |
PointsToNode *np = ptnode_adr(npi); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1624 |
if (np->escape_state() < PointsToNode::ArgEscape) { |
1 | 1625 |
np->set_escape_state(PointsToNode::ArgEscape); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1626 |
worklist.push(npi); |
1 | 1627 |
} |
1628 |
} |
|
1629 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1630 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1631 |
GrowableArray<Node*> alloc_worklist; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1632 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1633 |
// push all NoEscape nodes on the worklist |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1634 |
for( uint next = 0; next < cg_length; ++next ) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1635 |
int nk = cg_worklist.at(next); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1636 |
if (ptnode_adr(nk)->escape_state() == PointsToNode::NoEscape) |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1637 |
worklist.push(nk); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1638 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1639 |
// mark all nodes reachable from NoEscape nodes |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1640 |
while(worklist.length() > 0) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1641 |
PointsToNode* ptn = ptnode_adr(worklist.pop()); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1642 |
if (ptn->node_type() == PointsToNode::JavaObject) |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1643 |
has_non_escaping_obj = true; // Non GlobalEscape |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1644 |
Node* n = ptn->_node; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1645 |
if (n->is_Allocate() && ptn->_scalar_replaceable ) { |
2131 | 1646 |
// Push scalar replaceable allocations on alloc_worklist |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1647 |
// for processing in split_unique_types(). |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1648 |
alloc_worklist.append(n); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1649 |
} |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1650 |
uint e_cnt = ptn->edge_count(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1651 |
for (uint ei = 0; ei < e_cnt; ei++) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1652 |
uint npi = ptn->edge_target(ei); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1653 |
PointsToNode *np = ptnode_adr(npi); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1654 |
if (np->escape_state() < PointsToNode::NoEscape) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1655 |
np->set_escape_state(PointsToNode::NoEscape); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1656 |
worklist.push(npi); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1657 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1658 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1659 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1660 |
|
1 | 1661 |
_collecting = false; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1662 |
assert(C->unique() == nodes_size(), "there should be no new ideal nodes during ConnectionGraph build"); |
1 | 1663 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1664 |
bool has_scalar_replaceable_candidates = alloc_worklist.length() > 0; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1665 |
if ( has_scalar_replaceable_candidates && |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1666 |
C->AliasLevel() >= 3 && EliminateAllocations ) { |
1 | 1667 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1668 |
// Now use the escape information to create unique types for |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1669 |
// scalar replaceable objects. |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1670 |
split_unique_types(alloc_worklist); |
1 | 1671 |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1672 |
if (C->failing()) return false; |
1 | 1673 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1674 |
// Clean up after split unique types. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1675 |
ResourceMark rm; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1676 |
PhaseRemoveUseless pru(C->initial_gvn(), C->for_igvn()); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1677 |
|
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1678 |
C->print_method("After Escape Analysis", 2); |
1 | 1679 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1680 |
#ifdef ASSERT |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1681 |
} else if (Verbose && (PrintEscapeAnalysis || PrintEliminateAllocations)) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1682 |
tty->print("=== No allocations eliminated for "); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1683 |
C->method()->print_short_name(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1684 |
if(!EliminateAllocations) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1685 |
tty->print(" since EliminateAllocations is off ==="); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1686 |
} else if(!has_scalar_replaceable_candidates) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1687 |
tty->print(" since there are no scalar replaceable candidates ==="); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1688 |
} else if(C->AliasLevel() < 3) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1689 |
tty->print(" since AliasLevel < 3 ==="); |
1 | 1690 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1691 |
tty->cr(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1692 |
#endif |
1 | 1693 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1694 |
return has_non_escaping_obj; |
1 | 1695 |
} |
1696 |
||
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1697 |
// Search for objects which are not scalar replaceable. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1698 |
void ConnectionGraph::verify_escape_state(int nidx, VectorSet& ptset, PhaseTransform* phase) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1699 |
PointsToNode* ptn = ptnode_adr(nidx); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1700 |
Node* n = ptn->_node; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1701 |
assert(n->is_AddP(), "Should be called for AddP nodes only"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1702 |
// Search for objects which are not scalar replaceable. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1703 |
// Mark their escape state as ArgEscape to propagate the state |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1704 |
// to referenced objects. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1705 |
// Note: currently there are no difference in compiler optimizations |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1706 |
// for ArgEscape objects and NoEscape objects which are not |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1707 |
// scalar replaceable. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1708 |
|
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1709 |
Compile* C = _compile; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1710 |
|
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1711 |
int offset = ptn->offset(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1712 |
Node* base = get_addp_base(n); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1713 |
ptset.Clear(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1714 |
PointsTo(ptset, base, phase); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1715 |
int ptset_size = ptset.Size(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1716 |
|
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1717 |
// Check if a oop field's initializing value is recorded and add |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1718 |
// a corresponding NULL field's value if it is not recorded. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1719 |
// Connection Graph does not record a default initialization by NULL |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1720 |
// captured by Initialize node. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1721 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1722 |
// Note: it will disable scalar replacement in some cases: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1723 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1724 |
// Point p[] = new Point[1]; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1725 |
// p[0] = new Point(); // Will be not scalar replaced |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1726 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1727 |
// but it will save us from incorrect optimizations in next cases: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1728 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1729 |
// Point p[] = new Point[1]; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1730 |
// if ( x ) p[0] = new Point(); // Will be not scalar replaced |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1731 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1732 |
// Do a simple control flow analysis to distinguish above cases. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1733 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1734 |
if (offset != Type::OffsetBot && ptset_size == 1) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1735 |
uint elem = ptset.getelem(); // Allocation node's index |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1736 |
// It does not matter if it is not Allocation node since |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1737 |
// only non-escaping allocations are scalar replaced. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1738 |
if (ptnode_adr(elem)->_node->is_Allocate() && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1739 |
ptnode_adr(elem)->escape_state() == PointsToNode::NoEscape) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1740 |
AllocateNode* alloc = ptnode_adr(elem)->_node->as_Allocate(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1741 |
InitializeNode* ini = alloc->initialization(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1742 |
|
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1743 |
// Check only oop fields. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1744 |
const Type* adr_type = n->as_AddP()->bottom_type(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1745 |
BasicType basic_field_type = T_INT; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1746 |
if (adr_type->isa_instptr()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1747 |
ciField* field = C->alias_type(adr_type->isa_instptr())->field(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1748 |
if (field != NULL) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1749 |
basic_field_type = field->layout_type(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1750 |
} else { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1751 |
// Ignore non field load (for example, klass load) |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1752 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1753 |
} else if (adr_type->isa_aryptr()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1754 |
const Type* elemtype = adr_type->isa_aryptr()->elem(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1755 |
basic_field_type = elemtype->array_element_basic_type(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1756 |
} else { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1757 |
// Raw pointers are used for initializing stores so skip it. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1758 |
assert(adr_type->isa_rawptr() && base->is_Proj() && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1759 |
(base->in(0) == alloc),"unexpected pointer type"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1760 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1761 |
if (basic_field_type == T_OBJECT || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1762 |
basic_field_type == T_NARROWOOP || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1763 |
basic_field_type == T_ARRAY) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1764 |
Node* value = NULL; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1765 |
if (ini != NULL) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1766 |
BasicType ft = UseCompressedOops ? T_NARROWOOP : T_OBJECT; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1767 |
Node* store = ini->find_captured_store(offset, type2aelembytes(ft), phase); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1768 |
if (store != NULL && store->is_Store()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1769 |
value = store->in(MemNode::ValueIn); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1770 |
} else if (ptn->edge_count() > 0) { // Are there oop stores? |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1771 |
// Check for a store which follows allocation without branches. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1772 |
// For example, a volatile field store is not collected |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1773 |
// by Initialize node. TODO: it would be nice to use idom() here. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1774 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1775 |
store = n->fast_out(i); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1776 |
if (store->is_Store() && store->in(0) != NULL) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1777 |
Node* ctrl = store->in(0); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1778 |
while(!(ctrl == ini || ctrl == alloc || ctrl == NULL || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1779 |
ctrl == C->root() || ctrl == C->top() || ctrl->is_Region() || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1780 |
ctrl->is_IfTrue() || ctrl->is_IfFalse())) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1781 |
ctrl = ctrl->in(0); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1782 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1783 |
if (ctrl == ini || ctrl == alloc) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1784 |
value = store->in(MemNode::ValueIn); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1785 |
break; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1786 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1787 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1788 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1789 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1790 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1791 |
if (value == NULL || value != ptnode_adr(value->_idx)->_node) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1792 |
// A field's initializing value was not recorded. Add NULL. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1793 |
uint null_idx = UseCompressedOops ? _noop_null : _oop_null; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1794 |
add_pointsto_edge(nidx, null_idx); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1795 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1796 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1797 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1798 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1799 |
|
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1800 |
// An object is not scalar replaceable if the field which may point |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1801 |
// to it has unknown offset (unknown element of an array of objects). |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1802 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1803 |
if (offset == Type::OffsetBot) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1804 |
uint e_cnt = ptn->edge_count(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1805 |
for (uint ei = 0; ei < e_cnt; ei++) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1806 |
uint npi = ptn->edge_target(ei); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1807 |
set_escape_state(npi, PointsToNode::ArgEscape); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1808 |
ptnode_adr(npi)->_scalar_replaceable = false; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1809 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1810 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1811 |
|
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1812 |
// Currently an object is not scalar replaceable if a LoadStore node |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1813 |
// access its field since the field value is unknown after it. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1814 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1815 |
bool has_LoadStore = false; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1816 |
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1817 |
Node *use = n->fast_out(i); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1818 |
if (use->is_LoadStore()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1819 |
has_LoadStore = true; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1820 |
break; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1821 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1822 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1823 |
// An object is not scalar replaceable if the address points |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1824 |
// to unknown field (unknown element for arrays, offset is OffsetBot). |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1825 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1826 |
// Or the address may point to more then one object. This may produce |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1827 |
// the false positive result (set scalar_replaceable to false) |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1828 |
// since the flow-insensitive escape analysis can't separate |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1829 |
// the case when stores overwrite the field's value from the case |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1830 |
// when stores happened on different control branches. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1831 |
// |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1832 |
if (ptset_size > 1 || ptset_size != 0 && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1833 |
(has_LoadStore || offset == Type::OffsetBot)) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1834 |
for( VectorSetI j(&ptset); j.test(); ++j ) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1835 |
set_escape_state(j.elem, PointsToNode::ArgEscape); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1836 |
ptnode_adr(j.elem)->_scalar_replaceable = false; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1837 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1838 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1839 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1840 |
|
1 | 1841 |
void ConnectionGraph::process_call_arguments(CallNode *call, PhaseTransform *phase) { |
1842 |
||
1843 |
switch (call->Opcode()) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1844 |
#ifdef ASSERT |
1 | 1845 |
case Op_Allocate: |
1846 |
case Op_AllocateArray: |
|
1847 |
case Op_Lock: |
|
1848 |
case Op_Unlock: |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1849 |
assert(false, "should be done already"); |
1 | 1850 |
break; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1851 |
#endif |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1852 |
case Op_CallLeaf: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1853 |
case Op_CallLeafNoFP: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1854 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1855 |
// Stub calls, objects do not escape but they are not scale replaceable. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1856 |
// Adjust escape state for outgoing arguments. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1857 |
const TypeTuple * d = call->tf()->domain(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1858 |
VectorSet ptset(Thread::current()->resource_area()); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1859 |
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1860 |
const Type* at = d->field_at(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1861 |
Node *arg = call->in(i)->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1862 |
const Type *aat = phase->type(arg); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1863 |
if (!arg->is_top() && at->isa_ptr() && aat->isa_ptr() && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1864 |
ptnode_adr(arg->_idx)->escape_state() < PointsToNode::ArgEscape) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1865 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1866 |
assert(aat == Type::TOP || aat == TypePtr::NULL_PTR || |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1867 |
aat->isa_ptr() != NULL, "expecting an Ptr"); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1868 |
#ifdef ASSERT |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1869 |
if (!(call->Opcode() == Op_CallLeafNoFP && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1870 |
call->as_CallLeaf()->_name != NULL && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1871 |
(strstr(call->as_CallLeaf()->_name, "arraycopy") != 0) || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1872 |
call->as_CallLeaf()->_name != NULL && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1873 |
(strcmp(call->as_CallLeaf()->_name, "g1_wb_pre") == 0 || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1874 |
strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 )) |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1875 |
) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1876 |
call->dump(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1877 |
assert(false, "EA: unexpected CallLeaf"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1878 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1879 |
#endif |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1880 |
set_escape_state(arg->_idx, PointsToNode::ArgEscape); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1881 |
if (arg->is_AddP()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1882 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1883 |
// The inline_native_clone() case when the arraycopy stub is called |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1884 |
// after the allocation before Initialize and CheckCastPP nodes. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1885 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1886 |
// Set AddP's base (Allocate) as not scalar replaceable since |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1887 |
// pointer to the base (with offset) is passed as argument. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1888 |
// |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1889 |
arg = get_addp_base(arg); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1890 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1891 |
ptset.Clear(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1892 |
PointsTo(ptset, arg, phase); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1893 |
for( VectorSetI j(&ptset); j.test(); ++j ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1894 |
uint pt = j.elem; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1895 |
set_escape_state(pt, PointsToNode::ArgEscape); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1896 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1897 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1898 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1899 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1900 |
} |
1 | 1901 |
|
1902 |
case Op_CallStaticJava: |
|
1903 |
// For a static call, we know exactly what method is being called. |
|
1904 |
// Use bytecode estimator to record the call's escape affects |
|
1905 |
{ |
|
1906 |
ciMethod *meth = call->as_CallJava()->method(); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1907 |
BCEscapeAnalyzer *call_analyzer = (meth !=NULL) ? meth->get_bcea() : NULL; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1908 |
// fall-through if not a Java method or no analyzer information |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1909 |
if (call_analyzer != NULL) { |
1 | 1910 |
const TypeTuple * d = call->tf()->domain(); |
1911 |
VectorSet ptset(Thread::current()->resource_area()); |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1912 |
bool copy_dependencies = false; |
1 | 1913 |
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) { |
1914 |
const Type* at = d->field_at(i); |
|
1915 |
int k = i - TypeFunc::Parms; |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1916 |
Node *arg = call->in(i)->uncast(); |
1 | 1917 |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
1918 |
if (at->isa_oopptr() != NULL && |
4565
cbb3fed38514
6913075: EA identifies escape state incorrectly after 6895383 fix
kvn
parents:
4471
diff
changeset
|
1919 |
ptnode_adr(arg->_idx)->escape_state() < PointsToNode::GlobalEscape) { |
1 | 1920 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1921 |
bool global_escapes = false; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1922 |
bool fields_escapes = false; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1923 |
if (!call_analyzer->is_arg_stack(k)) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1924 |
// The argument global escapes, mark everything it could point to |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1925 |
set_escape_state(arg->_idx, PointsToNode::GlobalEscape); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1926 |
global_escapes = true; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1927 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1928 |
if (!call_analyzer->is_arg_local(k)) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1929 |
// The argument itself doesn't escape, but any fields might |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1930 |
fields_escapes = true; |
1 | 1931 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1932 |
set_escape_state(arg->_idx, PointsToNode::ArgEscape); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1933 |
copy_dependencies = true; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1934 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1935 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1936 |
ptset.Clear(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1937 |
PointsTo(ptset, arg, phase); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1938 |
for( VectorSetI j(&ptset); j.test(); ++j ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1939 |
uint pt = j.elem; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1940 |
if (global_escapes) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1941 |
//The argument global escapes, mark everything it could point to |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1942 |
set_escape_state(pt, PointsToNode::GlobalEscape); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1943 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1944 |
if (fields_escapes) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1945 |
// The argument itself doesn't escape, but any fields might |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1946 |
add_edge_from_fields(pt, _phantom_object, Type::OffsetBot); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1947 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1948 |
set_escape_state(pt, PointsToNode::ArgEscape); |
1 | 1949 |
} |
1950 |
} |
|
1951 |
} |
|
1952 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1953 |
if (copy_dependencies) |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1954 |
call_analyzer->copy_dependencies(_compile->dependencies()); |
1 | 1955 |
break; |
1956 |
} |
|
1957 |
} |
|
1958 |
||
1959 |
default: |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1960 |
// Fall-through here if not a Java method or no analyzer information |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1961 |
// or some other type of call, assume the worst case: all arguments |
1 | 1962 |
// globally escape. |
1963 |
{ |
|
1964 |
// adjust escape state for outgoing arguments |
|
1965 |
const TypeTuple * d = call->tf()->domain(); |
|
1966 |
VectorSet ptset(Thread::current()->resource_area()); |
|
1967 |
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) { |
|
1968 |
const Type* at = d->field_at(i); |
|
1969 |
if (at->isa_oopptr() != NULL) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1970 |
Node *arg = call->in(i)->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1971 |
set_escape_state(arg->_idx, PointsToNode::GlobalEscape); |
1 | 1972 |
ptset.Clear(); |
1973 |
PointsTo(ptset, arg, phase); |
|
1974 |
for( VectorSetI j(&ptset); j.test(); ++j ) { |
|
1975 |
uint pt = j.elem; |
|
1976 |
set_escape_state(pt, PointsToNode::GlobalEscape); |
|
1977 |
} |
|
1978 |
} |
|
1979 |
} |
|
1980 |
} |
|
1981 |
} |
|
1982 |
} |
|
1983 |
void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *phase) { |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1984 |
CallNode *call = resproj->in(0)->as_Call(); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1985 |
uint call_idx = call->_idx; |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
1986 |
uint resproj_idx = resproj->_idx; |
1 | 1987 |
|
1988 |
switch (call->Opcode()) { |
|
1989 |
case Op_Allocate: |
|
1990 |
{ |
|
1991 |
Node *k = call->in(AllocateNode::KlassNode); |
|
5534
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
1992 |
const TypeKlassPtr *kt = k->bottom_type()->isa_klassptr(); |
1 | 1993 |
assert(kt != NULL, "TypeKlassPtr required."); |
1994 |
ciKlass* cik = kt->klass(); |
|
1995 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1996 |
PointsToNode::EscapeState es; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
1997 |
uint edge_to; |
5534
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
1998 |
if (cik->is_subclass_of(_compile->env()->Thread_klass()) || |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
1999 |
!cik->is_instance_klass() || // StressReflectiveCode |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2000 |
cik->as_instance_klass()->has_finalizer()) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2001 |
es = PointsToNode::GlobalEscape; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2002 |
edge_to = _phantom_object; // Could not be worse |
1 | 2003 |
} else { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2004 |
es = PointsToNode::NoEscape; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2005 |
edge_to = call_idx; |
1 | 2006 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2007 |
set_escape_state(call_idx, es); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2008 |
add_pointsto_edge(resproj_idx, edge_to); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2009 |
_processed.set(resproj_idx); |
1 | 2010 |
break; |
2011 |
} |
|
2012 |
||
2013 |
case Op_AllocateArray: |
|
2014 |
{ |
|
5534
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2015 |
|
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2016 |
Node *k = call->in(AllocateNode::KlassNode); |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2017 |
const TypeKlassPtr *kt = k->bottom_type()->isa_klassptr(); |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2018 |
assert(kt != NULL, "TypeKlassPtr required."); |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2019 |
ciKlass* cik = kt->klass(); |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2020 |
|
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2021 |
PointsToNode::EscapeState es; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2022 |
uint edge_to; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2023 |
if (!cik->is_array_klass()) { // StressReflectiveCode |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2024 |
es = PointsToNode::GlobalEscape; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2025 |
edge_to = _phantom_object; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2026 |
} else { |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2027 |
es = PointsToNode::NoEscape; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2028 |
edge_to = call_idx; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2029 |
int length = call->in(AllocateNode::ALength)->find_int_con(-1); |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2030 |
if (length < 0 || length > EliminateAllocationArraySizeLimit) { |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2031 |
// Not scalar replaceable if the length is not constant or too big. |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2032 |
ptnode_adr(call_idx)->_scalar_replaceable = false; |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2033 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2034 |
} |
5534
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2035 |
set_escape_state(call_idx, es); |
9bea9ee28dfc
6953267: assert in EA code with -XX:+StressReflectiveCode
kvn
parents:
4565
diff
changeset
|
2036 |
add_pointsto_edge(resproj_idx, edge_to); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2037 |
_processed.set(resproj_idx); |
1 | 2038 |
break; |
2039 |
} |
|
2040 |
||
2041 |
case Op_CallStaticJava: |
|
2042 |
// For a static call, we know exactly what method is being called. |
|
2043 |
// Use bytecode estimator to record whether the call's return value escapes |
|
2044 |
{ |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2045 |
bool done = true; |
1 | 2046 |
const TypeTuple *r = call->tf()->range(); |
2047 |
const Type* ret_type = NULL; |
|
2048 |
||
2049 |
if (r->cnt() > TypeFunc::Parms) |
|
2050 |
ret_type = r->field_at(TypeFunc::Parms); |
|
2051 |
||
2052 |
// Note: we use isa_ptr() instead of isa_oopptr() here because the |
|
2053 |
// _multianewarray functions return a TypeRawPtr. |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2054 |
if (ret_type == NULL || ret_type->isa_ptr() == NULL) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2055 |
_processed.set(resproj_idx); |
1 | 2056 |
break; // doesn't return a pointer type |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2057 |
} |
1 | 2058 |
ciMethod *meth = call->as_CallJava()->method(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2059 |
const TypeTuple * d = call->tf()->domain(); |
1 | 2060 |
if (meth == NULL) { |
2061 |
// not a Java method, assume global escape |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2062 |
set_escape_state(call_idx, PointsToNode::GlobalEscape); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2063 |
add_pointsto_edge(resproj_idx, _phantom_object); |
1 | 2064 |
} else { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2065 |
BCEscapeAnalyzer *call_analyzer = meth->get_bcea(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2066 |
bool copy_dependencies = false; |
1 | 2067 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2068 |
if (call_analyzer->is_return_allocated()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2069 |
// Returns a newly allocated unescaped object, simply |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2070 |
// update dependency information. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2071 |
// Mark it as NoEscape so that objects referenced by |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2072 |
// it's fields will be marked as NoEscape at least. |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2073 |
set_escape_state(call_idx, PointsToNode::NoEscape); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2074 |
add_pointsto_edge(resproj_idx, call_idx); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2075 |
copy_dependencies = true; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2076 |
} else if (call_analyzer->is_return_local()) { |
1 | 2077 |
// determine whether any arguments are returned |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2078 |
set_escape_state(call_idx, PointsToNode::NoEscape); |
1069
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2079 |
bool ret_arg = false; |
1 | 2080 |
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) { |
2081 |
const Type* at = d->field_at(i); |
|
2082 |
||
2083 |
if (at->isa_oopptr() != NULL) { |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2084 |
Node *arg = call->in(i)->uncast(); |
1 | 2085 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2086 |
if (call_analyzer->is_arg_returned(i - TypeFunc::Parms)) { |
1069
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2087 |
ret_arg = true; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2088 |
PointsToNode *arg_esp = ptnode_adr(arg->_idx); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2089 |
if (arg_esp->node_type() == PointsToNode::UnknownType) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2090 |
done = false; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2091 |
else if (arg_esp->node_type() == PointsToNode::JavaObject) |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2092 |
add_pointsto_edge(resproj_idx, arg->_idx); |
1 | 2093 |
else |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2094 |
add_deferred_edge(resproj_idx, arg->_idx); |
1 | 2095 |
arg_esp->_hidden_alias = true; |
2096 |
} |
|
2097 |
} |
|
2098 |
} |
|
1069
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2099 |
if (done && !ret_arg) { |
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2100 |
// Returns unknown object. |
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2101 |
set_escape_state(call_idx, PointsToNode::GlobalEscape); |
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2102 |
add_pointsto_edge(resproj_idx, _phantom_object); |
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2103 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2104 |
copy_dependencies = true; |
1 | 2105 |
} else { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2106 |
set_escape_state(call_idx, PointsToNode::GlobalEscape); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2107 |
add_pointsto_edge(resproj_idx, _phantom_object); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2108 |
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2109 |
const Type* at = d->field_at(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2110 |
if (at->isa_oopptr() != NULL) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2111 |
Node *arg = call->in(i)->uncast(); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2112 |
PointsToNode *arg_esp = ptnode_adr(arg->_idx); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2113 |
arg_esp->_hidden_alias = true; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2114 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2115 |
} |
1 | 2116 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2117 |
if (copy_dependencies) |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2118 |
call_analyzer->copy_dependencies(_compile->dependencies()); |
1 | 2119 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2120 |
if (done) |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2121 |
_processed.set(resproj_idx); |
1 | 2122 |
break; |
2123 |
} |
|
2124 |
||
2125 |
default: |
|
2126 |
// Some other type of call, assume the worst case that the |
|
2127 |
// returned value, if any, globally escapes. |
|
2128 |
{ |
|
2129 |
const TypeTuple *r = call->tf()->range(); |
|
2130 |
if (r->cnt() > TypeFunc::Parms) { |
|
2131 |
const Type* ret_type = r->field_at(TypeFunc::Parms); |
|
2132 |
||
2133 |
// Note: we use isa_ptr() instead of isa_oopptr() here because the |
|
2134 |
// _multianewarray functions return a TypeRawPtr. |
|
2135 |
if (ret_type->isa_ptr() != NULL) { |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2136 |
set_escape_state(call_idx, PointsToNode::GlobalEscape); |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2137 |
add_pointsto_edge(resproj_idx, _phantom_object); |
1 | 2138 |
} |
2139 |
} |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2140 |
_processed.set(resproj_idx); |
1 | 2141 |
} |
2142 |
} |
|
2143 |
} |
|
2144 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2145 |
// Populate Connection Graph with Ideal nodes and create simple |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2146 |
// connection graph edges (do not need to check the node_type of inputs |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2147 |
// or to call PointsTo() to walk the connection graph). |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2148 |
void ConnectionGraph::record_for_escape_analysis(Node *n, PhaseTransform *phase) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2149 |
if (_processed.test(n->_idx)) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2150 |
return; // No need to redefine node's state. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2151 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2152 |
if (n->is_Call()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2153 |
// Arguments to allocation and locking don't escape. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2154 |
if (n->is_Allocate()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2155 |
add_node(n, PointsToNode::JavaObject, PointsToNode::UnknownEscape, true); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2156 |
record_for_optimizer(n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2157 |
} else if (n->is_Lock() || n->is_Unlock()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2158 |
// Put Lock and Unlock nodes on IGVN worklist to process them during |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2159 |
// the first IGVN optimization when escape information is still available. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2160 |
record_for_optimizer(n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2161 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2162 |
} else { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2163 |
// Don't mark as processed since call's arguments have to be processed. |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2164 |
PointsToNode::NodeType nt = PointsToNode::UnknownType; |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2165 |
PointsToNode::EscapeState es = PointsToNode::UnknownEscape; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2166 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2167 |
// Check if a call returns an object. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2168 |
const TypeTuple *r = n->as_Call()->tf()->range(); |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2169 |
if (r->cnt() > TypeFunc::Parms && |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2170 |
r->field_at(TypeFunc::Parms)->isa_ptr() && |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2171 |
n->as_Call()->proj_out(TypeFunc::Parms) != NULL) { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2172 |
nt = PointsToNode::JavaObject; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2173 |
if (!n->is_CallStaticJava()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2174 |
// Since the called mathod is statically unknown assume |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2175 |
// the worst case that the returned value globally escapes. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2176 |
es = PointsToNode::GlobalEscape; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2177 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2178 |
} |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2179 |
add_node(n, nt, es, false); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2180 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2181 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2182 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2183 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2184 |
// Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2185 |
// ThreadLocal has RawPrt type. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2186 |
switch (n->Opcode()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2187 |
case Op_AddP: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2188 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2189 |
add_node(n, PointsToNode::Field, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2190 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2191 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2192 |
case Op_CastX2P: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2193 |
{ // "Unsafe" memory access. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2194 |
add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, true); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2195 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2196 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2197 |
case Op_CastPP: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2198 |
case Op_CheckCastPP: |
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2199 |
case Op_EncodeP: |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2200 |
case Op_DecodeN: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2201 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2202 |
add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2203 |
int ti = n->in(1)->_idx; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2204 |
PointsToNode::NodeType nt = ptnode_adr(ti)->node_type(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2205 |
if (nt == PointsToNode::UnknownType) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2206 |
_delayed_worklist.push(n); // Process it later. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2207 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2208 |
} else if (nt == PointsToNode::JavaObject) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2209 |
add_pointsto_edge(n->_idx, ti); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2210 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2211 |
add_deferred_edge(n->_idx, ti); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2212 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2213 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2214 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2215 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2216 |
case Op_ConP: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2217 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2218 |
// assume all pointer constants globally escape except for null |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2219 |
PointsToNode::EscapeState es; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2220 |
if (phase->type(n) == TypePtr::NULL_PTR) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2221 |
es = PointsToNode::NoEscape; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2222 |
else |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2223 |
es = PointsToNode::GlobalEscape; |
1 | 2224 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2225 |
add_node(n, PointsToNode::JavaObject, es, true); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2226 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2227 |
} |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2228 |
case Op_ConN: |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2229 |
{ |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2230 |
// assume all narrow oop constants globally escape except for null |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2231 |
PointsToNode::EscapeState es; |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2232 |
if (phase->type(n) == TypeNarrowOop::NULL_PTR) |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2233 |
es = PointsToNode::NoEscape; |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2234 |
else |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2235 |
es = PointsToNode::GlobalEscape; |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2236 |
|
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2237 |
add_node(n, PointsToNode::JavaObject, es, true); |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2238 |
break; |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2239 |
} |
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2240 |
case Op_CreateEx: |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2241 |
{ |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2242 |
// assume that all exception objects globally escape |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2243 |
add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, true); |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2244 |
break; |
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2245 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2246 |
case Op_LoadKlass: |
590
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
2247 |
case Op_LoadNKlass: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2248 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2249 |
add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, true); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2250 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2251 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2252 |
case Op_LoadP: |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2253 |
case Op_LoadN: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2254 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2255 |
const Type *t = phase->type(n); |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2256 |
if (t->make_ptr() == NULL) { |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2257 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2258 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2259 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2260 |
add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2261 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2262 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2263 |
case Op_Parm: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2264 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2265 |
_processed.set(n->_idx); // No need to redefine it state. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2266 |
uint con = n->as_Proj()->_con; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2267 |
if (con < TypeFunc::Parms) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2268 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2269 |
const Type *t = n->in(0)->as_Start()->_domain->field_at(con); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2270 |
if (t->isa_ptr() == NULL) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2271 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2272 |
// We have to assume all input parameters globally escape |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2273 |
// (Note: passing 'false' since _processed is already set). |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2274 |
add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2275 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2276 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2277 |
case Op_Phi: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2278 |
{ |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2279 |
const Type *t = n->as_Phi()->type(); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2280 |
if (t->make_ptr() == NULL) { |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2281 |
// nothing to do if not an oop or narrow oop |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2282 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2283 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2284 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2285 |
add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2286 |
uint i; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2287 |
for (i = 1; i < n->req() ; i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2288 |
Node* in = n->in(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2289 |
if (in == NULL) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2290 |
continue; // ignore NULL |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2291 |
in = in->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2292 |
if (in->is_top() || in == n) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2293 |
continue; // ignore top or inputs which go back this node |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2294 |
int ti = in->_idx; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2295 |
PointsToNode::NodeType nt = ptnode_adr(ti)->node_type(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2296 |
if (nt == PointsToNode::UnknownType) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2297 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2298 |
} else if (nt == PointsToNode::JavaObject) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2299 |
add_pointsto_edge(n->_idx, ti); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2300 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2301 |
add_deferred_edge(n->_idx, ti); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2302 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2303 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2304 |
if (i >= n->req()) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2305 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2306 |
else |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2307 |
_delayed_worklist.push(n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2308 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2309 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2310 |
case Op_Proj: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2311 |
{ |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2312 |
// we are only interested in the oop result projection from a call |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2313 |
if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() ) { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2314 |
const TypeTuple *r = n->in(0)->as_Call()->tf()->range(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2315 |
assert(r->cnt() > TypeFunc::Parms, "sanity"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2316 |
if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2317 |
add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2318 |
int ti = n->in(0)->_idx; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2319 |
// The call may not be registered yet (since not all its inputs are registered) |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2320 |
// if this is the projection from backbranch edge of Phi. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2321 |
if (ptnode_adr(ti)->node_type() != PointsToNode::UnknownType) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2322 |
process_call_result(n->as_Proj(), phase); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2323 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2324 |
if (!_processed.test(n->_idx)) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2325 |
// The call's result may need to be processed later if the call |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2326 |
// returns it's argument and the argument is not processed yet. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2327 |
_delayed_worklist.push(n); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2328 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2329 |
break; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2330 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2331 |
} |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2332 |
_processed.set(n->_idx); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2333 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2334 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2335 |
case Op_Return: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2336 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2337 |
if( n->req() > TypeFunc::Parms && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2338 |
phase->type(n->in(TypeFunc::Parms))->isa_oopptr() ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2339 |
// Treat Return value as LocalVar with GlobalEscape escape state. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2340 |
add_node(n, PointsToNode::LocalVar, PointsToNode::GlobalEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2341 |
int ti = n->in(TypeFunc::Parms)->_idx; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2342 |
PointsToNode::NodeType nt = ptnode_adr(ti)->node_type(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2343 |
if (nt == PointsToNode::UnknownType) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2344 |
_delayed_worklist.push(n); // Process it later. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2345 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2346 |
} else if (nt == PointsToNode::JavaObject) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2347 |
add_pointsto_edge(n->_idx, ti); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2348 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2349 |
add_deferred_edge(n->_idx, ti); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2350 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2351 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2352 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2353 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2354 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2355 |
case Op_StoreP: |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2356 |
case Op_StoreN: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2357 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2358 |
const Type *adr_type = phase->type(n->in(MemNode::Address)); |
767
64fb1fd7186d
6710487: More than half of JDI Regression tests hang with COOPs in -Xcomp mode
kvn
parents:
594
diff
changeset
|
2359 |
adr_type = adr_type->make_ptr(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2360 |
if (adr_type->isa_oopptr()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2361 |
add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2362 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2363 |
Node* adr = n->in(MemNode::Address); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2364 |
if (adr->is_AddP() && phase->type(adr) == TypeRawPtr::NOTNULL && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2365 |
adr->in(AddPNode::Address)->is_Proj() && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2366 |
adr->in(AddPNode::Address)->in(0)->is_Allocate()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2367 |
add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2368 |
// We are computing a raw address for a store captured |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2369 |
// by an Initialize compute an appropriate address type. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2370 |
int offs = (int)phase->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2371 |
assert(offs != Type::OffsetBot, "offset must be a constant"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2372 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2373 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2374 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2375 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2376 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2377 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2378 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2379 |
case Op_StorePConditional: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2380 |
case Op_CompareAndSwapP: |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2381 |
case Op_CompareAndSwapN: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2382 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2383 |
const Type *adr_type = phase->type(n->in(MemNode::Address)); |
767
64fb1fd7186d
6710487: More than half of JDI Regression tests hang with COOPs in -Xcomp mode
kvn
parents:
594
diff
changeset
|
2384 |
adr_type = adr_type->make_ptr(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2385 |
if (adr_type->isa_oopptr()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2386 |
add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2387 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2388 |
_processed.set(n->_idx); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2389 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2390 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2391 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2392 |
} |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2393 |
case Op_AryEq: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2394 |
case Op_StrComp: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2395 |
case Op_StrEquals: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2396 |
case Op_StrIndexOf: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2397 |
{ |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2398 |
// char[] arrays passed to string intrinsics are not scalar replaceable. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2399 |
add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2400 |
break; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2401 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2402 |
case Op_ThreadLocal: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2403 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2404 |
add_node(n, PointsToNode::JavaObject, PointsToNode::ArgEscape, true); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2405 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2406 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2407 |
default: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2408 |
; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2409 |
// nothing to do |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2410 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2411 |
return; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2412 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2413 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2414 |
void ConnectionGraph::build_connection_graph(Node *n, PhaseTransform *phase) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2415 |
uint n_idx = n->_idx; |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2416 |
assert(ptnode_adr(n_idx)->_node != NULL, "node should be registered"); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2417 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2418 |
// Don't set processed bit for AddP, LoadP, StoreP since |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2419 |
// they may need more then one pass to process. |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2420 |
if (_processed.test(n_idx)) |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2421 |
return; // No need to redefine node's state. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2422 |
|
1 | 2423 |
if (n->is_Call()) { |
2424 |
CallNode *call = n->as_Call(); |
|
2425 |
process_call_arguments(call, phase); |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2426 |
_processed.set(n_idx); |
1 | 2427 |
return; |
2428 |
} |
|
2429 |
||
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2430 |
switch (n->Opcode()) { |
1 | 2431 |
case Op_AddP: |
2432 |
{ |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2433 |
Node *base = get_addp_base(n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2434 |
// Create a field edge to this node from everything base could point to. |
1 | 2435 |
VectorSet ptset(Thread::current()->resource_area()); |
2436 |
PointsTo(ptset, base, phase); |
|
2437 |
for( VectorSetI i(&ptset); i.test(); ++i ) { |
|
2438 |
uint pt = i.elem; |
|
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2439 |
add_field_edge(pt, n_idx, address_offset(n, phase)); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2440 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2441 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2442 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2443 |
case Op_CastX2P: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2444 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2445 |
assert(false, "Op_CastX2P"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2446 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2447 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2448 |
case Op_CastPP: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2449 |
case Op_CheckCastPP: |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2450 |
case Op_EncodeP: |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
349
diff
changeset
|
2451 |
case Op_DecodeN: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2452 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2453 |
int ti = n->in(1)->_idx; |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2454 |
assert(ptnode_adr(ti)->node_type() != PointsToNode::UnknownType, "all nodes should be registered"); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2455 |
if (ptnode_adr(ti)->node_type() == PointsToNode::JavaObject) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2456 |
add_pointsto_edge(n_idx, ti); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2457 |
} else { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2458 |
add_deferred_edge(n_idx, ti); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2459 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2460 |
_processed.set(n_idx); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2461 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2462 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2463 |
case Op_ConP: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2464 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2465 |
assert(false, "Op_ConP"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2466 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2467 |
} |
589 | 2468 |
case Op_ConN: |
2469 |
{ |
|
2470 |
assert(false, "Op_ConN"); |
|
2471 |
break; |
|
2472 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2473 |
case Op_CreateEx: |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2474 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2475 |
assert(false, "Op_CreateEx"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2476 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2477 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2478 |
case Op_LoadKlass: |
590
2954744d7bba
6703890: Compressed Oops: add LoadNKlass node to generate narrow oops (32-bits) compare instructions
kvn
parents:
589
diff
changeset
|
2479 |
case Op_LoadNKlass: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2480 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2481 |
assert(false, "Op_LoadKlass"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2482 |
break; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2483 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2484 |
case Op_LoadP: |
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2485 |
case Op_LoadN: |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2486 |
{ |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2487 |
const Type *t = phase->type(n); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2488 |
#ifdef ASSERT |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2489 |
if (t->make_ptr() == NULL) |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2490 |
assert(false, "Op_LoadP"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2491 |
#endif |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2492 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2493 |
Node* adr = n->in(MemNode::Address)->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2494 |
Node* adr_base; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2495 |
if (adr->is_AddP()) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2496 |
adr_base = get_addp_base(adr); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2497 |
} else { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2498 |
adr_base = adr; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2499 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2500 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2501 |
// For everything "adr_base" could point to, create a deferred edge from |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2502 |
// this node to each field with the same offset. |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2503 |
VectorSet ptset(Thread::current()->resource_area()); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2504 |
PointsTo(ptset, adr_base, phase); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2505 |
int offset = address_offset(adr, phase); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2506 |
for( VectorSetI i(&ptset); i.test(); ++i ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2507 |
uint pt = i.elem; |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2508 |
add_deferred_edge_to_fields(n_idx, pt, offset); |
1 | 2509 |
} |
2510 |
break; |
|
2511 |
} |
|
2512 |
case Op_Parm: |
|
2513 |
{ |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2514 |
assert(false, "Op_Parm"); |
1 | 2515 |
break; |
2516 |
} |
|
2517 |
case Op_Phi: |
|
2518 |
{ |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2519 |
#ifdef ASSERT |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2520 |
const Type *t = n->as_Phi()->type(); |
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2521 |
if (t->make_ptr() == NULL) |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2522 |
assert(false, "Op_Phi"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2523 |
#endif |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2524 |
for (uint i = 1; i < n->req() ; i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2525 |
Node* in = n->in(i); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2526 |
if (in == NULL) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2527 |
continue; // ignore NULL |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2528 |
in = in->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2529 |
if (in->is_top() || in == n) |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2530 |
continue; // ignore top or inputs which go back this node |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2531 |
int ti = in->_idx; |
1069
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2532 |
PointsToNode::NodeType nt = ptnode_adr(ti)->node_type(); |
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2533 |
assert(nt != PointsToNode::UnknownType, "all nodes should be known"); |
ef51f81ebe0f
6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.")
kvn
parents:
1068
diff
changeset
|
2534 |
if (nt == PointsToNode::JavaObject) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2535 |
add_pointsto_edge(n_idx, ti); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2536 |
} else { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2537 |
add_deferred_edge(n_idx, ti); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2538 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2539 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2540 |
_processed.set(n_idx); |
1 | 2541 |
break; |
2542 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2543 |
case Op_Proj: |
1 | 2544 |
{ |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2545 |
// we are only interested in the oop result projection from a call |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2546 |
if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() ) { |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2547 |
assert(ptnode_adr(n->in(0)->_idx)->node_type() != PointsToNode::UnknownType, |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2548 |
"all nodes should be registered"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2549 |
const TypeTuple *r = n->in(0)->as_Call()->tf()->range(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2550 |
assert(r->cnt() > TypeFunc::Parms, "sanity"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2551 |
if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2552 |
process_call_result(n->as_Proj(), phase); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2553 |
assert(_processed.test(n_idx), "all call results should be processed"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2554 |
break; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2555 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2556 |
} |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2557 |
assert(false, "Op_Proj"); |
1 | 2558 |
break; |
2559 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2560 |
case Op_Return: |
1 | 2561 |
{ |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2562 |
#ifdef ASSERT |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2563 |
if( n->req() <= TypeFunc::Parms || |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2564 |
!phase->type(n->in(TypeFunc::Parms))->isa_oopptr() ) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2565 |
assert(false, "Op_Return"); |
1 | 2566 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2567 |
#endif |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2568 |
int ti = n->in(TypeFunc::Parms)->_idx; |
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2569 |
assert(ptnode_adr(ti)->node_type() != PointsToNode::UnknownType, "node should be registered"); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2570 |
if (ptnode_adr(ti)->node_type() == PointsToNode::JavaObject) { |
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2571 |
add_pointsto_edge(n_idx, ti); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2572 |
} else { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2573 |
add_deferred_edge(n_idx, ti); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2574 |
} |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2575 |
_processed.set(n_idx); |
1 | 2576 |
break; |
2577 |
} |
|
2578 |
case Op_StoreP: |
|
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2579 |
case Op_StoreN: |
1 | 2580 |
case Op_StorePConditional: |
2581 |
case Op_CompareAndSwapP: |
|
371
1aacedc9db7c
6689060: Escape Analysis does not work with Compressed Oops
kvn
parents:
360
diff
changeset
|
2582 |
case Op_CompareAndSwapN: |
1 | 2583 |
{ |
2584 |
Node *adr = n->in(MemNode::Address); |
|
767
64fb1fd7186d
6710487: More than half of JDI Regression tests hang with COOPs in -Xcomp mode
kvn
parents:
594
diff
changeset
|
2585 |
const Type *adr_type = phase->type(adr)->make_ptr(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2586 |
#ifdef ASSERT |
1 | 2587 |
if (!adr_type->isa_oopptr()) |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2588 |
assert(phase->type(adr) == TypeRawPtr::NOTNULL, "Op_StoreP"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2589 |
#endif |
1 | 2590 |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2591 |
assert(adr->is_AddP(), "expecting an AddP"); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2592 |
Node *adr_base = get_addp_base(adr); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2593 |
Node *val = n->in(MemNode::ValueIn)->uncast(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2594 |
// For everything "adr_base" could point to, create a deferred edge |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2595 |
// to "val" from each field with the same offset. |
1 | 2596 |
VectorSet ptset(Thread::current()->resource_area()); |
2597 |
PointsTo(ptset, adr_base, phase); |
|
2598 |
for( VectorSetI i(&ptset); i.test(); ++i ) { |
|
2599 |
uint pt = i.elem; |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2600 |
add_edge_from_fields(pt, val->_idx, address_offset(adr, phase)); |
1 | 2601 |
} |
2602 |
break; |
|
2603 |
} |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2604 |
case Op_AryEq: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2605 |
case Op_StrComp: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2606 |
case Op_StrEquals: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2607 |
case Op_StrIndexOf: |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2608 |
{ |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2609 |
// char[] arrays passed to string intrinsic do not escape but |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2610 |
// they are not scalar replaceable. Adjust escape state for them. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2611 |
// Start from in(2) edge since in(1) is memory edge. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2612 |
for (uint i = 2; i < n->req(); i++) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2613 |
Node* adr = n->in(i)->uncast(); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2614 |
const Type *at = phase->type(adr); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2615 |
if (!adr->is_top() && at->isa_ptr()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2616 |
assert(at == Type::TOP || at == TypePtr::NULL_PTR || |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2617 |
at->isa_ptr() != NULL, "expecting an Ptr"); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2618 |
if (adr->is_AddP()) { |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2619 |
adr = get_addp_base(adr); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2620 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2621 |
// Mark as ArgEscape everything "adr" could point to. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2622 |
set_escape_state(adr->_idx, PointsToNode::ArgEscape); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2623 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2624 |
} |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2625 |
_processed.set(n_idx); |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2626 |
break; |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2627 |
} |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2628 |
case Op_ThreadLocal: |
1 | 2629 |
{ |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2630 |
assert(false, "Op_ThreadLocal"); |
1 | 2631 |
break; |
2632 |
} |
|
2633 |
default: |
|
4470
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2634 |
// This method should be called only for EA specific nodes. |
1e6edcab3109
6895383: JCK test throws NPE for method compiled with Escape Analysis
kvn
parents:
4442
diff
changeset
|
2635 |
ShouldNotReachHere(); |
1 | 2636 |
} |
2637 |
} |
|
2638 |
||
2639 |
#ifndef PRODUCT |
|
2640 |
void ConnectionGraph::dump() { |
|
2641 |
PhaseGVN *igvn = _compile->initial_gvn(); |
|
2642 |
bool first = true; |
|
2643 |
||
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2644 |
uint size = nodes_size(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2645 |
for (uint ni = 0; ni < size; ni++) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2646 |
PointsToNode *ptn = ptnode_adr(ni); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2647 |
PointsToNode::NodeType ptn_type = ptn->node_type(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2648 |
|
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2649 |
if (ptn_type != PointsToNode::JavaObject || ptn->_node == NULL) |
1 | 2650 |
continue; |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2651 |
PointsToNode::EscapeState es = escape_state(ptn->_node, igvn); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2652 |
if (ptn->_node->is_Allocate() && (es == PointsToNode::NoEscape || Verbose)) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2653 |
if (first) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2654 |
tty->cr(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2655 |
tty->print("======== Connection graph for "); |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2656 |
_compile->method()->print_short_name(); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2657 |
tty->cr(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2658 |
first = false; |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2659 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2660 |
tty->print("%6d ", ni); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2661 |
ptn->dump(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2662 |
// Print all locals which reference this allocation |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2663 |
for (uint li = ni; li < size; li++) { |
952
38812d18eec0
6684714: Optimize EA Connection Graph build performance
kvn
parents:
769
diff
changeset
|
2664 |
PointsToNode *ptn_loc = ptnode_adr(li); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2665 |
PointsToNode::NodeType ptn_loc_type = ptn_loc->node_type(); |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2666 |
if ( ptn_loc_type == PointsToNode::LocalVar && ptn_loc->_node != NULL && |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2667 |
ptn_loc->edge_count() == 1 && ptn_loc->edge_target(0) == ni ) { |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2668 |
ptnode_adr(li)->dump(false); |
1 | 2669 |
} |
2670 |
} |
|
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2671 |
if (Verbose) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2672 |
// Print all fields which reference this allocation |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2673 |
for (uint i = 0; i < ptn->edge_count(); i++) { |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2674 |
uint ei = ptn->edge_target(i); |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
955
diff
changeset
|
2675 |
ptnode_adr(ei)->dump(false); |
238
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2676 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2677 |
} |
803c80713999
6674588: (Escape Analysis) Improve Escape Analysis code
kvn
parents:
212
diff
changeset
|
2678 |
tty->cr(); |
1 | 2679 |
} |
2680 |
} |
|
2681 |
} |
|
2682 |
#endif |