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