stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6663621: JVM crashes while trying to execute api/java_security/Signature/SignatureTests.html#initSign tests

Browse Source 
Alignment expression with secondary induction variables is sometimes wrong

Reviewed-by: kvn, rasbold
This commit is contained in:
Tom Rodriguez 2008-03-20 10:43:42 -07:00
parent b71360f557
commit a2b4f55757
2 changed files with 211 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
hotspot/src/share/vm/opto/superword.cpp
View File

@ -183,8 +183,8 @@ void SuperWord::find_adjacent_refs() {
#ifndef PRODUCT #ifndef PRODUCT
if (TraceSuperWord) if (TraceSuperWord)
tty->print_cr("\noffset = %d iv_adjustment = %d elt_align = %d", tty->print_cr("\noffset = %d iv_adjustment = %d elt_align = %d scale = %d iv_stride = %d",
offset, iv_adjustment, align_to_ref_p.memory_size()); offset, iv_adjustment, align_to_ref_p.memory_size(), align_to_ref_p.scale_in_bytes(), iv_stride());
#endif #endif
// Set alignment relative to "align_to_ref" // Set alignment relative to "align_to_ref"
@ -1543,7 +1543,7 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
Node *pre_opaq1 = pre_end->limit(); Node *pre_opaq1 = pre_end->limit();
assert(pre_opaq1->Opcode() == Op_Opaque1, ""); assert(pre_opaq1->Opcode() == Op_Opaque1, "");
Opaque1Node *pre_opaq = (Opaque1Node*)pre_opaq1; Opaque1Node *pre_opaq = (Opaque1Node*)pre_opaq1;
Node *pre_limit = pre_opaq->in(1); Node *lim0 = pre_opaq->in(1);
// Where we put new limit calculations // Where we put new limit calculations
Node *pre_ctrl = pre_end->loopnode()->in(LoopNode::EntryControl); Node *pre_ctrl = pre_end->loopnode()->in(LoopNode::EntryControl);
@ -1555,64 +1555,116 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
SWPointer align_to_ref_p(align_to_ref, this); SWPointer align_to_ref_p(align_to_ref, this);
// Let l0 == original pre_limit, l == new pre_limit, V == v_align // Given:
// lim0 == original pre loop limit
// V == v_align (power of 2)
// invar == extra invariant piece of the address expression
// e == k [ +/- invar ]
// //
// For stride > 0 // When reassociating expressions involving '%' the basic rules are:
// Need l such that l > l0 && (l+k)%V == 0 // (a - b) % k == 0 => a % k == b % k
// Find n such that l = (l0 + n) // and:
// (l0 + n + k) % V == 0 // (a + b) % k == 0 => a % k == (k - b) % k
// n = [V - (l0 + k)%V]%V //
// new limit = l0 + [V - (l0 + k)%V]%V // For stride > 0 && scale > 0,
// For stride < 0 // Derive the new pre-loop limit "lim" such that the two constraints:
// Need l such that l < l0 && (l+k)%V == 0 // (1) lim = lim0 + N (where N is some positive integer < V)
// Find n such that l = (l0 - n) // (2) (e + lim) % V == 0
// (l0 - n + k) % V == 0 // are true.
// n = (l0 + k)%V //
// new limit = l0 - (l0 + k)%V // Substituting (1) into (2),
// (e + lim0 + N) % V == 0
// solve for N:
// N = (V - (e + lim0)) % V
// substitute back into (1), so that new limit
// lim = lim0 + (V - (e + lim0)) % V
//
// For stride > 0 && scale < 0
// Constraints:
// lim = lim0 + N
// (e - lim) % V == 0
// Solving for lim:
// (e - lim0 - N) % V == 0
// N = (e - lim0) % V
// lim = lim0 + (e - lim0) % V
//
// For stride < 0 && scale > 0
// Constraints:
// lim = lim0 - N
// (e + lim) % V == 0
// Solving for lim:
// (e + lim0 - N) % V == 0
// N = (e + lim0) % V
// lim = lim0 - (e + lim0) % V
//
// For stride < 0 && scale < 0
// Constraints:
// lim = lim0 - N
// (e - lim) % V == 0
// Solving for lim:
// (e - lim0 + N) % V == 0
// N = (V - (e - lim0)) % V
// lim = lim0 - (V - (e - lim0)) % V
int stride = iv_stride();
int scale = align_to_ref_p.scale_in_bytes();
int elt_size = align_to_ref_p.memory_size(); int elt_size = align_to_ref_p.memory_size();
int v_align = vector_width_in_bytes() / elt_size; int v_align = vector_width_in_bytes() / elt_size;
int k = align_to_ref_p.offset_in_bytes() / elt_size; int k = align_to_ref_p.offset_in_bytes() / elt_size;
Node *kn = _igvn.intcon(k); Node *kn = _igvn.intcon(k);
Node *limk = new (_phase->C, 3) AddINode(pre_limit, kn);
_phase->_igvn.register_new_node_with_optimizer(limk); Node *e = kn;
_phase->set_ctrl(limk, pre_ctrl);
if (align_to_ref_p.invar() != NULL) { if (align_to_ref_p.invar() != NULL) {
// incorporate any extra invariant piece producing k +/- invar >>> log2(elt)
Node* log2_elt = _igvn.intcon(exact_log2(elt_size)); 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, 3) URShiftINode(align_to_ref_p.invar(), log2_elt);
_phase->_igvn.register_new_node_with_optimizer(aref); _phase->_igvn.register_new_node_with_optimizer(aref);
_phase->set_ctrl(aref, pre_ctrl); _phase->set_ctrl(aref, pre_ctrl);
if (!align_to_ref_p.negate_invar()) { if (align_to_ref_p.negate_invar()) {
limk = new (_phase->C, 3) AddINode(limk, aref); e = new (_phase->C, 3) SubINode(e, aref);
} else { } else {
limk = new (_phase->C, 3) SubINode(limk, aref); e = new (_phase->C, 3) AddINode(e, aref);
} }
_phase->_igvn.register_new_node_with_optimizer(limk); _phase->_igvn.register_new_node_with_optimizer(e);
_phase->set_ctrl(limk, pre_ctrl); _phase->set_ctrl(e, pre_ctrl);
} }
Node* va_msk = _igvn.intcon(v_align - 1);
Node* n = new (_phase->C, 3) AndINode(limk, va_msk); // compute e +/- lim0
_phase->_igvn.register_new_node_with_optimizer(n); if (scale < 0) {
_phase->set_ctrl(n, pre_ctrl); e = new (_phase->C, 3) SubINode(e, lim0);
Node* newlim;
if (iv_stride() > 0) {
Node* va = _igvn.intcon(v_align);
Node* adj = new (_phase->C, 3) SubINode(va, n);
_phase->_igvn.register_new_node_with_optimizer(adj);
_phase->set_ctrl(adj, pre_ctrl);
Node* adj2 = new (_phase->C, 3) AndINode(adj, va_msk);
_phase->_igvn.register_new_node_with_optimizer(adj2);
_phase->set_ctrl(adj2, pre_ctrl);
newlim = new (_phase->C, 3) AddINode(pre_limit, adj2);
} else { } else {
newlim = new (_phase->C, 3) SubINode(pre_limit, n); e = new (_phase->C, 3) AddINode(e, lim0);
} }
_phase->_igvn.register_new_node_with_optimizer(newlim); _phase->_igvn.register_new_node_with_optimizer(e);
_phase->set_ctrl(newlim, pre_ctrl); _phase->set_ctrl(e, pre_ctrl);
if (stride * scale > 0) {
// compute V - (e +/- lim0)
Node* va = _igvn.intcon(v_align);
e = new (_phase->C, 3) SubINode(va, e);
_phase->_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);
_phase->_igvn.register_new_node_with_optimizer(N);
_phase->set_ctrl(N, pre_ctrl);
// substitute back into (1), so that new limit
// lim = lim0 + N
Node* lim;
if (stride < 0) {
lim = new (_phase->C, 3) SubINode(lim0, N);
} else {
lim = new (_phase->C, 3) AddINode(lim0, N);
}
_phase->_igvn.register_new_node_with_optimizer(lim);
_phase->set_ctrl(lim, pre_ctrl);
Node* constrained = Node* constrained =
(iv_stride() > 0) ? (Node*) new (_phase->C,3) MinINode(newlim, orig_limit) (stride > 0) ? (Node*) new (_phase->C,3) MinINode(lim, orig_limit)
: (Node*) new (_phase->C,3) MaxINode(newlim, orig_limit); : (Node*) new (_phase->C,3) MaxINode(lim, orig_limit);
_phase->_igvn.register_new_node_with_optimizer(constrained); _phase->_igvn.register_new_node_with_optimizer(constrained);
_phase->set_ctrl(constrained, pre_ctrl); _phase->set_ctrl(constrained, pre_ctrl);
_igvn.hash_delete(pre_opaq); _igvn.hash_delete(pre_opaq);

116
hotspot/test/compiler/6663621/IVTest.java Normal file
View File

@ -0,0 +1,116 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
/**
* @test
* @bug 6663621
* @summary JVM crashes while trying to execute api/java_security/Signature/SignatureTests.html#initSign tests.
*/
public class IVTest {
static int paddedSize;
static void padV15(byte[] padded) {
int psSize = padded.length;
int k = 0;
while (psSize-- > 0) {
padded[k++] = (byte)0xff;
}
}
static void padV15_2(int paddedSize) {
byte[] padded = new byte[paddedSize];
int psSize = padded.length;
int k = 0;
while (psSize-- > 0) {
padded[k++] = (byte)0xff;
}
}
static void padV15_3() {
byte[] padded = new byte[paddedSize];
int psSize = padded.length;
int k = 0;
while (psSize-- > 0) {
padded[k++] = (byte)0xff;
}
}
static void padV15_4() {
byte[] padded = new byte[paddedSize];
int psSize = padded.length;
for (int k = 0;psSize > 0; psSize--) {
int i = padded.length - psSize;
padded[i] = (byte)0xff;
}
}
static void padV15_5() {
byte[] padded = new byte[paddedSize];
int psSize = padded.length;
int k = psSize - 1;
for (int i = 0; i < psSize; i++) {
padded[k--] = (byte)0xff;
}
}
public static void main(String argv[]) {
int bounds = 1024;
int lim = 500000;
long start = System.currentTimeMillis();
for (int j = 0; j < lim; j++) {
paddedSize = j % bounds;
padV15(new byte[paddedSize]);
}
long end = System.currentTimeMillis();
System.out.println(end - start);
start = System.currentTimeMillis();
for (int j = 0; j < lim; j++) {
paddedSize = j % bounds;
padV15_2(paddedSize);
}
end = System.currentTimeMillis();
System.out.println(end - start);
start = System.currentTimeMillis();
for (int j = 0; j < lim; j++) {
paddedSize = j % bounds;
padV15_3();
}
end = System.currentTimeMillis();
System.out.println(end - start);
start = System.currentTimeMillis();
for (int j = 0; j < lim; j++) {
paddedSize = j % bounds;
padV15_4();
}
end = System.currentTimeMillis();
System.out.println(end - start);
start = System.currentTimeMillis();
for (int j = 0; j < lim; j++) {
paddedSize = j % bounds;
padV15_5();
}
end = System.currentTimeMillis();
System.out.println(end - start);
}
}