Skip to content

Commit fd910f7

Browse files
CptGitchhagedorn
CptGit
authored and
chhagedorn
committed
8297384: Add IR tests for existing idealizations of arithmetic nodes
Reviewed-by: chagedorn
1 parent cfe5a37 commit fd910f7

11 files changed

+596
-77
lines changed

‎test/hotspot/jtreg/compiler/c2/irTests/AddINodeIdealizationTests.java‎

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static void main(String[] args) {
4545
"test14", "test15", "test16",
4646
"test17", "test18", "test19",
4747
"test20", "test21", "test22",
48-
"test23"})
48+
"test23", "test24", "test25"})
4949
public void runMethod() {
5050
int a = RunInfo.getRandom().nextInt();
5151
int b = RunInfo.getRandom().nextInt();
@@ -63,31 +63,33 @@ public void runMethod() {
6363

6464
@DontCompile
6565
public void assertResult(int a, int b, int c, int d) {
66-
Asserts.assertEQ(((a+a) + (a+a)) , additions(a));
67-
Asserts.assertEQ(0 , xMinusX(a));
68-
Asserts.assertEQ(a + 1 + 2 , test1(a));
69-
Asserts.assertEQ((a + 2021) + b , test2(a, b));
70-
Asserts.assertEQ(a + (b + 2021) , test3(a, b));
71-
Asserts.assertEQ((1 - a) + 2 , test4(a));
72-
Asserts.assertEQ((a - b) + (c - d), test5(a, b, c, d));
73-
Asserts.assertEQ((a - b) + (b + c), test6(a, b, c));
74-
Asserts.assertEQ((a - b) + (c + b), test7(a, b, c));
75-
Asserts.assertEQ((a - b) + (b - c), test8(a, b, c));
76-
Asserts.assertEQ((a - b) + (c - a), test9(a, b, c));
77-
Asserts.assertEQ(a + (0 - b) , test10(a, b));
78-
Asserts.assertEQ((0 - b) + a , test11(a, b));
79-
Asserts.assertEQ((a - b) + b , test12(a, b));
80-
Asserts.assertEQ(b + (a - b) , test13(a, b));
81-
Asserts.assertEQ(a + 0 , test14(a));
82-
Asserts.assertEQ(0 + a , test15(a));
83-
Asserts.assertEQ(a*b + a*c , test16(a, b, c));
84-
Asserts.assertEQ(a*b + b*c , test17(a, b, c));
85-
Asserts.assertEQ(a*c + b*c , test18(a, b, c));
86-
Asserts.assertEQ(a*b + c*a , test19(a, b, c));
87-
Asserts.assertEQ((a - b) + 210 , test20(a, b));
88-
Asserts.assertEQ((a - b) + 190 , test21(a, b));
89-
Asserts.assertEQ((a - b) + 210 , test22(a, b));
90-
Asserts.assertEQ((a - b) + 190 , test23(a, b));
66+
Asserts.assertEQ(((a+a) + (a+a)) , additions(a));
67+
Asserts.assertEQ(0 , xMinusX(a));
68+
Asserts.assertEQ(a + 1 + 2 , test1(a));
69+
Asserts.assertEQ((a + 2021) + b , test2(a, b));
70+
Asserts.assertEQ(a + (b + 2021) , test3(a, b));
71+
Asserts.assertEQ((1 - a) + 2 , test4(a));
72+
Asserts.assertEQ((a - b) + (c - d) , test5(a, b, c, d));
73+
Asserts.assertEQ((a - b) + (b + c) , test6(a, b, c));
74+
Asserts.assertEQ((a - b) + (c + b) , test7(a, b, c));
75+
Asserts.assertEQ((a - b) + (b - c) , test8(a, b, c));
76+
Asserts.assertEQ((a - b) + (c - a) , test9(a, b, c));
77+
Asserts.assertEQ(a + (0 - b) , test10(a, b));
78+
Asserts.assertEQ((0 - b) + a , test11(a, b));
79+
Asserts.assertEQ((a - b) + b , test12(a, b));
80+
Asserts.assertEQ(b + (a - b) , test13(a, b));
81+
Asserts.assertEQ(a + 0 , test14(a));
82+
Asserts.assertEQ(0 + a , test15(a));
83+
Asserts.assertEQ(a*b + a*c , test16(a, b, c));
84+
Asserts.assertEQ(a*b + b*c , test17(a, b, c));
85+
Asserts.assertEQ(a*c + b*c , test18(a, b, c));
86+
Asserts.assertEQ(a*b + c*a , test19(a, b, c));
87+
Asserts.assertEQ((a - b) + 210 , test20(a, b));
88+
Asserts.assertEQ((a - b) + 190 , test21(a, b));
89+
Asserts.assertEQ((a - b) + 210 , test22(a, b));
90+
Asserts.assertEQ((a - b) + 190 , test23(a, b));
91+
Asserts.assertEQ(Math.max(a, b) + Math.min(a, b), test24(a, b));
92+
Asserts.assertEQ(Math.min(a, b) + Math.max(a, b), test25(a, b));
9193
}
9294

9395
@Test
@@ -293,4 +295,20 @@ public int test22(int x, int y) {
293295
public int test23(int x, int y) {
294296
return x + (-10 - y) + 200; // transformed to (x - y) + 190;
295297
}
298+
299+
@Test
300+
@IR(failOn = { IRNode.MAX, IRNode.MIN })
301+
@IR(counts = { IRNode.ADD, "1" })
302+
// Checks Math.max(a, b) + Math.min(a, b) => a + b
303+
public int test24(int a, int b) {
304+
return Math.max(a, b) + Math.min(a, b);
305+
}
306+
307+
@Test
308+
@IR(failOn = { IRNode.MAX, IRNode.MIN })
309+
@IR(counts = { IRNode.ADD, "1" })
310+
// Checks Math.min(a, b) + Math.max(a, b) => a + b
311+
public int test25(int a, int b) {
312+
return Math.min(a, b) + Math.max(a, b);
313+
}
296314
}

‎test/hotspot/jtreg/compiler/c2/irTests/AddLNodeIdealizationTests.java‎

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public static void main(String[] args) {
4444
"test11", "test12", "test13",
4545
"test14", "test15", "test16",
4646
"test17", "test18", "test19",
47-
"test20", "test21", "test22"})
47+
"test20", "test21", "test22",
48+
"test23", "test24"})
4849
public void runMethod() {
4950
long a = RunInfo.getRandom().nextLong();
5051
long b = RunInfo.getRandom().nextLong();
@@ -62,30 +63,32 @@ public void runMethod() {
6263

6364
@DontCompile
6465
public void assertResult(long a, long b, long c, long d) {
65-
Asserts.assertEQ(((a+a) + (a+a)) , additions(a));
66-
Asserts.assertEQ(0L , xMinusX(a));
67-
Asserts.assertEQ(a + 1 + 2 , test1(a));
68-
Asserts.assertEQ((a + 2021) + b , test2(a, b));
69-
Asserts.assertEQ(a + (b + 2021) , test3(a, b));
70-
Asserts.assertEQ((1 - a) + 2 , test4(a));
71-
Asserts.assertEQ((a - b) + (c - d) , test5(a, b, c, d));
72-
Asserts.assertEQ((a - b) + (b + c) , test6(a, b, c));
73-
Asserts.assertEQ((a - b) + (c + b) , test7(a, b, c));
74-
Asserts.assertEQ((a - b) + (c - a) , test8(a, b, c));
75-
Asserts.assertEQ(a + (0 - b) , test9(a, b));
76-
Asserts.assertEQ((0 - b) + a , test10(a, b));
77-
Asserts.assertEQ((a - b) + b , test11(a, b));
78-
Asserts.assertEQ(b + (a - b) , test12(a, b));
79-
Asserts.assertEQ(a + 0 , test13(a));
80-
Asserts.assertEQ(0 + a , test14(a));
81-
Asserts.assertEQ(a*b + a*c , test15(a, b, c));
82-
Asserts.assertEQ(a*b + b*c , test16(a, b, c));
83-
Asserts.assertEQ(a*c + b*c , test17(a, b, c));
84-
Asserts.assertEQ(a*b + c*a , test18(a, b, c));
85-
Asserts.assertEQ((a - b) + 123_456_789_123L , test19(a, b));
86-
Asserts.assertEQ((a - b) + -123_456_788_877L , test20(a, b));
87-
Asserts.assertEQ((a - b) + 123_456_789_123L , test21(a, b));
88-
Asserts.assertEQ((a - b) + -123_456_788_877L , test22(a, b));
66+
Asserts.assertEQ(((a+a) + (a+a)) , additions(a));
67+
Asserts.assertEQ(0L , xMinusX(a));
68+
Asserts.assertEQ(a + 1 + 2 , test1(a));
69+
Asserts.assertEQ((a + 2021) + b , test2(a, b));
70+
Asserts.assertEQ(a + (b + 2021) , test3(a, b));
71+
Asserts.assertEQ((1 - a) + 2 , test4(a));
72+
Asserts.assertEQ((a - b) + (c - d) , test5(a, b, c, d));
73+
Asserts.assertEQ((a - b) + (b + c) , test6(a, b, c));
74+
Asserts.assertEQ((a - b) + (c + b) , test7(a, b, c));
75+
Asserts.assertEQ((a - b) + (c - a) , test8(a, b, c));
76+
Asserts.assertEQ(a + (0 - b) , test9(a, b));
77+
Asserts.assertEQ((0 - b) + a , test10(a, b));
78+
Asserts.assertEQ((a - b) + b , test11(a, b));
79+
Asserts.assertEQ(b + (a - b) , test12(a, b));
80+
Asserts.assertEQ(a + 0 , test13(a));
81+
Asserts.assertEQ(0 + a , test14(a));
82+
Asserts.assertEQ(a*b + a*c , test15(a, b, c));
83+
Asserts.assertEQ(a*b + b*c , test16(a, b, c));
84+
Asserts.assertEQ(a*c + b*c , test17(a, b, c));
85+
Asserts.assertEQ(a*b + c*a , test18(a, b, c));
86+
Asserts.assertEQ((a - b) + 123_456_789_123L , test19(a, b));
87+
Asserts.assertEQ((a - b) + -123_456_788_877L , test20(a, b));
88+
Asserts.assertEQ((a - b) + 123_456_789_123L , test21(a, b));
89+
Asserts.assertEQ((a - b) + -123_456_788_877L , test22(a, b));
90+
Asserts.assertEQ(Math.max(a, b) + Math.min(a, b), test23(a, b));
91+
Asserts.assertEQ(Math.min(a, b) + Math.max(a, b), test24(a, b));
8992
}
9093

9194
@Test
@@ -287,4 +290,20 @@ public long test22(long x, long y) {
287290
return x + (-123_456_789_000L - y) + 123;
288291
// transformed to (x - y) + -123_456_788_877L;
289292
}
293+
294+
@Test
295+
@IR(failOn = { IRNode.MAX, IRNode.MIN })
296+
@IR(counts = { IRNode.ADD, "1" })
297+
// Checks Math.max(a, b) + Math.min(a, b) => a + b
298+
public long test23(long a, long b) {
299+
return Math.max(a, b) + Math.min(a, b);
300+
}
301+
302+
@Test
303+
@IR(failOn = { IRNode.MAX, IRNode.MIN })
304+
@IR(counts = { IRNode.ADD, "1" })
305+
// Checks Math.min(a, b) + Math.max(a, b) => a + b
306+
public long test24(long a, long b) {
307+
return Math.min(a, b) + Math.max(a, b);
308+
}
290309
}

‎test/hotspot/jtreg/compiler/c2/irTests/AndINodeIdealizationTests.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
package compiler.c2.irTests;
24+
25+
import jdk.test.lib.Asserts;
26+
import compiler.lib.ir_framework.*;
27+
28+
/*
29+
* @test
30+
* @bug 8297384
31+
* @summary Test that Ideal transformations of AndINode* are being performed as expected.
32+
* @library /test/lib /
33+
* @run driver compiler.c2.irTests.AndINodeIdealizationTests
34+
*/
35+
public class AndINodeIdealizationTests {
36+
37+
public static void main(String[] args) {
38+
TestFramework.run();
39+
}
40+
41+
@Run(test = { "test1" })
42+
public void runMethod() {
43+
int a = RunInfo.getRandom().nextInt();
44+
45+
int min = Integer.MIN_VALUE;
46+
int max = Integer.MAX_VALUE;
47+
48+
assertResult(0);
49+
assertResult(a);
50+
assertResult(min);
51+
assertResult(max);
52+
}
53+
54+
@DontCompile
55+
public void assertResult(int a) {
56+
Asserts.assertEQ((0 - a) & 1, test1(a));
57+
}
58+
59+
@Test
60+
@IR(failOn = { IRNode.SUB })
61+
@IR(counts = { IRNode.AND, "1" })
62+
// Checks (0 - x) & 1 => x & 1
63+
public int test1(int x) {
64+
return (0 - x) & 1;
65+
}
66+
}

‎test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
package compiler.c2.irTests;
24+
25+
import jdk.test.lib.Asserts;
26+
import compiler.lib.ir_framework.*;
27+
28+
/*
29+
* @test
30+
* @bug 8297384
31+
* @summary Test that Ideal transformations of LShiftINode* are being performed as expected.
32+
* @library /test/lib /
33+
* @run driver compiler.c2.irTests.LShiftINodeIdealizationTests
34+
*/
35+
public class LShiftINodeIdealizationTests {
36+
public static void main(String[] args) {
37+
TestFramework.run();
38+
}
39+
40+
@Run(test = { "test1", "test2" })
41+
public void runMethod() {
42+
int a = RunInfo.getRandom().nextInt();
43+
44+
int min = Integer.MIN_VALUE;
45+
int max = Integer.MAX_VALUE;
46+
47+
assertResult(0);
48+
assertResult(a);
49+
assertResult(min);
50+
assertResult(max);
51+
}
52+
53+
@DontCompile
54+
public void assertResult(int a) {
55+
Asserts.assertEQ((a >> 2022) << 2022, test1(a));
56+
Asserts.assertEQ((a >>> 2022) << 2022, test2(a));
57+
}
58+
59+
@Test
60+
@IR(failOn = { IRNode.LSHIFT, IRNode.RSHIFT })
61+
@IR(counts = { IRNode.AND, "1" })
62+
// Checks (x >> 2022) << 2022 => x & C where C = -(1 << 6)
63+
public int test1(int x) {
64+
return (x >> 2022) << 2022;
65+
}
66+
67+
@Test
68+
@IR(failOn = { IRNode.LSHIFT, IRNode.URSHIFT })
69+
@IR(counts = { IRNode.AND, "1" })
70+
// Checks (x >>> 2022) << 2022 => x & C where C = -(1 << 6)
71+
public int test2(int x) {
72+
return (x >>> 2022) << 2022;
73+
}
74+
}

‎test/hotspot/jtreg/compiler/c2/irTests/MulINodeIdealizationTests.java‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public static void main(String[] args) {
4040
@Run(test = {"combineConstants", "moveConstants", "moveConstantsAgain",
4141
"multiplyZero", "multiplyZeroAgain", "distribute",
4242
"identity", "identityAgain", "powerTwo",
43-
"powerTwoAgain", "powerTwoPlusOne", "powerTwoMinusOne"})
43+
"powerTwoAgain", "powerTwoPlusOne", "powerTwoMinusOne",
44+
"negativeCancelledOut", "maxMin"})
4445
public void runMethod() {
4546
int a = RunInfo.getRandom().nextInt();
4647
int b = RunInfo.getRandom().nextInt();
@@ -56,18 +57,20 @@ public void runMethod() {
5657

5758
@DontCompile
5859
public void assertResult(int a, int b) {
59-
Asserts.assertEQ((a * 13) * 14 , combineConstants(a));
60-
Asserts.assertEQ((a * 13) * b , moveConstants(a, b));
61-
Asserts.assertEQ(a * (b * 13) , moveConstantsAgain(a, b));
62-
Asserts.assertEQ(0 * a , multiplyZero(a));
63-
Asserts.assertEQ(a * 0 , multiplyZeroAgain(a));
64-
Asserts.assertEQ((13 + a) * 14 , distribute(a));
65-
Asserts.assertEQ(1 * a , identity(a));
66-
Asserts.assertEQ(a * 1 , identityAgain(a));
67-
Asserts.assertEQ(a * 64 , powerTwo(a));
68-
Asserts.assertEQ(a * (1025 - 1), powerTwoAgain(a));
69-
Asserts.assertEQ(a * (64 + 1) , powerTwoPlusOne(a));
70-
Asserts.assertEQ(a * (64 - 1) , powerTwoMinusOne(a));
60+
Asserts.assertEQ((a * 13) * 14 , combineConstants(a));
61+
Asserts.assertEQ((a * 13) * b , moveConstants(a, b));
62+
Asserts.assertEQ(a * (b * 13) , moveConstantsAgain(a, b));
63+
Asserts.assertEQ(0 * a , multiplyZero(a));
64+
Asserts.assertEQ(a * 0 , multiplyZeroAgain(a));
65+
Asserts.assertEQ((13 + a) * 14 , distribute(a));
66+
Asserts.assertEQ(1 * a , identity(a));
67+
Asserts.assertEQ(a * 1 , identityAgain(a));
68+
Asserts.assertEQ(a * 64 , powerTwo(a));
69+
Asserts.assertEQ(a * (1025 - 1) , powerTwoAgain(a));
70+
Asserts.assertEQ(a * (64 + 1) , powerTwoPlusOne(a));
71+
Asserts.assertEQ(a * (64 - 1) , powerTwoMinusOne(a));
72+
Asserts.assertEQ((0 - a) * (0 - b) , negativeCancelledOut(a, b));
73+
Asserts.assertEQ(Math.max(a, b) * Math.min(a, b), maxMin(a, b));
7174
}
7275

7376
@Test
@@ -163,4 +166,20 @@ public int powerTwoPlusOne(int x) {
163166
public int powerTwoMinusOne(int x) {
164167
return x * (64 - 1);
165168
}
169+
170+
@Test
171+
@IR(failOn = { IRNode.SUB })
172+
@IR(counts = { IRNode.MUL, "1" })
173+
// Checks (0 - x) * (0 - y) => x * y
174+
public int negativeCancelledOut(int x, int y) {
175+
return (0 - x) * (0 - y);
176+
}
177+
178+
@Test
179+
@IR(failOn = { IRNode.MAX, IRNode.MIN })
180+
@IR(counts = { IRNode.MUL, "1" })
181+
// Checks Math.max(x, y) * Math.min(x, y) => x * y
182+
public int maxMin(int x, int y) {
183+
return Math.max(x, y) * Math.min(x, y);
184+
}
166185
}

0 commit comments

Comments
 (0)