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