infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-04 07:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8232828: AArch64: compiler/c2/aarch64/TestVolatilesG1.java fails after JDK-8225776

Browse Source 
Reviewed-by: aph
This commit is contained in:
Andrew Dinn 2019-11-29 15:37:13 +00:00
parent 3d7d54b145
commit 7b02e24b65
1 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
View File

@ -316,14 +316,18 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar volatile and
// and subsequent return
matches = new String[] {
"membar_release \\(elided\\)",
useCompressedOops ? "stlrw?" : "stlr",
"membar_volatile \\(elided\\)",
"ret",
"membar_volatile",
"dmb ish",
"strb",
"membar_volatile \\(elided\\)",
"ret"
"strb"
};
break;
case "Shenandoah":
@ -354,16 +358,20 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar volatile and
// and subsequent return
matches = new String[] {
"membar_release",
"dmb ish",
useCompressedOops ? "strw?" : "str",
"membar_volatile",
"dmb ish",
"strb",
"ret",
"membar_volatile",
"dmb ish",
"ret"
"strb"
};
break;
case "CMSCondMark":
@ -477,14 +485,18 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar acquire and
// and subsequent return
matches = new String[] {
"membar_release \\(elided\\)",
useCompressedOops ? "cmpxchgw?_acq" : "cmpxchg_acq",
"membar_acquire \\(elided\\)",
"ret",
"membar_volatile",
"dmb ish",
"strb",
"membar_acquire \\(elided\\)",
"ret"
"strb"
};
break;
case "Shenandoah":
@ -515,16 +527,20 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar acquire and
// and subsequent return
matches = new String[] {
"membar_release",
"dmb ish",
useCompressedOops ? "cmpxchgw? " : "cmpxchg ",
"membar_volatile",
"dmb ish",
"strb",
"membar_acquire",
"dmb ish",
"ret"
"ret",
"membar_volatile",
"dmb ish",
"strb"
};
break;
case "CMSCondMark":
@ -653,14 +669,18 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar acquire and
// and subsequent return
matches = new String[] {
"membar_release \\(elided\\)",
useCompressedOops ? "cmpxchgw?_acq" : "cmpxchg_acq",
"membar_acquire \\(elided\\)",
"ret",
"membar_volatile",
"dmb ish",
"strb",
"membar_acquire \\(elided\\)",
"ret"
"strb"
};
break;
case "Shenandoah":
@ -691,16 +711,20 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar acquire and
// and subsequent return
matches = new String[] {
"membar_release",
"dmb ish",
useCompressedOops ? "cmpxchgw? " : "cmpxchg ",
"membar_volatile",
"dmb ish",
"strb",
"membar_acquire",
"dmb ish",
"ret"
"ret",
"membar_volatile",
"dmb ish",
"strb"
};
break;
case "CMSCondMark":
@ -809,14 +833,18 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar acquire and
// and subsequent return
matches = new String[] {
"membar_release \\(elided\\)",
useCompressedOops ? "atomic_xchgw?_acq" : "atomic_xchg_acq",
"membar_acquire \\(elided\\)",
"ret",
"membar_volatile",
"dmb ish",
"strb",
"membar_acquire \\(elided\\)",
"ret"
"strb"
};
break;
case "Shenandoah":
@ -845,16 +873,20 @@ public class TestVolatiles {
case "G1":
// a card mark volatile barrier should be generated
// before the card mark strb
//
// following the fix for 8225776 the G1 barrier is now
// scheduled out of line after the membar acquire and
// and subsequent return
matches = new String[] {
"membar_release",
"dmb ish",
useCompressedOops ? "atomic_xchgw? " : "atomic_xchg ",
"membar_volatile",
"dmb ish",
"strb",
"membar_acquire",
"dmb ish",
"ret"
"ret",
"membar_volatile",
"dmb ish",
"strb"
};
break;
case "CMSCondMark":