https://gcc.gnu.org/g:86a3dbeb6c6a36f8cf97c66cef83c9bc3ad82027
commit r15-1661-g86a3dbeb6c6a36f8cf97c66cef83c9bc3ad82027
Author: Patrick O'Neill <patr...@rivosinc.com>
Date: Tue Jun 25 14:14:18 2024 -0700
RISC-V: Update testcase comments to point to PSABI rather than Table A.6
Table A.6 was originally the source of truth for the recommended mappings.
Point to the PSABI doc since the memory model mappings have been moved
there.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/amo/a-rvwmo-fence.c: Replace A.6 reference with
PSABI.
* gcc.target/riscv/amo/a-rvwmo-load-acquire.c: Ditto.
* gcc.target/riscv/amo/a-rvwmo-load-relaxed.c: Ditto.
* gcc.target/riscv/amo/a-rvwmo-load-seq-cst.c: Ditto.
* gcc.target/riscv/amo/a-rvwmo-store-compat-seq-cst.c: Ditto.
* gcc.target/riscv/amo/a-rvwmo-store-relaxed.c: Ditto.
* gcc.target/riscv/amo/a-rvwmo-store-release.c: Ditto.
* gcc.target/riscv/amo/a-ztso-fence.c: Ditto.
* gcc.target/riscv/amo/a-ztso-load-acquire.c: Ditto.
* gcc.target/riscv/amo/a-ztso-load-relaxed.c: Ditto.
* gcc.target/riscv/amo/a-ztso-load-seq-cst.c: Ditto.
* gcc.target/riscv/amo/a-ztso-store-compat-seq-cst.c: Ditto.
* gcc.target/riscv/amo/a-ztso-store-relaxed.c: Ditto.
* gcc.target/riscv/amo/a-ztso-store-release.c: Ditto.
* gcc.target/riscv/amo/zaamo-rvwmo-amo-add-int.c: Ditto.
* gcc.target/riscv/amo/zaamo-ztso-amo-add-int.c: Ditto.
*
gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire-release.c: Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-consume.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-relaxed.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-release.c:
Ditto.
*
gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst-relaxed.c: Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acq-rel.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acquire.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-relaxed.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-release.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-seq-cst.c:
Ditto.
*
gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire-release.c: Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-consume.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-relaxed.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-release.c:
Ditto.
*
gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst-relaxed.c: Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acq-rel.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acquire.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-relaxed.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-release.c:
Ditto.
* gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-seq-cst.c:
Ditto.
Signed-off-by: Patrick O'Neill <patr...@rivosinc.com>
Diff:
---
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-fence.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-acquire.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-relaxed.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-seq-cst.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-compat-seq-cst.c | 3 ++-
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-relaxed.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-release.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-fence.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-acquire.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-relaxed.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-seq-cst.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-compat-seq-cst.c | 3 ++-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-relaxed.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-release.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/zaamo-rvwmo-amo-add-int.c | 2 +-
gcc/testsuite/gcc.target/riscv/amo/zaamo-ztso-amo-add-int.c | 2 +-
.../riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire-release.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-consume.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-relaxed.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-release.c | 2 +-
.../riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst-relaxed.c | 3 ++-
.../gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acq-rel.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acquire.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-relaxed.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-release.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-seq-cst.c | 2 +-
.../riscv/amo/zalrsc-ztso-compare-exchange-int-acquire-release.c | 3 ++-
.../gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-consume.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-relaxed.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-release.c | 2 +-
.../riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst-relaxed.c | 3 ++-
.../gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acq-rel.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acquire.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-relaxed.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-release.c | 2 +-
.../gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-seq-cst.c | 2 +-
40 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-fence.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-fence.c
index 5b9400f7da8..6803bf92aa3 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-fence.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-fence.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that fence mappings match Table A.6's recommended mapping. */
+/* Verify that fence mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-acquire.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-acquire.c
index f9871b92c0b..93a0c68ae8a 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-acquire.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-acquire.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that load mappings match Table A.6's recommended mapping. */
+/* Verify that load mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-relaxed.c
index 7b99db06d75..2403d53c131 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-relaxed.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that load mappings match Table A.6's recommended mapping. */
+/* Verify that load mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-seq-cst.c
index 35f196c23c0..31b35cf9f6a 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-seq-cst.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-load-seq-cst.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that load mappings match Table A.6's recommended mapping. */
+/* Verify that load mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-compat-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-compat-seq-cst.c
index 43880b9734a..45c9abb1425 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-compat-seq-cst.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-compat-seq-cst.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
-/* Verify that store mapping are compatible with Table A.6 & A.7. */
+/* Verify that store mappings match the PSABI doc's recommended compatibility
+ mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-relaxed.c
index eb67d1968e0..4b321b2b75f 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-relaxed.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that store mappings match Table A.6's recommended mapping. */
+/* Verify that store mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-release.c
b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-release.c
index 25a998b86eb..a2a617c4d15 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-release.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-rvwmo-store-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that store mappings match Table A.6's recommended mapping. */
+/* Verify that store mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-remove-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-fence.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-fence.c
index 37daeda8354..153f6ef8a3d 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-fence.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-fence.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that fence mappings match the Ztso suggested mapping. */
+/* Verify that fence mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-acquire.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-acquire.c
index 4e94191812b..76a12059f39 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-acquire.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-acquire.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that load mappings match the Ztso suggested mapping. */
+/* Verify that load mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-relaxed.c
index ef5dee6ee60..c4ee56e2cc0 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-relaxed.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that load mappings match the Ztso suggested mapping. */
+/* Verify that load mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-seq-cst.c
index 93cd8bb909c..7163311433c 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-seq-cst.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-load-seq-cst.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that load mappings match the Ztso suggested mapping. */
+/* Verify that load mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-compat-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-compat-seq-cst.c
index e32cfb1a3cb..2f4c9124aaf 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-compat-seq-cst.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-compat-seq-cst.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
-/* Verify that store mappings match the Ztso suggested mapping. */
+/* Verify that store mappings match the PSABI doc's recommended compatibility
+ mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-relaxed.c
index 2f46470ae15..d469bf348d9 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-relaxed.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that store mappings match the Ztso suggested mapping. */
+/* Verify that store mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-release.c
b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-release.c
index dd2db3a7878..3a275740401 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-release.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/a-ztso-store-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that store mappings match the Ztso suggested mapping. */
+/* Verify that store mappings match the PSABI doc's recommended mapping. */
/* { dg-options "-O3" } */
/* { dg-add-options riscv_ztso } */
/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/zaamo-rvwmo-amo-add-int.c
b/gcc/testsuite/gcc.target/riscv/amo/zaamo-rvwmo-amo-add-int.c
index 22187243314..ca40a49f9b5 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/zaamo-rvwmo-amo-add-int.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/zaamo-rvwmo-amo-add-int.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that atomic op mappings match Table A.6's recommended mapping. */
+/* Verify that atomic op mappings match the PSABI doc's recommended mapping.
*/
/* { dg-options "-O3" } */
/* { dg-add-options riscv_zaamo } */
/* { dg-remove-options riscv_ztso } */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/zaamo-ztso-amo-add-int.c
b/gcc/testsuite/gcc.target/riscv/amo/zaamo-ztso-amo-add-int.c
index 8cfd601f12a..8ebdc61992e 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/zaamo-ztso-amo-add-int.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/zaamo-ztso-amo-add-int.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that atomic op mappings match Table A.6's recommended mapping. */
+/* Verify that atomic op mappings match the PSABI doc's recommended mapping.
*/
/* { dg-options "-O3" } */
/* { dg-add-options riscv_zaamo } */
/* { dg-add-options riscv_ztso } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire-release.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire-release.c
index 0cbc89c617c..49eeda9cb33 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire-release.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* Mixed mappings need to be unioned. */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire.c
index 70107c40a53..b9e3adece8d 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-acquire.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-consume.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-consume.c
index b3cffad005d..11839d84f14 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-consume.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-consume.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-relaxed.c
index fd8a8bfe9c6..852ec99df76 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-relaxed.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-release.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-release.c
index faab1ab728c..9c51a082d0b 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-release.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst-relaxed.c
index 957aa3c0afd..d985e2cef8b 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst-relaxed.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst-relaxed.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
+/* Mixed mappings need to be unioned. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst.c
index a1435a07a21..6efd232ce21 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-compare-exchange-int-seq-cst.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match Table A.6's recommended
mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acq-rel.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acq-rel.c
index 3f5fa20c87c..2c2df133a28 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acq-rel.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acq-rel.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match Table A.6's recommended
mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acquire.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acquire.c
index 782ffcb0a70..abfbf63902c 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acquire.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-acquire.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match Table A.6's recommended
mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-relaxed.c
index 50009f021dc..1f61c89da88 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-relaxed.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match Table A.6's recommended
mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-release.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-release.c
index 76ec8a81d1f..343503ce79c 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-release.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match Table A.6's recommended
mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-seq-cst.c
index 7417a67f692..045434b2579 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-seq-cst.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-rvwmo-subword-amo-add-char-seq-cst.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match Table A.6's recommended
mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-remove-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire-release.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire-release.c
index 7da3b1dce48..9761a955ede 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire-release.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire-release.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
+/* Mixed mappings need to be unioned. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire.c
index 0a443b461f3..3303f8021e1 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-acquire.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-consume.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-consume.c
index 20e325f2e7c..7474e832bb1 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-consume.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-consume.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-relaxed.c
index 46a9f0c918a..e43193820f2 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-relaxed.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-release.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-release.c
index 35e01cdc8be..a0d5872e1bd 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-release.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst-relaxed.c
index 53f6e6ace0b..fc464ab1ff5 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst-relaxed.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst-relaxed.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
+/* Mixed mappings need to be unioned. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst.c
index cd884931bdf..152806cfde3 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-compare-exchange-int-seq-cst.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that compare exchange mappings match the Ztso suggested mapping. */
+/* Verify that compare exchange mappings match the PSABI doc's recommended
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acq-rel.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acq-rel.c
index a88e409063a..f64b10a076a 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acq-rel.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acq-rel.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match the Ztso suggested mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's suggested
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acquire.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acquire.c
index 8d28569c79c..5d743f0ab83 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acquire.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-acquire.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match the Ztso suggested mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's suggested
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-relaxed.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-relaxed.c
index a44d6980ece..3e7dda9c8c4 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-relaxed.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-relaxed.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match the Ztso suggested mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's suggested
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-release.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-release.c
index fb803ab9cbf..ffd832eef78 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-release.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-release.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match the Ztso suggested mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's suggested
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-seq-cst.c
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-seq-cst.c
index d851e5e5944..e9ea3f5ff3b 100644
---
a/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-seq-cst.c
+++
b/gcc/testsuite/gcc.target/riscv/amo/zalrsc-ztso-subword-amo-add-char-seq-cst.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* Verify that subword atomic op mappings match the Ztso suggested mapping. */
+/* Verify that subword atomic op mappings match the PSABI doc's suggested
mapping. */
/* { dg-add-options riscv_zalrsc } */
/* { dg-add-options riscv_ztso } */
/* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
