Skip to content

Commit 8d9ad97

Browse files
eme64eme64
committed
8324641: [IR Framework] Add Setup method to provide custom arguments and set fields
Reviewed-by: chagedorn, thartmann
1 parent b797652 commit 8d9ad97

28 files changed

+1115
-268
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public GenericHolder(Object obj) {
7878
}
7979

8080
@Test
81-
@Arguments({ Argument.RANDOM_EACH })
81+
@Arguments(values = { Argument.RANDOM_EACH })
8282
@IR(failOn = { IRNode.ALLOC })
8383
public static int testSlow(int val) {
8484
MyClass obj = new MyClass(val);
@@ -88,7 +88,7 @@ public static int testSlow(int val) {
8888
}
8989

9090
@Test
91-
@Arguments({ Argument.RANDOM_EACH })
91+
@Arguments(values = { Argument.RANDOM_EACH })
9292
@IR(failOn = { IRNode.ALLOC })
9393
public static int testFast(int val) {
9494
MyClass obj = new MyClass(val);
@@ -119,7 +119,7 @@ public C(B b) {
119119
}
120120

121121
@Test
122-
@Arguments({ Argument.RANDOM_EACH })
122+
@Arguments(values = { Argument.RANDOM_EACH })
123123
@IR(failOn = { IRNode.ALLOC })
124124
static int testNested(int i) {
125125
C c = new C(new B(new A(i)));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void main(String[] args) {
4141
}
4242

4343
@Test
44-
@Arguments({Argument.MAX}) // the argument needs to be big enough to fall out of cache.
44+
@Arguments(values = {Argument.MAX}) // the argument needs to be big enough to fall out of cache.
4545
@IR(failOn = {IRNode.ALLOC_OF, "Integer"})
4646
public static int boxing_object(int value) {
4747
Integer ii = Integer.valueOf(value);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void main(String[] args) {
4040

4141
@Test
4242
@IR(counts = { IRNode.ADD_I, "1", IRNode.LSHIFT_I, "2" })
43-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
43+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
4444
public static float invPlusVarLshiftInt(int inv, int scale) {
4545
float res = 0;
4646
for (int i = 1; i < 100; i *= 11) {
@@ -51,7 +51,7 @@ public static float invPlusVarLshiftInt(int inv, int scale) {
5151

5252
@Test
5353
@IR(counts = { IRNode.ADD_L, "1", IRNode.LSHIFT_L, "2" })
54-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
54+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
5555
public static float invPlusVarLshiftLong(long inv, int scale) {
5656
float res = 0;
5757
for (long i = 1; i < 100; i *= 11) {
@@ -62,7 +62,7 @@ public static float invPlusVarLshiftLong(long inv, int scale) {
6262

6363
@Test
6464
@IR(counts = { IRNode.ADD_I, "1", IRNode.SUB_I, "1", IRNode.LSHIFT_I, "2" })
65-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
65+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
6666
public static float invMinusVarLshiftInt(int inv, int scale) {
6767
float res = 0;
6868
for (int i = 1; i < 100; i *= 11) {
@@ -73,7 +73,7 @@ public static float invMinusVarLshiftInt(int inv, int scale) {
7373

7474
@Test
7575
@IR(counts = { IRNode.ADD_L, "1", IRNode.SUB_L, "1", IRNode.LSHIFT_L, "2" })
76-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
76+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
7777
public static float invMinusVarLshiftLong(long inv, int scale) {
7878
float res = 0;
7979
for (long i = 1; i < 100; i *= 11) {
@@ -84,7 +84,7 @@ public static float invMinusVarLshiftLong(long inv, int scale) {
8484

8585
@Test
8686
@IR(counts = { IRNode.ADD_I, "1", IRNode.SUB_I, "1", IRNode.LSHIFT_I, "2" })
87-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
87+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
8888
public static float varMinusInvLshiftInt(int inv, int scale) {
8989
float res = 0;
9090
for (int i = 1; i < 100; i *= 11) {
@@ -95,7 +95,7 @@ public static float varMinusInvLshiftInt(int inv, int scale) {
9595

9696
@Test
9797
@IR(counts = { IRNode.ADD_L, "1", IRNode.SUB_L, "1", IRNode.LSHIFT_L, "2" })
98-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
98+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
9999
public static float varMinusInvLshiftLong(long inv, int scale) {
100100
float res = 0;
101101
for (long i = 1; i < 100; i *= 11) {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static void main(String[] args) {
4444
}
4545

4646
@Test
47-
@Arguments(Argument.RANDOM_EACH)
47+
@Arguments(values = Argument.RANDOM_EACH)
4848
@IR(failOn = { IRNode.AND_I, IRNode.LSHIFT_I })
4949
public static int shiftMaskInt(int i) {
5050
return (i << 2) & 3; // transformed to: return 0;
@@ -58,7 +58,7 @@ public static void checkShiftMaskInt(int res) {
5858
}
5959

6060
@Test
61-
@Arguments(Argument.RANDOM_EACH)
61+
@Arguments(values = Argument.RANDOM_EACH)
6262
@IR(failOn = { IRNode.AND_L, IRNode.LSHIFT_L })
6363
public static long shiftMaskLong(long i) {
6464
return (i << 2) & 3; // transformed to: return 0;
@@ -75,7 +75,7 @@ public static void checkShiftMaskLong(long res) {
7575
static volatile int barrier;
7676

7777
@Test
78-
@Arguments({Argument.RANDOM_EACH, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
78+
@Arguments(values = {Argument.RANDOM_EACH, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
7979
@IR(failOn = { IRNode.AND_I, IRNode.LSHIFT_I })
8080
public static int shiftNonConstMaskInt(int i, boolean flag) {
8181
int mask;
@@ -96,7 +96,7 @@ public static void checkShiftNonConstMaskInt(int res) {
9696
}
9797

9898
@Test
99-
@Arguments({Argument.RANDOM_EACH, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
99+
@Arguments(values = {Argument.RANDOM_EACH, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
100100
@IR(failOn = { IRNode.AND_L, IRNode.LSHIFT_L })
101101
public static long shiftNonConstMaskLong(long i, boolean flag) {
102102
long mask;
@@ -207,7 +207,7 @@ public static void addSshiftNonConstMaskLong_runner() {
207207
}
208208

209209
@Test
210-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
210+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
211211
@IR(failOn = { IRNode.AND_I, IRNode.ADD_I, IRNode.LSHIFT_I })
212212
public static int addShiftMaskInt2(int i, int j) {
213213
return ((j << 2) + (i << 2)) & 3; // transformed to: return 0;
@@ -221,7 +221,7 @@ public static void checkAddShiftMaskInt2(int res) {
221221
}
222222

223223
@Test
224-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
224+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
225225
@IR(failOn = { IRNode.AND_L, IRNode.ADD_L, IRNode.LSHIFT_L })
226226
public static long addShiftMaskLong2(long i, long j) {
227227
return ((j << 2) + (i << 2)) & 3; // transformed to: return 0;
@@ -274,7 +274,7 @@ public static void addShiftMaskLong3_runner() {
274274
}
275275

276276
@Test
277-
@Arguments({Argument.RANDOM_EACH})
277+
@Arguments(values = {Argument.RANDOM_EACH})
278278
@IR(failOn = { IRNode.AND_L, IRNode.LSHIFT_I, IRNode.CONV_I2L })
279279
public static long shiftConvMask(int i) {
280280
return ((long)(i << 2)) & 3; // transformed to: return 0;
@@ -288,7 +288,7 @@ public static void checkShiftConvMask(long res) {
288288
}
289289

290290
@Test
291-
@Arguments({Argument.RANDOM_EACH, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
291+
@Arguments(values = {Argument.RANDOM_EACH, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
292292
@IR(failOn = { IRNode.AND_L, IRNode.LSHIFT_I, IRNode.CONV_I2L })
293293
public static long shiftNotConstConvMask(int i, boolean flag) {
294294
long mask;
@@ -326,7 +326,7 @@ public static void addShiftConvMask_runner() {
326326
}
327327

328328
@Test
329-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
329+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
330330
@IR(failOn = { IRNode.AND_L, IRNode.ADD_L, IRNode.LSHIFT_I, IRNode.CONV_I2L })
331331
public static long addShiftConvMask2(int i, int j) {
332332
return (((long)(j << 2)) + ((long)(i << 2))) & 3; // transformed to: return 0;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,31 @@ public static void main(String[] args) {
4343
}
4444

4545
@Test
46-
@Arguments({Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
46+
@Arguments(values = {Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
4747
@IR(failOn = {IRNode.ADD_I})
4848
@IR(counts = {IRNode.SUB_I, "1"})
4949
public int test1Int(int a, int b, int c) {
5050
return (a - b) + (b - c); // transformed to a - c rather than (a + b) - (b + c)
5151
}
5252

5353
@Test
54-
@Arguments({Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
54+
@Arguments(values = {Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
5555
@IR(failOn = {IRNode.ADD_L})
5656
@IR(counts = {IRNode.SUB_L, "1"})
5757
public long test1Long(long a, long b, long c) {
5858
return (a - b) + (b - c); // transformed to a - c rather than (a + b) - (b + c)
5959
}
6060

6161
@Test
62-
@Arguments({Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
62+
@Arguments(values = {Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
6363
@IR(failOn = {IRNode.ADD_I})
6464
@IR(counts = {IRNode.SUB_I, "1"})
6565
public int test2Int(int b, int a, int c) { // make sure inputs sorted
6666
return (a - b) + (c - a); // transformed to c - b rather than (a + c) - (b + a)
6767
}
6868

6969
@Test
70-
@Arguments({Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
70+
@Arguments(values = {Argument.RANDOM_ONCE, Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
7171
@IR(failOn = {IRNode.ADD_L})
7272
@IR(counts = {IRNode.SUB_L, "1"})
7373
public long test2Long(long b, long a, long c) { // make sure inputs sorted

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static void main(String[] args) {
4444
}
4545

4646
@Test
47-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
47+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
4848
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
4949
public boolean testIntAddtionEquals0(int x, int y) {
5050
int result = x + y;
@@ -56,7 +56,7 @@ public boolean testIntAddtionEquals0(int x, int y) {
5656
}
5757

5858
@Test
59-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
59+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
6060
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
6161
public boolean testIntAddtionNotEquals0(int x, int y) {
6262
int result = x + y;
@@ -68,7 +68,7 @@ public boolean testIntAddtionNotEquals0(int x, int y) {
6868
}
6969

7070
@Test
71-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
71+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
7272
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
7373
public boolean testLongAddtionEquals0(long x, long y) {
7474
long result = x + y;
@@ -80,7 +80,7 @@ public boolean testLongAddtionEquals0(long x, long y) {
8080
}
8181

8282
@Test
83-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
83+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
8484
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
8585
public boolean testLongAddtionNotEquals0(long x, long y) {
8686
long result = x + y;
@@ -92,7 +92,7 @@ public boolean testLongAddtionNotEquals0(long x, long y) {
9292
}
9393

9494
@Test
95-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
95+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
9696
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
9797
public boolean testIntOrEquals0(int x, int y) {
9898
int result = x | y;
@@ -104,7 +104,7 @@ public boolean testIntOrEquals0(int x, int y) {
104104
}
105105

106106
@Test
107-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
107+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
108108
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
109109
public boolean testIntOrNotEquals0(int x, int y) {
110110
int result = x | y;
@@ -116,7 +116,7 @@ public boolean testIntOrNotEquals0(int x, int y) {
116116
}
117117

118118
@Test
119-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
119+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
120120
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
121121
public boolean testLongOrEquals0(long x, long y) {
122122
long result = x | y;
@@ -128,7 +128,7 @@ public boolean testLongOrEquals0(long x, long y) {
128128
}
129129

130130
@Test
131-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
131+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
132132
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
133133
public boolean testLongOrNotEquals0(long x, long y) {
134134
long result = x | y;
@@ -140,7 +140,7 @@ public boolean testLongOrNotEquals0(long x, long y) {
140140
}
141141

142142
@Test
143-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
143+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
144144
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
145145
public boolean testIntOrGreater0(int x, int y) {
146146
int result = x | y;
@@ -152,7 +152,7 @@ public boolean testIntOrGreater0(int x, int y) {
152152
}
153153

154154
@Test
155-
@Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
155+
@Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
156156
@IR(failOn = {IRNode.X86_TESTI_REG, IRNode.X86_TESTL_REG}, phase = CompilePhase.FINAL_CODE)
157157
public boolean testLongOrGreater0(long x, long y) {
158158
long result = x | y;
@@ -180,4 +180,4 @@ public void assertResult(long x, long y) {
180180
Asserts.assertEQ((x | y) != 0, testLongOrNotEquals0(x, y));
181181
Asserts.assertEQ((x | y) > 0, testLongOrGreater0(x, y));
182182
}
183-
}
183+
}

0 commit comments

Comments
 (0)