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