graal-jvmci-8: src/share/vm/opto/phaseX.cpp comparison

comparison src/share/vm/opto/phaseX.cpp @ 6244:611e8a669a2c

7147464: Java crashed while executing method with over 8k of dneg operations Summary: replace recursive method with iterative Reviewed-by: kvn, twisti Contributed-by: dean.long@oracle.com

author	dlong
date	Mon, 16 Jul 2012 15:31:18 -0400
parents	670a74b863fc
children	e626685e9f6c

comparison

equal deleted inserted replaced

-:e74da3c2b827
+:611e8a669a2c
 //=============================================================================
 //------------------------------PhaseIterGVN-----------------------------------
 // Initialize hash table to fresh and clean for +VerifyOpto
 PhaseIterGVN::PhaseIterGVN( PhaseIterGVN *igvn, const char *dummy ) : PhaseGVN(igvn,dummy), _worklist( ),
+_stack(C->unique() >> 1),
 _delay_transform(false) {
 }
 //------------------------------PhaseIterGVN-----------------------------------
 // Initialize with previous PhaseIterGVN info; used by PhaseCCP
 PhaseIterGVN::PhaseIterGVN( PhaseIterGVN *igvn ) : PhaseGVN(igvn),
 _worklist( igvn->_worklist ),
+_stack( igvn->_stack ),
 _delay_transform(igvn->_delay_transform)
 {
 }
 //------------------------------PhaseIterGVN-----------------------------------
 // Initialize with previous PhaseGVN info from Parser
 PhaseIterGVN::PhaseIterGVN( PhaseGVN *gvn ) : PhaseGVN(gvn),
 _worklist(*C->for_igvn()),
+_stack(C->unique() >> 1),
 _delay_transform(false)
 {
 uint max;
 // Dead nodes in the hash table inherited from GVN were not treated as
 //------------------------------remove_globally_dead_node----------------------
 // Kill a globally dead Node.  All uses are also globally dead and are
 // aggressively trimmed.
 void PhaseIterGVN::remove_globally_dead_node( Node *dead ) {
-assert(dead != C->root(), "killing root, eh?");
+enum DeleteProgress {
-if (dead->is_top())  return;
+PROCESS_INPUTS,
-NOT_PRODUCT( set_progress(); )
+PROCESS_OUTPUTS
-// Remove from iterative worklist
+};
-_worklist.remove(dead);
+assert(_stack.is_empty(), "not empty");
-if (!dead->is_Con()) { // Don't kill cons but uses
+_stack.push(dead, PROCESS_INPUTS);
-// Remove from hash table
-_table.hash_delete( dead );
+while (_stack.is_nonempty()) {
-// Smash all inputs to 'dead', isolating him completely
+dead = _stack.node();
-for( uint i = 0; i < dead->req(); i++ ) {
+uint progress_state = _stack.index();
-Node *in = dead->in(i);
+assert(dead != C->root(), "killing root, eh?");
-if( in ) {                 // Points to something?
+assert(!dead->is_top(), "add check for top when pushing");
-dead->set_req(i,NULL);  // Kill the edge
+NOT_PRODUCT( set_progress(); )
-if (in->outcnt() == 0 && in != C->top()) {// Made input go dead?
+if (progress_state == PROCESS_INPUTS) {
-remove_dead_node(in); // Recursively remove
+// After following inputs, continue to outputs
-} else if (in->outcnt() == 1 &&
+_stack.set_index(PROCESS_OUTPUTS);
-in->has_special_unique_user()) {
+// Remove from iterative worklist
-_worklist.push(in->unique_out());
+_worklist.remove(dead);
-} else if (in->outcnt() <= 2 && dead->is_Phi()) {
+if (!dead->is_Con()) { // Don't kill cons but uses
-if( in->Opcode() == Op_Region )
+bool recurse = false;
-_worklist.push(in);
+// Remove from hash table
-else if( in->is_Store() ) {
+_table.hash_delete( dead );
-DUIterator_Fast imax, i = in->fast_outs(imax);
+// Smash all inputs to 'dead', isolating him completely
-_worklist.push(in->fast_out(i));
+for( uint i = 0; i < dead->req(); i++ ) {
-i++;
+Node *in = dead->in(i);
-if(in->outcnt() == 2) {
+if( in ) {                 // Points to something?
-_worklist.push(in->fast_out(i));
+dead->set_req(i,NULL);  // Kill the edge
-i++;
+if (in->outcnt() == 0 && in != C->top()) {// Made input go dead?
+_stack.push(in, PROCESS_INPUTS); // Recursively remove
+recurse = true;
+} else if (in->outcnt() == 1 &&
+in->has_special_unique_user()) {
+_worklist.push(in->unique_out());
+} else if (in->outcnt() <= 2 && dead->is_Phi()) {
+if( in->Opcode() == Op_Region )
+_worklist.push(in);
+else if( in->is_Store() ) {
+DUIterator_Fast imax, i = in->fast_outs(imax);
+_worklist.push(in->fast_out(i));
+i++;
+if(in->outcnt() == 2) {
+_worklist.push(in->fast_out(i));
+i++;
+}
+assert(!(i < imax), "sanity");
+}
 }
-assert(!(i < imax), "sanity");
 }
 }
-}
-}
+if (dead->is_macro()) {
+C->remove_macro_node(dead);
-if (dead->is_macro()) {
+}
-C->remove_macro_node(dead);
-}
+if (recurse) {
-}
+continue;
-// Aggressively kill globally dead uses
+}
-// (Cannot use DUIterator_Last because of the indefinite number
+}
-// of edge deletions per loop trip.)
+}
-while (dead->outcnt() > 0) {
-remove_globally_dead_node(dead->raw_out(0));
+// Aggressively kill globally dead uses
+// (Rather than pushing all the outs at once, we push one at a time,
+// plus the parent to resume later, because of the indefinite number
+// of edge deletions per loop trip.)
+if (dead->outcnt() > 0) {
+// Recursively remove
+_stack.push(dead->raw_out(0), PROCESS_INPUTS);
+} else {
+_stack.pop();
+}
 }
 }
 //------------------------------subsume_node-----------------------------------
 // Remove users from node 'old' and add them to node 'nn'.

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/opto/phaseX.cpp @ 6244:611e8a669a2c