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