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

comparison src/share/vm/opto/loopnode.cpp @ 6804:e626685e9f6c

7193318: C2: remove number of inputs requirement from Node's new operator Summary: Deleted placement new operator of Node - node(size_t, Compile *, int). Reviewed-by: kvn, twisti Contributed-by: bharadwaj.yadavalli@oracle.com

author	kvn
date	Thu, 27 Sep 2012 09:38:42 -0700
parents	0acd345fd810
children	377508648226

comparison

equal deleted inserted replaced

-:06f52c4d0e18
+:e626685e9f6c
 // ---- SUCCESS!   Found A Trip-Counted Loop!  -----
 //
 assert(x->Opcode() == Op_Loop, "regular loops only");
 C->print_method("Before CountedLoop", 3);
-Node *hook = new (C, 6) Node(6);
+Node *hook = new (C) Node(6);
 if (LoopLimitCheck) {
 // ===================================================
 // Generate loop limit check to avoid integer overflow
 IfNode* check_iff = limit_check_proj->in(0)->as_If();
 Node* cmp_limit;
 Node* bol;
 if (stride_con > 0) {
-cmp_limit = new (C, 3) CmpINode(limit, _igvn.intcon(max_jint - stride_m));
+cmp_limit = new (C) CmpINode(limit, _igvn.intcon(max_jint - stride_m));
-bol = new (C, 2) BoolNode(cmp_limit, BoolTest::le);
+bol = new (C) BoolNode(cmp_limit, BoolTest::le);
 } else {
-cmp_limit = new (C, 3) CmpINode(limit, _igvn.intcon(min_jint - stride_m));
+cmp_limit = new (C) CmpINode(limit, _igvn.intcon(min_jint - stride_m));
-bol = new (C, 2) BoolNode(cmp_limit, BoolTest::ge);
+bol = new (C) BoolNode(cmp_limit, BoolTest::ge);
 }
 cmp_limit = _igvn.register_new_node_with_optimizer(cmp_limit);
 bol = _igvn.register_new_node_with_optimizer(bol);
 set_subtree_ctrl(bol);
 //
 //   i = init; do {} while(i++ < limit);
 // is converted to
 //   i = init; do {} while(++i < limit+1);
 //
-limit = gvn->transform(new (C, 3) AddINode(limit, stride));
+limit = gvn->transform(new (C) AddINode(limit, stride));
 }
 // Now we need to canonicalize loop condition.
 if (bt == BoolTest::ne) {
 assert(stride_con == 1 || stride_con == -1, "simple increment only");
 if (incl_limit) {
 // The limit check guaranties that 'limit <= (max_jint - stride)' so
 // we can convert 'i <= limit' to 'i < limit+1' since stride != 0.
 //
 Node* one = (stride_con > 0) ? gvn->intcon( 1) : gvn->intcon(-1);
-limit = gvn->transform(new (C, 3) AddINode(limit, one));
+limit = gvn->transform(new (C) AddINode(limit, one));
 if (bt == BoolTest::le)
 bt = BoolTest::lt;
 else if (bt == BoolTest::ge)
 bt = BoolTest::gt;
 else
 // If compare points to incr, we are ok.  Otherwise the compare
 // can directly point to the phi; in this case adjust the compare so that
 // it points to the incr by adjusting the limit.
 if (cmp->in(1) == phi || cmp->in(2) == phi)
-limit = gvn->transform(new (C, 3) AddINode(limit,stride));
+limit = gvn->transform(new (C) AddINode(limit,stride));
 // trip-count for +-tive stride should be: (limit - init_trip + stride - 1)/stride.
 // Final value for iterator should be: trip_count * stride + init_trip.
 Node *one_p = gvn->intcon( 1);
 Node *one_m = gvn->intcon(-1);
 switch( bt ) {
 case BoolTest::eq:
 ShouldNotReachHere();
 case BoolTest::ne:            // Ahh, the case we desire
 if (stride_con == 1)
-trip_count = gvn->transform(new (C, 3) SubINode(limit,init_trip));
+trip_count = gvn->transform(new (C) SubINode(limit,init_trip));
 else if (stride_con == -1)
-trip_count = gvn->transform(new (C, 3) SubINode(init_trip,limit));
+trip_count = gvn->transform(new (C) SubINode(init_trip,limit));
 else
 ShouldNotReachHere();
 set_subtree_ctrl(trip_count);
 //_loop.map(trip_count->_idx,loop(limit));
 break;
 case BoolTest::le:            // Maybe convert to '<' case
-limit = gvn->transform(new (C, 3) AddINode(limit,one_p));
+limit = gvn->transform(new (C) AddINode(limit,one_p));
 set_subtree_ctrl( limit );
 hook->init_req(4, limit);
 bt = BoolTest::lt;
 // Make the new limit be in the same loop nest as the old limit
 //_loop.map(limit->_idx,limit_loop);
 // Fall into next case
 case BoolTest::lt: {          // Maybe convert to '!=' case
 if (stride_con < 0) // Count down loop rolls through MAXINT
 ShouldNotReachHere();
-Node *range = gvn->transform(new (C, 3) SubINode(limit,init_trip));
+Node *range = gvn->transform(new (C) SubINode(limit,init_trip));
 set_subtree_ctrl( range );
 hook->init_req(0, range);
-Node *bias  = gvn->transform(new (C, 3) AddINode(range,stride));
+Node *bias  = gvn->transform(new (C) AddINode(range,stride));
 set_subtree_ctrl( bias );
 hook->init_req(1, bias);
-Node *bias1 = gvn->transform(new (C, 3) AddINode(bias,one_m));
+Node *bias1 = gvn->transform(new (C) AddINode(bias,one_m));
 set_subtree_ctrl( bias1 );
 hook->init_req(2, bias1);
-trip_count  = gvn->transform(new (C, 3) DivINode(0,bias1,stride));
+trip_count  = gvn->transform(new (C) DivINode(0,bias1,stride));
 set_subtree_ctrl( trip_count );
 hook->init_req(3, trip_count);
 break;
 }
 case BoolTest::ge:            // Maybe convert to '>' case
-limit = gvn->transform(new (C, 3) AddINode(limit,one_m));
+limit = gvn->transform(new (C) AddINode(limit,one_m));
 set_subtree_ctrl( limit );
 hook->init_req(4 ,limit);
 bt = BoolTest::gt;
 // Make the new limit be in the same loop nest as the old limit
 //_loop.map(limit->_idx,limit_loop);
 // Fall into next case
 case BoolTest::gt: {          // Maybe convert to '!=' case
 if (stride_con > 0) // count up loop rolls through MININT
 ShouldNotReachHere();
-Node *range = gvn->transform(new (C, 3) SubINode(limit,init_trip));
+Node *range = gvn->transform(new (C) SubINode(limit,init_trip));
 set_subtree_ctrl( range );
 hook->init_req(0, range);
-Node *bias  = gvn->transform(new (C, 3) AddINode(range,stride));
+Node *bias  = gvn->transform(new (C) AddINode(range,stride));
 set_subtree_ctrl( bias );
 hook->init_req(1, bias);
-Node *bias1 = gvn->transform(new (C, 3) AddINode(bias,one_p));
+Node *bias1 = gvn->transform(new (C) AddINode(bias,one_p));
 set_subtree_ctrl( bias1 );
 hook->init_req(2, bias1);
-trip_count  = gvn->transform(new (C, 3) DivINode(0,bias1,stride));
+trip_count  = gvn->transform(new (C) DivINode(0,bias1,stride));
 set_subtree_ctrl( trip_count );
 hook->init_req(3, trip_count);
 break;
 }
 } // switch( bt )
-Node *span = gvn->transform(new (C, 3) MulINode(trip_count,stride));
+Node *span = gvn->transform(new (C) MulINode(trip_count,stride));
 set_subtree_ctrl( span );
 hook->init_req(5, span);
-limit = gvn->transform(new (C, 3) AddINode(span,init_trip));
+limit = gvn->transform(new (C) AddINode(span,init_trip));
 set_subtree_ctrl( limit );
 } // LoopLimitCheck
 // Check for SafePoint on backedge and remove
 test->set_req(1,cmp);
 _igvn.register_new_node_with_optimizer(test);
 set_ctrl(test, iff->in(0));
 // Replace the old IfNode with a new LoopEndNode
-Node *lex = _igvn.register_new_node_with_optimizer(new (C, 2) CountedLoopEndNode( iff->in(0), test, cl_prob, iff->as_If()->_fcnt ));
+Node *lex = _igvn.register_new_node_with_optimizer(new (C) CountedLoopEndNode( iff->in(0), test, cl_prob, iff->as_If()->_fcnt ));
 IfNode *le = lex->as_If();
 uint dd = dom_depth(iff);
 set_idom(le, le->in(0), dd); // Update dominance for loop exit
 set_loop(le, loop);
 // Get the loop-exit control
 Node *iffalse = iff->as_If()->proj_out(!(iftrue_op == Op_IfTrue));
 // Need to swap loop-exit and loop-back control?
 if (iftrue_op == Op_IfFalse) {
-Node *ift2=_igvn.register_new_node_with_optimizer(new (C, 1) IfTrueNode (le));
+Node *ift2=_igvn.register_new_node_with_optimizer(new (C) IfTrueNode (le));
-Node *iff2=_igvn.register_new_node_with_optimizer(new (C, 1) IfFalseNode(le));
+Node *iff2=_igvn.register_new_node_with_optimizer(new (C) IfFalseNode(le));
 loop->_tail = back_control = ift2;
 set_loop(ift2, loop);
 set_loop(iff2, get_loop(iffalse));
 set_idom(iffalse, le, dd+1);
 assert(iff->outcnt() == 0, "should be dead now");
 lazy_replace( iff, le ); // fix 'get_ctrl'
 // Now setup a new CountedLoopNode to replace the existing LoopNode
-CountedLoopNode *l = new (C, 3) CountedLoopNode(init_control, back_control);
+CountedLoopNode *l = new (C) CountedLoopNode(init_control, back_control);
 l->set_unswitch_count(x->as_Loop()->unswitch_count()); // Preserve
 // The following assert is approximately true, and defines the intention
 // of can_be_counted_loop.  It fails, however, because phase->type
 // is not yet initialized for this loop and its parts.
 //assert(l->can_be_counted_loop(this), "sanity");
 // is counted and the limit was checked for overflow.
 assert(final_con == (long)final_int, "final value should be integer");
 limit = _igvn.intcon(final_int);
 } else {
 // Create new LoopLimit node to get exact limit (final iv value).
-limit = new (C, 4) LoopLimitNode(C, cl->init_trip(), cl->limit(), cl->stride());
+limit = new (C) LoopLimitNode(C, cl->init_trip(), cl->limit(), cl->stride());
 register_new_node(limit, cl->in(LoopNode::EntryControl));
 }
 assert(limit != NULL, "sanity");
 return limit;
 }
 }
 julong range = lim - ini + stride_p;
 if (range <= max) {
 // Convert to integer expression if it is not overflow.
 Node* stride_m = phase->intcon(stride_con - (stride_con > 0 ? 1 : -1));
-Node *range = phase->transform(new (phase->C, 3) SubINode(in(Limit), in(Init)));
+Node *range = phase->transform(new (phase->C) SubINode(in(Limit), in(Init)));
-Node *bias  = phase->transform(new (phase->C, 3) AddINode(range, stride_m));
+Node *bias  = phase->transform(new (phase->C) AddINode(range, stride_m));
-Node *trip  = phase->transform(new (phase->C, 3) DivINode(0, bias, in(Stride)));
+Node *trip  = phase->transform(new (phase->C) DivINode(0, bias, in(Stride)));
-Node *span  = phase->transform(new (phase->C, 3) MulINode(trip, in(Stride)));
+Node *span  = phase->transform(new (phase->C) MulINode(trip, in(Stride)));
-return new (phase->C, 3) AddINode(span, in(Init)); // exact limit
+return new (phase->C) AddINode(span, in(Init)); // exact limit
 }
 if (is_power_of_2(stride_p) ||                // divisor is 2^n
 !Matcher::has_match_rule(Op_LoopLimit)) { // or no specialized Mach node?
 // Convert to long expression to avoid integer overflow
 // and let igvn optimizer convert this division.
 //
-Node*   init   = phase->transform( new (phase->C, 2) ConvI2LNode(in(Init)));
+Node*   init   = phase->transform( new (phase->C) ConvI2LNode(in(Init)));
-Node*  limit   = phase->transform( new (phase->C, 2) ConvI2LNode(in(Limit)));
+Node*  limit   = phase->transform( new (phase->C) ConvI2LNode(in(Limit)));
 Node* stride   = phase->longcon(stride_con);
 Node* stride_m = phase->longcon(stride_con - (stride_con > 0 ? 1 : -1));
-Node *range = phase->transform(new (phase->C, 3) SubLNode(limit, init));
+Node *range = phase->transform(new (phase->C) SubLNode(limit, init));
-Node *bias  = phase->transform(new (phase->C, 3) AddLNode(range, stride_m));
+Node *bias  = phase->transform(new (phase->C) AddLNode(range, stride_m));
 Node *span;
 if (stride_con > 0 && is_power_of_2(stride_p)) {
 // bias >= 0 if stride >0, so if stride is 2^n we can use &(-stride)
 // and avoid generating rounding for division. Zero trip guard should
 // guarantee that init < limit but sometimes the guard is missing and
 // we can get situation when init > limit. Note, for the empty loop
 // optimization zero trip guard is generated explicitly which leaves
 // only RCE predicate where exact limit is used and the predicate
 // will simply fail forcing recompilation.
 Node* neg_stride   = phase->longcon(-stride_con);
-span = phase->transform(new (phase->C, 3) AndLNode(bias, neg_stride));
+span = phase->transform(new (phase->C) AndLNode(bias, neg_stride));
 } else {
-Node *trip  = phase->transform(new (phase->C, 3) DivLNode(0, bias, stride));
+Node *trip  = phase->transform(new (phase->C) DivLNode(0, bias, stride));
-span = phase->transform(new (phase->C, 3) MulLNode(trip, stride));
+span = phase->transform(new (phase->C) MulLNode(trip, stride));
 }
 // Convert back to int
-Node *span_int = phase->transform(new (phase->C, 2) ConvL2INode(span));
+Node *span_int = phase->transform(new (phase->C) ConvL2INode(span));
-return new (phase->C, 3) AddINode(span_int, in(Init)); // exact limit
+return new (phase->C) AddINode(span_int, in(Init)); // exact limit
 }
 return NULL;    // No progress
 }
 void IdealLoopTree::split_fall_in( PhaseIdealLoop *phase, int fall_in_cnt ) {
 PhaseIterGVN &igvn = phase->_igvn;
 uint i;
 // Make a new RegionNode to be the landing pad.
-Node *landing_pad = new (phase->C, fall_in_cnt+1) RegionNode( fall_in_cnt+1 );
+Node *landing_pad = new (phase->C) RegionNode( fall_in_cnt+1 );
 phase->set_loop(landing_pad,_parent);
 // Gather all the fall-in control paths into the landing pad
 uint icnt = fall_in_cnt;
 uint oreq = _head->req();
 for( i = oreq-1; i>0; i-- )
 uint outer_idx = 1;
 while( _head->in(outer_idx) != _tail ) outer_idx++;
 // Make a LoopNode for the outermost loop.
 Node *ctl = _head->in(LoopNode::EntryControl);
-Node *outer = new (phase->C, 3) LoopNode( ctl, _head->in(outer_idx) );
+Node *outer = new (phase->C) LoopNode( ctl, _head->in(outer_idx) );
 outer = igvn.register_new_node_with_optimizer(outer, _head);
 phase->set_created_loop_node();
 // Outermost loop falls into '_head' loop
 _head->set_req(LoopNode::EntryControl, outer);
 // them all except optionally hot_idx.
 PhaseIterGVN &igvn = phase->_igvn;
 Node *hot_tail = NULL;
 // Make a Region for the merge point
-Node *r = new (phase->C, 1) RegionNode(1);
+Node *r = new (phase->C) RegionNode(1);
 for( i = 2; i < _head->req(); i++ ) {
 if( i != hot_idx )
 r->add_req( _head->in(i) );
 else hot_tail = _head->in(i);
 }
 Node *out = _head->fast_out(j);
 if( out->is_Phi() ) {
 PhiNode* n = out->as_Phi();
 igvn.hash_delete(n);      // Delete from hash before hacking edges
 Node *hot_phi = NULL;
-Node *phi = new (phase->C, r->req()) PhiNode(r, n->type(), n->adr_type());
+Node *phi = new (phase->C) PhiNode(r, n->type(), n->adr_type());
 // Check all inputs for the ones to peel out
 uint j = 1;
 for( uint i = 2; i < n->req(); i++ ) {
 if( i != hot_idx )
 phi->set_req( j++, n->in(i) );
 split_outer_loop( phase );
 result = true;
 } else if( !_head->is_Loop() && !_irreducible ) {
 // Make a new LoopNode to replace the old loop head
-Node *l = new (phase->C, 3) LoopNode( _head->in(1), _head->in(2) );
+Node *l = new (phase->C) LoopNode( _head->in(1), _head->in(2) );
 l = igvn.register_new_node_with_optimizer(l, _head);
 phase->set_created_loop_node();
 // Go ahead and replace _head
 phase->_igvn.replace_node( _head, l );
 _head = l;
 // variable differs from the trip counter by a loop-invariant
 // amount, the difference between their respective initial values.
 // It is scaled by the 'ratio_con'.
 Node* ratio = _igvn.intcon(ratio_con);
 set_ctrl(ratio, C->root());
-Node* ratio_init = new (C, 3) MulINode(init, ratio);
+Node* ratio_init = new (C) MulINode(init, ratio);
 _igvn.register_new_node_with_optimizer(ratio_init, init);
 set_early_ctrl(ratio_init);
-Node* diff = new (C, 3) SubINode(init2, ratio_init);
+Node* diff = new (C) SubINode(init2, ratio_init);
 _igvn.register_new_node_with_optimizer(diff, init2);
 set_early_ctrl(diff);
-Node* ratio_idx = new (C, 3) MulINode(phi, ratio);
+Node* ratio_idx = new (C) MulINode(phi, ratio);
 _igvn.register_new_node_with_optimizer(ratio_idx, phi);
 set_ctrl(ratio_idx, cl);
-Node* add = new (C, 3) AddINode(ratio_idx, diff);
+Node* add = new (C) AddINode(ratio_idx, diff);
 _igvn.register_new_node_with_optimizer(add);
 set_ctrl(add, cl);
 _igvn.replace_node( phi2, add );
 // Sometimes an induction variable is unused
 if (add->outcnt() == 0) {
 // optimizing an infinite loop?
 l = _ltree_root;        // Oops, found infinite loop
 if (!_verify_only) {
 // Insert the NeverBranch between 'm' and it's control user.
-NeverBranchNode *iff = new (C, 1) NeverBranchNode( m );
+NeverBranchNode *iff = new (C) NeverBranchNode( m );
 _igvn.register_new_node_with_optimizer(iff);
 set_loop(iff, l);
-Node *if_t = new (C, 1) CProjNode( iff, 0 );
+Node *if_t = new (C) CProjNode( iff, 0 );
 _igvn.register_new_node_with_optimizer(if_t);
 set_loop(if_t, l);
 Node* cfg = NULL;       // Find the One True Control User of m
 for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
 uint k = 0;             // Probably cfg->in(0)
 while( cfg->in(k) != m ) k++; // But check incase cfg is a Region
 cfg->set_req( k, if_t ); // Now point to NeverBranch
 // Now create the never-taken loop exit
-Node *if_f = new (C, 1) CProjNode( iff, 1 );
+Node *if_f = new (C) CProjNode( iff, 1 );
 _igvn.register_new_node_with_optimizer(if_f);
 set_loop(if_f, l);
 // Find frame ptr for Halt.  Relies on the optimizer
 // V-N'ing.  Easier and quicker than searching through
 // the program structure.
-Node *frame = new (C, 1) ParmNode( C->start(), TypeFunc::FramePtr );
+Node *frame = new (C) ParmNode( C->start(), TypeFunc::FramePtr );
 _igvn.register_new_node_with_optimizer(frame);
 // Halt & Catch Fire
-Node *halt = new (C, TypeFunc::Parms) HaltNode( if_f, frame );
+Node *halt = new (C) HaltNode( if_f, frame );
 _igvn.register_new_node_with_optimizer(halt);
 set_loop(halt, l);
 C->root()->add_req(halt);
 }
 set_loop(C->root(), _ltree_root);

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/opto/loopnode.cpp @ 6804:e626685e9f6c