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

7052494: Eclipse test fails on JDK 7 b142

Browse Source 
Keep 'ne' test in Counted loop when we can't guarantee during compilation that init < limit.

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2011-06-20 16:45:35 -07:00
parent 5d2e4e676b
commit d19a8f6e35
3 changed files with 172 additions and 3 deletions
hotspot
src/share/vm/opto
loopTransform.cpploopnode.cpp
test/compiler/7052494
Test7052494.java

6
hotspot/src/share/vm/opto/loopTransform.cpp

@ -83,7 +83,7 @@ void IdealLoopTree::compute_exact_trip_count( PhaseIdealLoop *phase ) {
#ifdef ASSERT
BoolTest::mask bt = cl->loopexit()->test_trip();
assert(bt == BoolTest::lt || bt == BoolTest::gt ||
(bt == BoolTest::ne && !LoopLimitCheck), "canonical test is expected");
bt == BoolTest::ne, "canonical test is expected");
#endif
Node* init_n = cl->init_trip();
@ -1070,9 +1070,11 @@ void PhaseIdealLoop::insert_pre_post_loops( IdealLoopTree *loop, Node_List &old_
// direction:
// positive stride use <
// negative stride use >
//
// not-equal test is kept for post loop to handle case
// when init > limit when stride > 0 (and reverse).
if (pre_end->in(CountedLoopEndNode::TestValue)->as_Bool()->_test._test == BoolTest::ne) {
assert(!LoopLimitCheck, "only canonical tests (lt or gt) are expected");
BoolTest::mask new_test = (main_end->stride_con() > 0) ? BoolTest::lt : BoolTest::gt;
// Modify pre loop end condition

7
hotspot/src/share/vm/opto/loopnode.cpp

@ -453,7 +453,12 @@ bool PhaseIdealLoop::is_counted_loop( Node *x, IdealLoopTree *loop ) {
// Now we need to canonicalize loop condition.
if (bt == BoolTest::ne) {
assert(stride_con == 1 || stride_con == -1, "simple increment only");
bt = (stride_con > 0) ? BoolTest::lt : BoolTest::gt;
// 'ne' can be replaced with 'lt' only when init < limit.
if (stride_con > 0 && init_t->_hi < limit_t->_lo)
bt = BoolTest::lt;
// 'ne' can be replaced with 'gt' only when init > limit.
if (stride_con < 0 && init_t->_lo > limit_t->_hi)
bt = BoolTest::gt;
}
if (incl_limit) {

162
hotspot/test/compiler/7052494/Test7052494.java Normal file

@ -0,0 +1,162 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
/**
* @test
* @bug 7052494
* @summary Eclipse test fails on JDK 7 b142
*
* @run main/othervm -Xbatch Test7052494
*/
public class Test7052494 {
static int test1(int i, int limit) {
int result = 0;
while (i++ != 0) {
if (result >= limit)
break;
result = i*2;
}
return result;
}
static int test2(int i, int limit) {
int result = 0;
while (i-- != 0) {
if (result <= limit)
break;
result = i*2;
}
return result;
}
static void test3(int i, int limit, int arr[]) {
while (i++ != 0) {
if (arr[i-1] >= limit)
break;
arr[i] = i*2;
}
}
static void test4(int i, int limit, int arr[]) {
while (i-- != 0) {
if (arr[arr.length + i + 1] <= limit)
break;
arr[arr.length + i] = i*2;
}
}
// Empty loop rolls through MAXINT if i > 0
static int test5(int i) {
int result = 0;
while (i++ != 0) {
result = i*2;
}
return result;
}
// Empty loop rolls through MININT if i < 0
static int test6(int i) {
int result = 0;
while (i-- != 0) {
result = i*2;
}
return result;
}
public static void main(String [] args) {
boolean failed = false;
int[] arr = new int[8];
int[] ar3 = { 0, 0, 4, 6, 8, 10, 0, 0 };
int[] ar4 = { 0, 0, 0, -10, -8, -6, -4, 0 };
for (int i = 0; i < 11000; i++) {
int k = test1(1, 10);
if (k != 10) {
System.out.println("FAILED: " + k + " != 10");
failed = true;
break;
}
}
for (int i = 0; i < 11000; i++) {
int k = test2(-1, -10);
if (k != -10) {
System.out.println("FAILED: " + k + " != -10");
failed = true;
break;
}
}
for (int i = 0; i < 11000; i++) {
java.util.Arrays.fill(arr, 0);
test3(1, 10, arr);
if (!java.util.Arrays.equals(arr,ar3)) {
System.out.println("FAILED: arr = { " + arr[0] + ", "
+ arr[1] + ", "
+ arr[2] + ", "
+ arr[3] + ", "
+ arr[4] + ", "
+ arr[5] + ", "
+ arr[6] + ", "
+ arr[7] + " }");
failed = true;
break;
}
}
for (int i = 0; i < 11000; i++) {
java.util.Arrays.fill(arr, 0);
test4(-1, -10, arr);
if (!java.util.Arrays.equals(arr,ar4)) {
System.out.println("FAILED: arr = { " + arr[0] + ", "
+ arr[1] + ", "
+ arr[2] + ", "
+ arr[3] + ", "
+ arr[4] + ", "
+ arr[5] + ", "
+ arr[6] + ", "
+ arr[7] + " }");
failed = true;
break;
}
}
for (int i = 0; i < 11000; i++) {
int k = test5(1);
if (k != 0) {
System.out.println("FAILED: " + k + " != 0");
failed = true;
break;
}
}
for (int i = 0; i < 11000; i++) {
int k = test6(-1);
if (k != 0) {
System.out.println("FAILED: " + k + " != 0");
failed = true;
break;
}
}
if (failed)
System.exit(97);
}
}