Skip to content

Commit 7e08275

Browse files
eme64eme64
committed
8302668: [TESTBUG] Tests require feature sse4_1 which does not exist, should be sse4.1
Reviewed-by: kvn, thartmann
1 parent 5c0f50b commit 7e08275

8 files changed

+37
-29
lines changed

‎test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -107,7 +108,7 @@ public byte[] vectorSub() {
107108
}
108109

109110
@Test
110-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
111+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
111112
counts = {IRNode.MUL_V, ">0"})
112113
public byte[] vectorMul() {
113114
byte[] res = new byte[SIZE];
@@ -118,7 +119,7 @@ public byte[] vectorMul() {
118119
}
119120

120121
@Test
121-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
122+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
122123
counts = {IRNode.MUL_V, ">0", IRNode.ADD_V, ">0"})
123124
public byte[] vectorMulAdd() {
124125
byte[] res = new byte[SIZE];
@@ -129,7 +130,7 @@ public byte[] vectorMulAdd() {
129130
}
130131

131132
@Test
132-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
133+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
133134
counts = {IRNode.MUL_V, ">0", IRNode.SUB_V, ">0"})
134135
public byte[] vectorMulSub() {
135136
byte[] res = new byte[SIZE];
@@ -186,7 +187,7 @@ public byte[] vectorXor() {
186187

187188
// ---------------- Shift ----------------
188189
@Test
189-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
190+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
190191
counts = {IRNode.LSHIFT_V, ">0"})
191192
public byte[] vectorShiftLeft() {
192193
byte[] res = new byte[SIZE];
@@ -197,7 +198,7 @@ public byte[] vectorShiftLeft() {
197198
}
198199

199200
@Test
200-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
201+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
201202
counts = {IRNode.RSHIFT_V, ">0"})
202203
public byte[] vectorSignedShiftRight() {
203204
byte[] res = new byte[SIZE];
@@ -208,7 +209,7 @@ public byte[] vectorSignedShiftRight() {
208209
}
209210

210211
@Test
211-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
212+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
212213
counts = {IRNode.RSHIFT_V, ">0"})
213214
public byte[] vectorUnsignedShiftRight() {
214215
byte[] res = new byte[SIZE];

‎test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -107,7 +108,7 @@ public int[] vectorSub() {
107108
}
108109

109110
@Test
110-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
111+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
111112
counts = {IRNode.MUL_V, ">0"})
112113
public int[] vectorMul() {
113114
int[] res = new int[SIZE];
@@ -118,7 +119,7 @@ public int[] vectorMul() {
118119
}
119120

120121
@Test
121-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
122+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
122123
counts = {IRNode.MUL_V, ">0", IRNode.ADD_V, ">0"})
123124
public int[] vectorMulAdd() {
124125
int[] res = new int[SIZE];
@@ -129,7 +130,7 @@ public int[] vectorMulAdd() {
129130
}
130131

131132
@Test
132-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
133+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
133134
counts = {IRNode.MUL_V, ">0", IRNode.SUB_V, ">0"})
134135
public int[] vectorMulSub() {
135136
int[] res = new int[SIZE];

‎test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -119,9 +120,9 @@ public long[] vectorMul() {
119120
}
120121

121122
@Test
122-
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4_1", "true"},
123+
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
123124
counts = {IRNode.ADD_V, ">0"})
124-
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4_1", "true"},
125+
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
125126
counts = {IRNode.MUL_V, ">0"})
126127
public long[] vectorMulAdd() {
127128
long[] res = new long[SIZE];
@@ -132,7 +133,7 @@ public long[] vectorMulAdd() {
132133
}
133134

134135
@Test
135-
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4_1", "true"},
136+
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
136137
counts = {IRNode.MUL_V, ">0", IRNode.SUB_V, ">0"})
137138
public long[] vectorMulSub() {
138139
long[] res = new long[SIZE];

‎test/hotspot/jtreg/compiler/vectorization/runner/LoopArrayIndexComputeTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -104,9 +105,9 @@ public int[] indexMinusConstant() {
104105
}
105106

106107
@Test
107-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
108+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
108109
counts = {IRNode.STORE_VECTOR, ">0"})
109-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
110+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
110111
counts = {IRNode.MUL_V, ">0"})
111112
public int[] indexPlusInvariant() {
112113
int[] res = new int[SIZE];
@@ -132,9 +133,9 @@ public int[] indexMinusInvariant() {
132133
}
133134

134135
@Test
135-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
136+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
136137
counts = {IRNode.STORE_VECTOR, ">0"})
137-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
138+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
138139
counts = {IRNode.MUL_V, ">0"})
139140
public int[] indexWithInvariantAndConstant() {
140141
int[] res = new int[SIZE];

‎test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -93,7 +94,7 @@ public int[] opWithConstant() {
9394
}
9495

9596
@Test
96-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
97+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
9798
counts = {IRNode.STORE_VECTOR, ">0"})
9899
public int[] opWithLoopInvariant() {
99100
int[] res = new int[SIZE];
@@ -104,7 +105,7 @@ public int[] opWithLoopInvariant() {
104105
}
105106

106107
@Test
107-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
108+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
108109
counts = {IRNode.STORE_VECTOR, ">0"})
109110
public int[] opWithConstantAndLoopInvariant() {
110111
int[] res = new int[SIZE];
@@ -126,7 +127,7 @@ public int[] multipleOps() {
126127
}
127128

128129
@Test
129-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
130+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
130131
counts = {IRNode.STORE_VECTOR, ">0"})
131132
public int[] multipleOpsWithMultipleConstants() {
132133
int[] res = new int[SIZE];
@@ -152,7 +153,7 @@ public int[] multipleStores() {
152153
}
153154

154155
@Test
155-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
156+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
156157
counts = {IRNode.STORE_VECTOR, ">0"})
157158
public int[] multipleStoresWithCommonSubExpression() {
158159
int[] res1 = new int[SIZE];
@@ -297,7 +298,7 @@ public int[] multiplyBySumOfIndexAndInvariant() {
297298
}
298299

299300
@Test
300-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
301+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
301302
counts = {IRNode.STORE_VECTOR, ">0"})
302303
public int[] manuallyUnrolledStride2() {
303304
int[] res = new int[SIZE];
@@ -309,7 +310,7 @@ public int[] manuallyUnrolledStride2() {
309310
}
310311

311312
@Test
312-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
313+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
313314
counts = {IRNode.STORE_VECTOR, ">0"})
314315
public int partialVectorizableLoop() {
315316
int[] res = new int[SIZE];

‎test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -67,7 +68,7 @@ public LoopLiveOutNodesTest() {
6768
}
6869

6970
@Test
70-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
71+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
7172
counts = {IRNode.STORE_VECTOR, ">0"})
7273
public int SimpleIvUsed() {
7374
int i = 0;

‎test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -110,7 +111,7 @@ public int[] nonEqualTestRange() {
110111
}
111112

112113
@Test
113-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
114+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
114115
counts = {IRNode.STORE_VECTOR, ">0"})
115116
public int[] shortInductionLoop() {
116117
int[] res = new int[SIZE];
@@ -175,7 +176,7 @@ public int[] stride4Loop() {
175176
}
176177

177178
@Test
178-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
179+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
179180
counts = {IRNode.STORE_VECTOR, ">0"})
180181
public int[] countDownLoop() {
181182
int[] res = new int[SIZE];
@@ -196,7 +197,7 @@ public int[] strideMinus2Loop() {
196197

197198
// ---------- Stride with scale ----------
198199
@Test
199-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
200+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
200201
counts = {IRNode.STORE_VECTOR, ">0"})
201202
public int[] countupLoopWithNegScale() {
202203
int[] res = new int[SIZE];
@@ -207,7 +208,7 @@ public int[] countupLoopWithNegScale() {
207208
}
208209

209210
@Test
210-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
211+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
211212
counts = {IRNode.STORE_VECTOR, ">0"})
212213
public int[] countDownLoopWithNegScale() {
213214
int[] res = new int[SIZE];

‎test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
3+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -97,7 +98,7 @@ public int[] consecutiveLoopsNested() {
9798
}
9899

99100
@Test
100-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
101+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
101102
counts = {IRNode.STORE_VECTOR, ">0"})
102103
public int[] nestedLoopOuterNonCounted() {
103104
int i = 1;
@@ -113,7 +114,7 @@ public int[] nestedLoopOuterNonCounted() {
113114
}
114115

115116
@Test
116-
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
117+
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
117118
counts = {IRNode.STORE_VECTOR, ">0"})
118119
public int[] nestedLoopIndexCompute() {
119120
int[] res = new int[SIZE];

0 commit comments

Comments
 (0)