Skip to content

Commit ab99743

Browse files
chhagedornchhagedorn
committed
8353186: [lworld] Disable failing tests after JDK-8351569
Reviewed-by: thartmann
1 parent ea8521d commit ab99743

File tree

3 files changed

+31
-15
lines changed

3 files changed

+31
-15
lines changed

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

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -187,47 +187,53 @@ void runControlFlowTests() {
187187
}
188188

189189
@Test
190-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
190+
// TODO: 8353182
191+
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
191192
static void testAllocateThenAtomic(Inner i) {
192193
Outer o = new Outer();
193194
Common.blackhole(o);
194195
Common.field1VarHandle.getAndSet​(o, i);
195196
}
196197

197198
@Test
198-
// TODO 8329234
199-
// @IR(counts = { IRNode.Z_LOAD_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
200-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
199+
// TODO: 8329234
200+
//@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)
201203
static void testLoadThenAtomic(Outer o, Inner i) {
202204
Common.blackhole(o.field1);
203205
Common.field1VarHandle.getAndSet​(o, i);
204206
}
205207

206208
@Test
207-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
209+
// TODO: 8353182
210+
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "2" }, phase = CompilePhase.FINAL_CODE)
208211
static void testAtomicThenAtomicAnotherField(Outer o, Inner i) {
209212
Common.field1VarHandle.getAndSet​(o, i);
210213
Common.field2VarHandle.getAndSet​(o, i);
211214
}
212215

213216
@Test
214-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
217+
// TODO: 8353182
218+
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
215219
static void testAllocateArrayThenAtomicAtKnownIndex(Outer o) {
216220
Outer[] a = new Outer[42];
217221
Common.blackhole(a);
218222
Common.outerArrayVarHandle.getAndSet(a, 2, o);
219223
}
220224

221225
@Test
222-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
226+
// TODO: 8353182
227+
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
223228
static void testAllocateArrayThenAtomicAtUnknownIndex(Outer o, int index) {
224229
Outer[] a = new Outer[42];
225230
Common.blackhole(a);
226231
Common.outerArrayVarHandle.getAndSet(a, index, o);
227232
}
228233

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

389395
@Test
390396
@IR(counts = { IRNode.Z_STORE_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
391-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "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)
392399
static void testStoreThenAtomic(Outer o, Inner i) {
393400
o.field1 = i;
394401
Common.field1VarHandle.getAndSet​(o, i);
395402
}
396403

397404
@Test
398-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
405+
// TODO: 8353182
406+
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
399407
@IR(counts = { IRNode.Z_LOAD_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
400408
static void testAtomicThenLoad(Outer o, Inner i) {
401409
Common.field1VarHandle.getAndSet​(o, i);
402410
Common.blackhole(o.field1);
403411
}
404412

405413
@Test
406-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
414+
// TODO: 8353182
415+
//@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
407416
@IR(counts = { IRNode.Z_STORE_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
408417
static void testAtomicThenStore(Outer o, Inner i) {
409418
Common.field1VarHandle.getAndSet​(o, i);
410419
o.field1 = i;
411420
}
412421

413422
@Test
414-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
415-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
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)
416426
static void testAtomicThenAtomic(Outer o, Inner i) {
417427
Common.field1VarHandle.getAndSet​(o, i);
418428
Common.field1VarHandle.getAndSet​(o, i);
419429
}
420430

421431
@Test
422-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.REMAINING, "1" }, phase = CompilePhase.FINAL_CODE)
423-
@IR(counts = { IRNode.Z_GET_AND_SET_P_WITH_BARRIER_FLAG, Common.ELIDED, "1" }, phase = CompilePhase.FINAL_CODE)
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)
424435
static void testArrayAtomicThenAtomic(Outer[] a, Outer o) {
425436
Common.outerArrayVarHandle.getAndSet(a, 0, o);
426437
Common.outerArrayVarHandle.getAndSet(a, 0, o);

‎test/jdk/valhalla/valuetypes/FlatVarHandleTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@
4444
import java.util.List;
4545
import java.util.function.BiFunction;
4646

47+
// TODO: 8353180: Remove requires != Xcomp
48+
4749
/*
4850
* @test
51+
* @requires vm.compMode != "Xcomp"
4952
* @summary Test atomic access modes on var handles for flattened values
5053
* @enablePreview
5154
* @modules java.base/jdk.internal.value java.base/jdk.internal.vm.annotation

‎test/jdk/valhalla/valuetypes/NullRestrictedArraysTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
* questions.
2222
*/
2323

24+
// TODO: 8353180: Remove requires != Xcomp
2425

2526
/*
2627
* @test
2728
* @enablePreview
29+
* @requires vm.compMode != "Xcomp"
2830
* @run junit/othervm -XX:-UseArrayFlattening -XX:-UseNullableValueFlattening NullRestrictedArraysTest
2931
* @run junit/othervm -XX:+UseArrayFlattening -XX:+UseNullableValueFlattening NullRestrictedArraysTest
3032
*/

0 commit comments

Comments
 (0)