archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 20:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7193318: C2: remove number of inputs requirement from Node's new operator

Browse source 
Deleted placement new operator of Node - node(size_t, Compile *, int).

Reviewed-by: kvn, twisti
This commit is contained in:
Bharadwaj Yadavalli 2012-09-27 09:38:42 -07:00 • committed by Vladimir Kozlov
parent 973fdc81a1
commit d5d2e78faa
44 changed files with 1456 additions and 1473 deletions
Download patch file Download diff file Expand all files Collapse all files

36
hotspot/src/share/vm/opto/superword.cpp
View file

@ -1451,13 +1451,13 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
if (t == NULL || t->_lo < 0 || t->_hi > (int)mask) {
cnt = ConNode::make(C, TypeInt::make(mask));
_igvn.register_new_node_with_optimizer(cnt);
cnt = new (C, 3) AndINode(opd, cnt);
cnt = new (C) AndINode(opd, cnt);
_igvn.register_new_node_with_optimizer(cnt);
_phase->set_ctrl(cnt, _phase->get_ctrl(opd));
}
assert(opd->bottom_type()->isa_int(), "int type only");
// Move non constant shift count into XMM register.
cnt = new (C, 2) MoveI2FNode(cnt);
cnt = new (C) MoveI2FNode(cnt);
}
if (cnt != opd) {
_igvn.register_new_node_with_optimizer(cnt);
@ -2021,42 +2021,42 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
if (align_to_ref_p.invar() != NULL) {
// incorporate any extra invariant piece producing (offset +/- invar) >>> log2(elt)
Node* log2_elt = _igvn.intcon(exact_log2(elt_size));
Node* aref = new (_phase->C, 3) URShiftINode(align_to_ref_p.invar(), log2_elt);
Node* aref = new (_phase->C) URShiftINode(align_to_ref_p.invar(), log2_elt);
_igvn.register_new_node_with_optimizer(aref);
_phase->set_ctrl(aref, pre_ctrl);
if (align_to_ref_p.negate_invar()) {
e = new (_phase->C, 3) SubINode(e, aref);
e = new (_phase->C) SubINode(e, aref);
} else {
e = new (_phase->C, 3) AddINode(e, aref);
e = new (_phase->C) AddINode(e, aref);
}
_igvn.register_new_node_with_optimizer(e);
_phase->set_ctrl(e, pre_ctrl);
}
if (vw > ObjectAlignmentInBytes) {
// incorporate base e +/- base && Mask >>> log2(elt)
Node* xbase = new(_phase->C, 2) CastP2XNode(NULL, align_to_ref_p.base());
Node* xbase = new(_phase->C) CastP2XNode(NULL, align_to_ref_p.base());
_igvn.register_new_node_with_optimizer(xbase);
#ifdef _LP64
xbase = new (_phase->C, 2) ConvL2INode(xbase);
xbase = new (_phase->C) ConvL2INode(xbase);
_igvn.register_new_node_with_optimizer(xbase);
#endif
Node* mask = _igvn.intcon(vw-1);
Node* masked_xbase = new (_phase->C, 3) AndINode(xbase, mask);
Node* masked_xbase = new (_phase->C) AndINode(xbase, mask);
_igvn.register_new_node_with_optimizer(masked_xbase);
Node* log2_elt = _igvn.intcon(exact_log2(elt_size));
Node* bref = new (_phase->C, 3) URShiftINode(masked_xbase, log2_elt);
Node* bref = new (_phase->C) URShiftINode(masked_xbase, log2_elt);
_igvn.register_new_node_with_optimizer(bref);
_phase->set_ctrl(bref, pre_ctrl);
e = new (_phase->C, 3) AddINode(e, bref);
e = new (_phase->C) AddINode(e, bref);
_igvn.register_new_node_with_optimizer(e);
_phase->set_ctrl(e, pre_ctrl);
}
// compute e +/- lim0
if (scale < 0) {
e = new (_phase->C, 3) SubINode(e, lim0);
e = new (_phase->C) SubINode(e, lim0);
} else {
e = new (_phase->C, 3) AddINode(e, lim0);
e = new (_phase->C) AddINode(e, lim0);
}
_igvn.register_new_node_with_optimizer(e);
_phase->set_ctrl(e, pre_ctrl);
@ -2064,13 +2064,13 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
if (stride * scale > 0) {
// compute V - (e +/- lim0)
Node* va = _igvn.intcon(v_align);
e = new (_phase->C, 3) SubINode(va, e);
e = new (_phase->C) SubINode(va, e);
_igvn.register_new_node_with_optimizer(e);
_phase->set_ctrl(e, pre_ctrl);
}
// compute N = (exp) % V
Node* va_msk = _igvn.intcon(v_align - 1);
Node* N = new (_phase->C, 3) AndINode(e, va_msk);
Node* N = new (_phase->C) AndINode(e, va_msk);
_igvn.register_new_node_with_optimizer(N);
_phase->set_ctrl(N, pre_ctrl);
@ -2078,15 +2078,15 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
// lim = lim0 + N
Node* lim;
if (stride < 0) {
lim = new (_phase->C, 3) SubINode(lim0, N);
lim = new (_phase->C) SubINode(lim0, N);
} else {
lim = new (_phase->C, 3) AddINode(lim0, N);
lim = new (_phase->C) AddINode(lim0, N);
}
_igvn.register_new_node_with_optimizer(lim);
_phase->set_ctrl(lim, pre_ctrl);
Node* constrained =
(stride > 0) ? (Node*) new (_phase->C,3) MinINode(lim, orig_limit)
: (Node*) new (_phase->C,3) MaxINode(lim, orig_limit);
(stride > 0) ? (Node*) new (_phase->C) MinINode(lim, orig_limit)
: (Node*) new (_phase->C) MaxINode(lim, orig_limit);
_igvn.register_new_node_with_optimizer(constrained);
_phase->set_ctrl(constrained, pre_ctrl);
_igvn.hash_delete(pre_opaq);