From fe9e16e69b7fdb11bc39ffe8daf2aa9dc1e74302 Mon Sep 17 00:00:00 2001 From: Damon Fenacci Date: Mon, 19 May 2025 11:25:43 +0200 Subject: [PATCH] JDK-8343420: [lworld] compiler/gcbarriers/TestG1BarrierGeneration.java after merging JDK-8334060 in jdk-24+18 --- test/hotspot/jtreg/ProblemList.txt | 1 - .../gcbarriers/TestG1BarrierGeneration.java | 32 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 3d9762c7807..3ab5e26848d 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -138,7 +138,6 @@ runtime/AccModule/ConstModule.java 8294051 generic-all runtime/valhalla/inlinetypes/CircularityTest.java 8349037 generic-all runtime/valhalla/inlinetypes/PreloadCircularityTest.java 8349631 linux-aarch64-debug runtime/valhalla/inlinetypes/ValuePreloadTest.java 8349630 linux-aarch64-debug -compiler/gcbarriers/TestG1BarrierGeneration.java 8343420 generic-all # Valhalla + COH compiler/c2/autovectorization/TestIndexOverflowIR.java 8348568 generic-all diff --git a/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java b/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java index a9df0019ab1..d52421e34b8 100644 --- a/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java +++ b/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java @@ -728,10 +728,10 @@ static boolean testCompareAndSwap(Outer o, Object oldVal, Object newVal) { @Test @IR(applyIf = {"UseCompressedOops", "false"}, - counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIf = {"UseCompressedOops", "true"}, - counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, phase = CompilePhase.FINAL_CODE) static Object testGetAndSet(Outer o, Object newVal) { return fVarHandle.getAndSet(o, newVal); @@ -786,16 +786,16 @@ static boolean testCompareAndSwapOnNewObject(Object oldVal, Object newVal) { @Test @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"}, - counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, POST_ONLY, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, POST_ONLY, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"}, - counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, POST_ONLY, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, POST_ONLY, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"}, - failOn = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, ANY}, + failOn = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, ANY}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"}, - failOn = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, ANY}, + failOn = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, ANY}, phase = CompilePhase.FINAL_CODE) static Object testGetAndSetOnNewObject(Object oldVal, Object newVal) { Outer o = new Outer(); @@ -805,16 +805,16 @@ static Object testGetAndSetOnNewObject(Object oldVal, Object newVal) { @Test @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"}, - counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, POST_ONLY, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, POST_ONLY, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"}, - counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, POST_ONLY, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, POST_ONLY, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"}, - failOn = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, ANY}, + failOn = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, ANY}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"}, - failOn = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, ANY}, + failOn = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, ANY}, phase = CompilePhase.FINAL_CODE) static Object testGetAndSetConditionallyOnNewObject(Object oldVal, Object newVal, boolean c) { Outer o = new Outer(); @@ -827,16 +827,16 @@ static Object testGetAndSetConditionallyOnNewObject(Object oldVal, Object newVal @Test @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"}, - counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, POST_ONLY, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, POST_ONLY, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"}, - counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, POST_ONLY, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, POST_ONLY, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"}, - failOn = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, ANY}, + failOn = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, ANY}, phase = CompilePhase.FINAL_CODE) @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"}, - failOn = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, ANY}, + failOn = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, ANY}, phase = CompilePhase.FINAL_CODE) static Object testGetAndSetOnNewObjectAfterException(Object oldVal, Object newVal, boolean c) throws Exception { Outer o = new Outer(); @@ -849,10 +849,10 @@ static Object testGetAndSetOnNewObjectAfterException(Object oldVal, Object newVa @Test @IR(applyIf = {"UseCompressedOops", "false"}, - counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, phase = CompilePhase.FINAL_CODE) @IR(applyIf = {"UseCompressedOops", "true"}, - counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, + counts = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"}, phase = CompilePhase.FINAL_CODE) static Object testGetAndSetOnNewObjectAfterCall(Object oldVal, Object newVal) { Outer o = new Outer();