Skip to content

Commit 6fdc6fb

Browse files
dafedafedafedafe
committed
JDK-8353182: [lworld] C2: Multiple IR test failures in compiler/gcbarriers/TestZGCBarrierElision.java after JDK-8351569
1 parent 01af2b4 commit 6fdc6fb

File tree

1 file changed

+13
-24
lines changed

1 file changed

+13
-24
lines changed

‎test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ void runControlFlowTests() {
187187
}
188188

189189
@Test
190-
// TODO: 8353182
191-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
190+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
192191
static void testAllocateThenAtomic(Inner i) {
193192
Outer o = new Outer();
194193
Common.blackhole(o);
@@ -198,42 +197,37 @@ static void testAllocateThenAtomic(Inner i) {
198197
@Test
199198
// TODO: 8329234
200199
//@IR(counts = { IRNode.Z_LOAD_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
201-
// TODO: 8353182
202-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
200+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
203201
static void testLoadThenAtomic(Outer o, Inner i) {
204202
Common.blackhole(o.field1);
205203
Common.field1VarHandle.getAndSet(o, i);
206204
}
207205

208206
@Test
209-
// TODO: 8353182
210-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
207+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
211208
static void testAtomicThenAtomicAnotherField(Outer o, Inner i) {
212209
Common.field1VarHandle.getAndSet(o, i);
213210
Common.field2VarHandle.getAndSet(o, i);
214211
}
215212

216213
@Test
217-
// TODO: 8353182
218-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
214+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
219215
static void testAllocateArrayThenAtomicAtKnownIndex(Outer o) {
220216
Outer[] a = new Outer[42];
221217
Common.blackhole(a);
222218
Common.outerArrayVarHandle.getAndSet(a, 2, o);
223219
}
224220

225221
@Test
226-
// TODO: 8353182
227-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
222+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
228223
static void testAllocateArrayThenAtomicAtUnknownIndex(Outer o, int index) {
229224
Outer[] a = new Outer[42];
230225
Common.blackhole(a);
231226
Common.outerArrayVarHandle.getAndSet(a, index, o);
232227
}
233228

234229
@Test
235-
// TODO: 8353182
236-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
230+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
237231
static void testArrayAtomicThenAtomicAtUnknownIndices(Outer[] a, Outer o, int index1, int index2) {
238232
Common.outerArrayVarHandle.getAndSet(a, index1, o);
239233
Common.outerArrayVarHandle.getAndSet(a, index2, o);
@@ -394,44 +388,39 @@ void runControlFlowTests() {
394388

395389
@Test
396390
@IR(counts = { IRNode.Z_STORE_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
397-
// TODO: 8353182
398-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
391+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
399392
static void testStoreThenAtomic(Outer o, Inner i) {
400393
o.field1 = i;
401394
Common.field1VarHandle.getAndSet(o, i);
402395
}
403396

404397
@Test
405-
// TODO: 8353182
406-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
398+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
407399
@IR(counts = { IRNode.Z_LOAD_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
408400
static void testAtomicThenLoad(Outer o, Inner i) {
409401
Common.field1VarHandle.getAndSet(o, i);
410402
Common.blackhole(o.field1);
411403
}
412404

413405
@Test
414-
// TODO: 8353182
415-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
406+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
416407
@IR(counts = { IRNode.Z_STORE_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
417408
static void testAtomicThenStore(Outer o, Inner i) {
418409
Common.field1VarHandle.getAndSet(o, i);
419410
o.field1 = i;
420411
}
421412

422413
@Test
423-
// TODO: 8353182
424-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
425-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
414+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
415+
//@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
426416
static void testAtomicThenAtomic(Outer o, Inner i) {
427417
Common.field1VarHandle.getAndSet(o, i);
428418
Common.field1VarHandle.getAndSet(o, i);
429419
}
430420

431421
@Test
432-
// TODO: 8353182
433-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
434-
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
422+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
423+
@IR(counts = { IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
435424
static void testArrayAtomicThenAtomic(Outer[] a, Outer o) {
436425
Common.outerArrayVarHandle.getAndSet(a, 0, o);
437426
Common.outerArrayVarHandle.getAndSet(a, 0, o);

0 commit comments

Comments
 (0)