[gcc r15-1217] RISC-V: Move amo tests into subfolder

[Patrick O'Neill]

https://gcc.gnu.org/g:8c944f2559ff279ed7e04c2a75881c04c0c31a9b

commit r15-1217-g8c944f2559ff279ed7e04c2a75881c04c0c31a9b
Author: Patrick O'Neill <patrick@rivosinc.com>
Date:   Mon Jun 10 16:32:11 2024 -0700

    RISC-V: Move amo tests into subfolder
    
    There's a large number of atomic related testcases in the riscv folder.
    Move them into a subfolder similar to what was done for rvv testcases.
    
    gcc/testsuite/ChangeLog:
    
            * gcc.target/riscv/amo-table-a-6-amo-add-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c: ...here.
            * gcc.target/riscv/amo-table-a-6-amo-add-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c: ...here.
            * gcc.target/riscv/amo-table-a-6-amo-add-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c: ...here.
            * gcc.target/riscv/amo-table-a-6-amo-add-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c: ...here.
            * gcc.target/riscv/amo-table-a-6-amo-add-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-6.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c: ...here.
            * gcc.target/riscv/amo-table-a-6-compare-exchange-7.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c: ...here.
            * gcc.target/riscv/amo-table-a-6-fence-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-fence-1.c: ...here.
            * gcc.target/riscv/amo-table-a-6-fence-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-fence-2.c: ...here.
            * gcc.target/riscv/amo-table-a-6-fence-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-fence-3.c: ...here.
            * gcc.target/riscv/amo-table-a-6-fence-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-fence-4.c: ...here.
            * gcc.target/riscv/amo-table-a-6-fence-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-fence-5.c: ...here.
            * gcc.target/riscv/amo-table-a-6-load-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-load-1.c: ...here.
            * gcc.target/riscv/amo-table-a-6-load-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-load-2.c: ...here.
            * gcc.target/riscv/amo-table-a-6-load-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-load-3.c: ...here.
            * gcc.target/riscv/amo-table-a-6-store-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-store-1.c: ...here.
            * gcc.target/riscv/amo-table-a-6-store-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-store-2.c: ...here.
            * gcc.target/riscv/amo-table-a-6-store-compat-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c: ...here.
            * gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c: ...here.
            * gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c: ...here.
            * gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c: ...here.
            * gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c: ...here.
            * gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c: ...here.
            * gcc.target/riscv/amo-table-ztso-amo-add-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c: ...here.
            * gcc.target/riscv/amo-table-ztso-amo-add-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c: ...here.
            * gcc.target/riscv/amo-table-ztso-amo-add-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c: ...here.
            * gcc.target/riscv/amo-table-ztso-amo-add-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c: ...here.
            * gcc.target/riscv/amo-table-ztso-amo-add-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-1.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-2.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-3.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-4.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-5.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-6.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-6.c: ...here.
            * gcc.target/riscv/amo-table-ztso-compare-exchange-7.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-compare-exchange-7.c: ...here.
            * gcc.target/riscv/amo-table-ztso-fence-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-fence-1.c: ...here.
            * gcc.target/riscv/amo-table-ztso-fence-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-fence-2.c: ...here.
            * gcc.target/riscv/amo-table-ztso-fence-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-fence-3.c: ...here.
            * gcc.target/riscv/amo-table-ztso-fence-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-fence-4.c: ...here.
            * gcc.target/riscv/amo-table-ztso-fence-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-fence-5.c: ...here.
            * gcc.target/riscv/amo-table-ztso-load-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-load-1.c: ...here.
            * gcc.target/riscv/amo-table-ztso-load-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-load-2.c: ...here.
            * gcc.target/riscv/amo-table-ztso-load-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-load-3.c: ...here.
            * gcc.target/riscv/amo-table-ztso-store-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-store-1.c: ...here.
            * gcc.target/riscv/amo-table-ztso-store-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-store-2.c: ...here.
            * gcc.target/riscv/amo-table-ztso-store-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-store-3.c: ...here.
            * gcc.target/riscv/amo-table-ztso-subword-amo-add-1.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c: ...here.
            * gcc.target/riscv/amo-table-ztso-subword-amo-add-2.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c: ...here.
            * gcc.target/riscv/amo-table-ztso-subword-amo-add-3.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c: ...here.
            * gcc.target/riscv/amo-table-ztso-subword-amo-add-4.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c: ...here.
            * gcc.target/riscv/amo-table-ztso-subword-amo-add-5.c: Move to...
            * gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c: ...here.
            * gcc.target/riscv/amo-zaamo-preferred-over-zalrsc.c: Move to...
            * gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c: ...here.
            * gcc.target/riscv/amo-zalrsc-amo-add-1.c: Move to...
            * gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c: ...here.
            * gcc.target/riscv/amo-zalrsc-amo-add-2.c: Move to...
            * gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c: ...here.
            * gcc.target/riscv/amo-zalrsc-amo-add-3.c: Move to...
            * gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c: ...here.
            * gcc.target/riscv/amo-zalrsc-amo-add-4.c: Move to...
            * gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c: ...here.
            * gcc.target/riscv/amo-zalrsc-amo-add-5.c: Move to...
            * gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c: ...here.
            * gcc.target/riscv/inline-atomics-1.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-1.c: ...here.
            * gcc.target/riscv/inline-atomics-2.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-2.c: ...here.
            * gcc.target/riscv/inline-atomics-3.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-3.c: ...here.
            * gcc.target/riscv/inline-atomics-4.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-4.c: ...here.
            * gcc.target/riscv/inline-atomics-5.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-5.c: ...here.
            * gcc.target/riscv/inline-atomics-6.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-6.c: ...here.
            * gcc.target/riscv/inline-atomics-7.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-7.c: ...here.
            * gcc.target/riscv/inline-atomics-8.c: Move to...
            * gcc.target/riscv/amo/inline-atomics-8.c: ...here.
            * gcc.target/riscv/pr114130.c: Move to...
            * gcc.target/riscv/amo/pr114130.c: ...here.
            * gcc.target/riscv/pr89835.c: Move to...
            * gcc.target/riscv/amo/pr89835.c: ...here.
            * gcc.target/riscv/amo/amo.exp: New file.
    
    Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>

Diff:
---
 .../riscv/{ => amo}/amo-table-a-6-amo-add-1.c      |  0
 .../riscv/{ => amo}/amo-table-a-6-amo-add-2.c      |  0
 .../riscv/{ => amo}/amo-table-a-6-amo-add-3.c      |  0
 .../riscv/{ => amo}/amo-table-a-6-amo-add-4.c      |  0
 .../riscv/{ => amo}/amo-table-a-6-amo-add-5.c      |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-1.c   |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-2.c   |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-3.c   |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-4.c   |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-5.c   |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-6.c   |  0
 .../{ => amo}/amo-table-a-6-compare-exchange-7.c   |  0
 .../riscv/{ => amo}/amo-table-a-6-fence-1.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-fence-2.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-fence-3.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-fence-4.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-fence-5.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-load-1.c         |  0
 .../riscv/{ => amo}/amo-table-a-6-load-2.c         |  0
 .../riscv/{ => amo}/amo-table-a-6-load-3.c         |  0
 .../riscv/{ => amo}/amo-table-a-6-store-1.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-store-2.c        |  0
 .../riscv/{ => amo}/amo-table-a-6-store-compat-3.c |  0
 .../{ => amo}/amo-table-a-6-subword-amo-add-1.c    |  0
 .../{ => amo}/amo-table-a-6-subword-amo-add-2.c    |  0
 .../{ => amo}/amo-table-a-6-subword-amo-add-3.c    |  0
 .../{ => amo}/amo-table-a-6-subword-amo-add-4.c    |  0
 .../{ => amo}/amo-table-a-6-subword-amo-add-5.c    |  0
 .../riscv/{ => amo}/amo-table-ztso-amo-add-1.c     |  0
 .../riscv/{ => amo}/amo-table-ztso-amo-add-2.c     |  0
 .../riscv/{ => amo}/amo-table-ztso-amo-add-3.c     |  0
 .../riscv/{ => amo}/amo-table-ztso-amo-add-4.c     |  0
 .../riscv/{ => amo}/amo-table-ztso-amo-add-5.c     |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-1.c  |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-2.c  |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-3.c  |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-4.c  |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-5.c  |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-6.c  |  0
 .../{ => amo}/amo-table-ztso-compare-exchange-7.c  |  0
 .../riscv/{ => amo}/amo-table-ztso-fence-1.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-fence-2.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-fence-3.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-fence-4.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-fence-5.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-load-1.c        |  0
 .../riscv/{ => amo}/amo-table-ztso-load-2.c        |  0
 .../riscv/{ => amo}/amo-table-ztso-load-3.c        |  0
 .../riscv/{ => amo}/amo-table-ztso-store-1.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-store-2.c       |  0
 .../riscv/{ => amo}/amo-table-ztso-store-3.c       |  0
 .../{ => amo}/amo-table-ztso-subword-amo-add-1.c   |  0
 .../{ => amo}/amo-table-ztso-subword-amo-add-2.c   |  0
 .../{ => amo}/amo-table-ztso-subword-amo-add-3.c   |  0
 .../{ => amo}/amo-table-ztso-subword-amo-add-4.c   |  0
 .../{ => amo}/amo-table-ztso-subword-amo-add-5.c   |  0
 .../{ => amo}/amo-zaamo-preferred-over-zalrsc.c    |  0
 .../riscv/{ => amo}/amo-zalrsc-amo-add-1.c         |  0
 .../riscv/{ => amo}/amo-zalrsc-amo-add-2.c         |  0
 .../riscv/{ => amo}/amo-zalrsc-amo-add-3.c         |  0
 .../riscv/{ => amo}/amo-zalrsc-amo-add-4.c         |  0
 .../riscv/{ => amo}/amo-zalrsc-amo-add-5.c         |  0
 gcc/testsuite/gcc.target/riscv/amo/amo.exp         | 41 ++++++++++++++++++++++
 .../gcc.target/riscv/{ => amo}/inline-atomics-1.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-2.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-3.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-4.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-5.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-6.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-7.c  |  0
 .../gcc.target/riscv/{ => amo}/inline-atomics-8.c  |  0
 .../gcc.target/riscv/{ => amo}/pr114130.c          |  0
 gcc/testsuite/gcc.target/riscv/{ => amo}/pr89835.c |  0
 73 files changed, 41 insertions(+)

diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-6.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-6.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-7.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-7.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-fence-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-load-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-load-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-load-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-load-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-load-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-load-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-store-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-store-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-store-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-store-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-store-compat-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-store-compat-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-amo-add-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-6.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-6.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-6.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-6.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-7.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-7.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-compare-exchange-7.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-compare-exchange-7.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-fence-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-fence-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-load-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-load-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-load-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-load-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-load-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-load-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-store-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-store-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-store-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-store-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-store-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-store-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-table-ztso-subword-amo-add-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-zaamo-preferred-over-zalrsc.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-zaamo-preferred-over-zalrsc.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/amo-zalrsc-amo-add-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo.exp b/gcc/testsuite/gcc.target/riscv/amo/amo.exp
new file mode 100644
index 000000000000..2806f4bda7aa
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo.exp
@@ -0,0 +1,41 @@
+# Copyright (C) 2024-2024 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# GCC testsuite that uses the `dg.exp' driver.
+
+# Exit immediately if this isn't a RISC-V target.
+if ![istarget riscv*-*-*] then {
+  return
+}
+
+# Load support procs.
+load_lib gcc-dg.exp
+
+# If a testcase doesn't have special options, use these.
+global DEFAULT_CFLAGS
+if ![info exists DEFAULT_CFLAGS] then {
+    set DEFAULT_CFLAGS " -ansi -pedantic-errors"
+}
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
+	"" $DEFAULT_CFLAGS
+
+# All done.
+dg-finish
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-1.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-1.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-1.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-2.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-2.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-2.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-2.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-3.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-3.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-3.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-3.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-4.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-4.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-4.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-4.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-5.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-5.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-5.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-5.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-6.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-6.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-6.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-6.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-7.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-7.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-7.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-7.c
diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-8.c b/gcc/testsuite/gcc.target/riscv/amo/inline-atomics-8.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/inline-atomics-8.c
rename to gcc/testsuite/gcc.target/riscv/amo/inline-atomics-8.c
diff --git a/gcc/testsuite/gcc.target/riscv/pr114130.c b/gcc/testsuite/gcc.target/riscv/amo/pr114130.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/pr114130.c
rename to gcc/testsuite/gcc.target/riscv/amo/pr114130.c
diff --git a/gcc/testsuite/gcc.target/riscv/pr89835.c b/gcc/testsuite/gcc.target/riscv/amo/pr89835.c
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/pr89835.c
rename to gcc/testsuite/gcc.target/riscv/amo/pr89835.c