public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH 0/3] RISC-V: Amo testsuite cleanup
@ 2024-06-11 18:03 Patrick O'Neill
  2024-06-11 18:03 ` [PATCH 1/3] RISC-V: Move amo tests into subfolder Patrick O'Neill
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Patrick O'Neill @ 2024-06-11 18:03 UTC (permalink / raw)
  To: gcc-patches; +Cc: jeffreyalaw, kito.cheng, gnu-toolchain, Patrick O'Neill

This series moves the atomic-related riscv testcases into their own folder and
fixes some minor bugs/rigidity of existing testcases.

Patrick O'Neill (3):
  RISC-V: Move amo tests into subfolder
  RISC-V: Fix amoadd call arguments
  RISC-V: Allow any temp register to be used in amo tests

 .../riscv/{ => amo}/amo-table-a-6-amo-add-1.c |  2 +-
 .../riscv/{ => amo}/amo-table-a-6-amo-add-2.c |  2 +-
 .../riscv/{ => amo}/amo-table-a-6-amo-add-3.c |  2 +-
 .../riscv/{ => amo}/amo-table-a-6-amo-add-4.c |  2 +-
 .../riscv/{ => amo}/amo-table-a-6-amo-add-5.c |  2 +-
 .../amo-table-a-6-compare-exchange-1.c        |  0
 .../amo-table-a-6-compare-exchange-2.c        |  0
 .../amo-table-a-6-compare-exchange-3.c        |  0
 .../amo-table-a-6-compare-exchange-4.c        |  0
 .../amo-table-a-6-compare-exchange-5.c        |  0
 .../amo-table-a-6-compare-exchange-6.c        |  0
 .../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    |  4 +-
 .../riscv/{ => amo}/amo-table-a-6-load-2.c    |  4 +-
 .../riscv/{ => amo}/amo-table-a-6-load-3.c    |  4 +-
 .../riscv/{ => amo}/amo-table-a-6-store-1.c   |  4 +-
 .../riscv/{ => amo}/amo-table-a-6-store-2.c   |  4 +-
 .../{ => amo}/amo-table-a-6-store-compat-3.c  |  4 +-
 .../amo-table-a-6-subword-amo-add-1.c         |  2 +-
 .../amo-table-a-6-subword-amo-add-2.c         |  2 +-
 .../amo-table-a-6-subword-amo-add-3.c         |  2 +-
 .../amo-table-a-6-subword-amo-add-4.c         |  2 +-
 .../amo-table-a-6-subword-amo-add-5.c         |  2 +-
 .../{ => amo}/amo-table-ztso-amo-add-1.c      |  2 +-
 .../{ => amo}/amo-table-ztso-amo-add-2.c      |  2 +-
 .../{ => amo}/amo-table-ztso-amo-add-3.c      |  2 +-
 .../{ => amo}/amo-table-ztso-amo-add-4.c      |  2 +-
 .../{ => amo}/amo-table-ztso-amo-add-5.c      |  2 +-
 .../amo-table-ztso-compare-exchange-1.c       |  0
 .../amo-table-ztso-compare-exchange-2.c       |  0
 .../amo-table-ztso-compare-exchange-3.c       |  0
 .../amo-table-ztso-compare-exchange-4.c       |  0
 .../amo-table-ztso-compare-exchange-5.c       |  0
 .../amo-table-ztso-compare-exchange-6.c       |  0
 .../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   |  4 +-
 .../riscv/{ => amo}/amo-table-ztso-load-2.c   |  4 +-
 .../riscv/{ => amo}/amo-table-ztso-load-3.c   |  4 +-
 .../riscv/{ => amo}/amo-table-ztso-store-1.c  |  4 +-
 .../riscv/{ => amo}/amo-table-ztso-store-2.c  |  4 +-
 .../riscv/{ => amo}/amo-table-ztso-store-3.c  |  4 +-
 .../amo-table-ztso-subword-amo-add-1.c        |  2 +-
 .../amo-table-ztso-subword-amo-add-2.c        |  2 +-
 .../amo-table-ztso-subword-amo-add-3.c        |  2 +-
 .../amo-table-ztso-subword-amo-add-4.c        |  2 +-
 .../amo-table-ztso-subword-amo-add-5.c        |  2 +-
 .../amo-zaamo-preferred-over-zalrsc.c         |  2 +-
 .../riscv/{ => amo}/amo-zalrsc-amo-add-1.c    |  2 +-
 .../riscv/{ => amo}/amo-zalrsc-amo-add-2.c    |  2 +-
 .../riscv/{ => amo}/amo-zalrsc-amo-add-3.c    |  2 +-
 .../riscv/{ => amo}/amo-zalrsc-amo-add-4.c    |  2 +-
 .../riscv/{ => amo}/amo-zalrsc-amo-add-5.c    |  2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo.exp    | 41 +++++++++++++++++++
 .../riscv/{ => amo}/inline-atomics-1.c        |  0
 .../riscv/{ => amo}/inline-atomics-2.c        |  0
 .../riscv/{ => amo}/inline-atomics-3.c        |  0
 .../riscv/{ => amo}/inline-atomics-4.c        |  0
 .../riscv/{ => amo}/inline-atomics-5.c        |  0
 .../riscv/{ => amo}/inline-atomics-6.c        |  0
 .../riscv/{ => amo}/inline-atomics-7.c        |  0
 .../riscv/{ => amo}/inline-atomics-8.c        |  0
 .../gcc.target/riscv/{ => amo}/pr114130.c     |  0
 .../gcc.target/riscv/{ => amo}/pr89835.c      |  0
 73 files changed, 91 insertions(+), 50 deletions(-)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-1.c (92%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-2.c (92%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-3.c (92%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-4.c (92%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-5.c (92%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-6.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-7.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-load-1.c (85%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-load-2.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-load-3.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-store-1.c (85%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-store-2.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-store-compat-3.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-1.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-2.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-3.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-4.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-5.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-1.c (93%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-2.c (93%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-3.c (93%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-4.c (93%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-5.c (93%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-6.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-7.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-load-1.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-load-2.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-load-3.c (87%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-store-1.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-store-2.c (86%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-store-3.c (87%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-1.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-2.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-3.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-4.c (90%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-5.c (91%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zaamo-preferred-over-zalrsc.c (93%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-1.c (94%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-2.c (94%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-3.c (94%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-4.c (94%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-5.c (94%)
 create mode 100644 gcc/testsuite/gcc.target/riscv/amo/amo.exp
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-6.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-7.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-8.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/pr114130.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/pr89835.c (100%)

--
2.34.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] RISC-V: Move amo tests into subfolder
  2024-06-11 18:03 [PATCH 0/3] RISC-V: Amo testsuite cleanup Patrick O'Neill
@ 2024-06-11 18:03 ` Patrick O'Neill
  2024-06-11 18:03 ` [PATCH 2/3] RISC-V: Fix amoadd call arguments Patrick O'Neill
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Patrick O'Neill @ 2024-06-11 18:03 UTC (permalink / raw)
  To: gcc-patches; +Cc: jeffreyalaw, kito.cheng, gnu-toolchain, Patrick O'Neill

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>
---
amo.exp is based off h8300.exp and I referenced a few other *.exp files.
I tested by ensuring an edited testcase fails but I'd appreciate a close look at
that file since dejagnu is still a bit of a mystery to me.
---
 .../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-table-a-6-compare-exchange-1.c        |  0
 .../amo-table-a-6-compare-exchange-2.c        |  0
 .../amo-table-a-6-compare-exchange-3.c        |  0
 .../amo-table-a-6-compare-exchange-4.c        |  0
 .../amo-table-a-6-compare-exchange-5.c        |  0
 .../amo-table-a-6-compare-exchange-6.c        |  0
 .../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
 .../{ => amo}/amo-table-a-6-store-compat-3.c  |  0
 .../amo-table-a-6-subword-amo-add-1.c         |  0
 .../amo-table-a-6-subword-amo-add-2.c         |  0
 .../amo-table-a-6-subword-amo-add-3.c         |  0
 .../amo-table-a-6-subword-amo-add-4.c         |  0
 .../amo-table-a-6-subword-amo-add-5.c         |  0
 .../{ => amo}/amo-table-ztso-amo-add-1.c      |  0
 .../{ => amo}/amo-table-ztso-amo-add-2.c      |  0
 .../{ => amo}/amo-table-ztso-amo-add-3.c      |  0
 .../{ => amo}/amo-table-ztso-amo-add-4.c      |  0
 .../{ => amo}/amo-table-ztso-amo-add-5.c      |  0
 .../amo-table-ztso-compare-exchange-1.c       |  0
 .../amo-table-ztso-compare-exchange-2.c       |  0
 .../amo-table-ztso-compare-exchange-3.c       |  0
 .../amo-table-ztso-compare-exchange-4.c       |  0
 .../amo-table-ztso-compare-exchange-5.c       |  0
 .../amo-table-ztso-compare-exchange-6.c       |  0
 .../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-table-ztso-subword-amo-add-1.c        |  0
 .../amo-table-ztso-subword-amo-add-2.c        |  0
 .../amo-table-ztso-subword-amo-add-3.c        |  0
 .../amo-table-ztso-subword-amo-add-4.c        |  0
 .../amo-table-ztso-subword-amo-add-5.c        |  0
 .../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 +++++++++++++++++++
 .../riscv/{ => amo}/inline-atomics-1.c        |  0
 .../riscv/{ => amo}/inline-atomics-2.c        |  0
 .../riscv/{ => amo}/inline-atomics-3.c        |  0
 .../riscv/{ => amo}/inline-atomics-4.c        |  0
 .../riscv/{ => amo}/inline-atomics-5.c        |  0
 .../riscv/{ => amo}/inline-atomics-6.c        |  0
 .../riscv/{ => amo}/inline-atomics-7.c        |  0
 .../riscv/{ => amo}/inline-atomics-8.c        |  0
 .../gcc.target/riscv/{ => amo}/pr114130.c     |  0
 .../gcc.target/riscv/{ => amo}/pr89835.c      |  0
 73 files changed, 41 insertions(+)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-amo-add-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-6.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-compare-exchange-7.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-fence-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-load-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-load-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-load-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-store-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-store-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-store-compat-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-a-6-subword-amo-add-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-amo-add-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-6.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-compare-exchange-7.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-fence-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-load-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-load-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-load-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-store-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-store-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-store-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-table-ztso-subword-amo-add-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zaamo-preferred-over-zalrsc.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/amo-zalrsc-amo-add-5.c (100%)
 create mode 100644 gcc/testsuite/gcc.target/riscv/amo/amo.exp
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-1.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-2.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-3.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-4.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-5.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-6.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-7.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/inline-atomics-8.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/pr114130.c (100%)
 rename gcc/testsuite/gcc.target/riscv/{ => amo}/pr89835.c (100%)

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 00000000000..2806f4bda7a
--- /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
--
2.34.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/3] RISC-V: Fix amoadd call arguments
  2024-06-11 18:03 [PATCH 0/3] RISC-V: Amo testsuite cleanup Patrick O'Neill
  2024-06-11 18:03 ` [PATCH 1/3] RISC-V: Move amo tests into subfolder Patrick O'Neill
@ 2024-06-11 18:03 ` Patrick O'Neill
  2024-06-11 18:03 ` [PATCH 3/3] RISC-V: Allow any temp register to be used in amo tests Patrick O'Neill
  2024-06-12 18:12 ` [PATCH 0/3] RISC-V: Amo testsuite cleanup Jeff Law
  3 siblings, 0 replies; 7+ messages in thread
From: Patrick O'Neill @ 2024-06-11 18:03 UTC (permalink / raw)
  To: gcc-patches; +Cc: jeffreyalaw, kito.cheng, gnu-toolchain, Patrick O'Neill

Update __atomic_add_fetch arguments to be a pointer and value rather
than two pointers.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c: Update
	__atomic_add_fetch args.
	* gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c: Ditto.
	* gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c: Ditto.
	* gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c: Ditto.
	* gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c: Ditto.
	* gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c: Ditto.
	* gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c: Ditto.
	* gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c: Ditto.

Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>
---
Related: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115441
---
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c    | 2 +-
 .../gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c      | 2 +-
 .../gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c      | 2 +-
 .../gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c      | 2 +-
 .../gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c      | 2 +-
 .../gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c      | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c   | 2 +-
 .../gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c     | 2 +-
 .../gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c     | 2 +-
 .../gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c     | 2 +-
 .../gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c     | 2 +-
 .../gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c     | 2 +-
 .../gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c      | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c       | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c       | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c       | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c       | 2 +-
 gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c       | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c
index 9c2ba39789a..2e53abf28aa 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c
@@ -10,7 +10,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c
index b7682a5bab4..14d6b7e4b1b 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c
@@ -10,7 +10,7 @@
 **	amoadd\.w\.aq\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQUIRE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c
index c8776872d91..937a00daf4c 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c
@@ -10,7 +10,7 @@
 **	amoadd\.w\.rl\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELEASE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c
index b37c4c3f242..7d7f4e11dd4 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c
@@ -10,7 +10,7 @@
 **	amoadd\.w\.aqrl\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQ_REL);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c
index 8d45ca7a347..e5cf1e2e9cf 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c
@@ -10,7 +10,7 @@
 **	amoadd\.w\.aqrl\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_SEQ_CST);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/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
index 4174fdee352..348b9c8db9c 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/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
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/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
index 4c06c90b558..31011580684 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/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
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQUIRE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/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
index 7e791c901b6..38bedcd6b41 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/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
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELEASE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/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
index 76f3be27110..d69610e2d9e 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/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
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQ_REL);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/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
index 8dbfa9c4fc8..976f8909bdd 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/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
@@ -4,7 +4,7 @@
 /* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_SEQ_CST);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c
index 82169390925..000407a2583 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-1.c
@@ -11,7 +11,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c
index a238c6f4403..3e441cadbf3 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-2.c
@@ -11,7 +11,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQUIRE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c
index c97bf467c63..8af1a2f79a4 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-3.c
@@ -11,7 +11,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELEASE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c
index 14e632ba2f2..0b3a7e59689 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-4.c
@@ -11,7 +11,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQ_REL);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c
index 74d8df99ddc..f189827d6cf 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-amo-add-5.c
@@ -11,7 +11,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_SEQ_CST);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c
index 5c0a8b8f6e9..a44d6980ece 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-1.c
@@ -5,7 +5,7 @@
 /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c
index 551078186ec..8d28569c79c 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-2.c
@@ -5,7 +5,7 @@
 /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQUIRE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c
index 5f0f7870721..fb803ab9cbf 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-3.c
@@ -5,7 +5,7 @@
 /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELEASE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c
index 24f4f02dcea..a88e409063a 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-4.c
@@ -5,7 +5,7 @@
 /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQ_REL);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c
index 405e498fb40..d851e5e5944 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-subword-amo-add-5.c
@@ -5,7 +5,7 @@
 /* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */
 /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */

-void foo (short* bar, short* baz)
+void foo (short* bar, short baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_SEQ_CST);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c
index 1c124c2b8b1..dae30c32e01 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zaamo-preferred-over-zalrsc.c
@@ -11,7 +11,7 @@
 **	amoadd\.w\tzero,a1,0\(a0\)
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c
index 3fa74332433..49c1a181d69 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c
@@ -13,7 +13,7 @@
 **      bnez\t[atx][0-9]+, 1b
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c
index af0a2d50d38..af93c9a182b 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c
@@ -13,7 +13,7 @@
 **      bnez\t[atx][0-9]+, 1b
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQUIRE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c
index 521869b2165..ce68af841ea 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c
@@ -13,7 +13,7 @@
 **      bnez\t[atx][0-9]+, 1b
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_RELEASE);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c
index 8b6e7579f6f..be9f847782e 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c
@@ -13,7 +13,7 @@
 **      bnez\t[atx][0-9]+, 1b
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_ACQ_REL);
 }
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c
index 0bdc47d5c46..b31170c15db 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c
@@ -13,7 +13,7 @@
 **      bnez\t[atx][0-9]+, 1b
 **	ret
 */
-void foo (int* bar, int* baz)
+void foo (int* bar, int baz)
 {
   __atomic_add_fetch(bar, baz, __ATOMIC_SEQ_CST);
 }
--
2.34.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/3] RISC-V: Allow any temp register to be used in amo tests
  2024-06-11 18:03 [PATCH 0/3] RISC-V: Amo testsuite cleanup Patrick O'Neill
  2024-06-11 18:03 ` [PATCH 1/3] RISC-V: Move amo tests into subfolder Patrick O'Neill
  2024-06-11 18:03 ` [PATCH 2/3] RISC-V: Fix amoadd call arguments Patrick O'Neill
@ 2024-06-11 18:03 ` Patrick O'Neill
  2024-06-12 18:12 ` [PATCH 0/3] RISC-V: Amo testsuite cleanup Jeff Law
  3 siblings, 0 replies; 7+ messages in thread
From: Patrick O'Neill @ 2024-06-11 18:03 UTC (permalink / raw)
  To: gcc-patches; +Cc: jeffreyalaw, kito.cheng, gnu-toolchain, Patrick O'Neill

We artifically restrict the temp registers to be a[0-9]+ when other
registers like t[0-9]+ are valid too. Update to make the regex
accept any register for the temp value.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/amo/amo-table-a-6-load-1.c: Update temp register regex.
	* gcc.target/riscv/amo/amo-table-a-6-load-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-load-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-store-1.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-store-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-load-1.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-load-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-load-3.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-store-1.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-store-2.c: Ditto.
	* gcc.target/riscv/amo/amo-table-ztso-store-3.c: Ditto.

Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>
---
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c     | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c     | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c     | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c    | 4 ++--
 .../gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c       | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c   | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c   | 4 ++--
 gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c   | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c
index 3c79035e46d..53dd5234452 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c
@@ -6,8 +6,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a0\)
-**	sw\ta[0-9]+,0\(a1\)
+**	lw\t[atx][0-9]+,0\(a0\)
+**	sw\t[atx][0-9]+,0\(a1\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c
index 7d74841846f..dda0f541515 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c
@@ -6,9 +6,9 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a0\)
+**	lw\t[atx][0-9]+,0\(a0\)
 **	fence\tr,rw
-**	sw\ta[0-9]+,0\(a1\)
+**	sw\t[atx][0-9]+,0\(a1\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c
index ab95fa660d2..3279557fa4a 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c
@@ -7,9 +7,9 @@
 /*
 ** foo:
 **	fence\trw,rw
-**	lw\ta[0-9]+,0\(a0\)
+**	lw\t[atx][0-9]+,0\(a0\)
 **	fence\tr,rw
-**	sw\ta[0-9]+,0\(a1\)
+**	sw\t[atx][0-9]+,0\(a1\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c
index d852fddf03d..6b05429520b 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c
@@ -6,8 +6,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a1\)
-**	sw\ta[0-9]+,0\(a0\)
+**	lw\t[atx][0-9]+,0\(a1\)
+**	sw\t[atx][0-9]+,0\(a0\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c
index ccb5e2af7cc..1ad7dede931 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c
@@ -6,9 +6,9 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a1\)
+**	lw\t[atx][0-9]+,0\(a1\)
 **	fence\trw,w
-**	sw\ta[0-9]+,0\(a0\)
+**	sw\t[atx][0-9]+,0\(a0\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c
index 761889f18cf..b16b2058413 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c
@@ -6,9 +6,9 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a1\)
+**	lw\t[atx][0-9]+,0\(a1\)
 **	fence\trw,w
-**	sw\ta[0-9]+,0\(a0\)
+**	sw\t[atx][0-9]+,0\(a0\)
 **	fence\trw,rw
 **	ret
 */
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c
index 631977985bd..ebb0a2e1d38 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-1.c
@@ -7,8 +7,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a0\)
-**	sw\ta[0-9]+,0\(a1\)
+**	lw\t[atx][0-9]+,0\(a0\)
+**	sw\t[atx][0-9]+,0\(a1\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c
index 2c24f10fb44..c88c4be5aea 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-2.c
@@ -7,8 +7,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a0\)
-**	sw\ta[0-9]+,0\(a1\)
+**	lw\t[atx][0-9]+,0\(a0\)
+**	sw\t[atx][0-9]+,0\(a1\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c
index 7d2166d29c0..8713729c378 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-load-3.c
@@ -8,8 +8,8 @@
 /*
 ** foo:
 **	fence\trw,rw
-**	lw\ta[0-9]+,0\(a0\)
-**	sw\ta[0-9]+,0\(a1\)
+**	lw\t[atx][0-9]+,0\(a0\)
+**	sw\t[atx][0-9]+,0\(a1\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c
index 29a770285ef..ca8d5ed7515 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-1.c
@@ -7,8 +7,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a1\)
-**	sw\ta[0-9]+,0\(a0\)
+**	lw\t[atx][0-9]+,0\(a1\)
+**	sw\t[atx][0-9]+,0\(a0\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c
index fb82360ad33..23957198cfb 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-2.c
@@ -7,8 +7,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a1\)
-**	sw\ta[0-9]+,0\(a0\)
+**	lw\t[atx][0-9]+,0\(a1\)
+**	sw\t[atx][0-9]+,0\(a0\)
 **	ret
 */
 void foo (int* bar, int* baz)
diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c
index 88d8432d8c9..11c12f0ca1a 100644
--- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c
+++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-ztso-store-3.c
@@ -7,8 +7,8 @@

 /*
 ** foo:
-**	lw\ta[0-9]+,0\(a1\)
-**	sw\ta[0-9]+,0\(a0\)
+**	lw\t[atx][0-9]+,0\(a1\)
+**	sw\t[atx][0-9]+,0\(a0\)
 **	fence\trw,rw
 **	ret
 */
--
2.34.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] RISC-V: Amo testsuite cleanup
  2024-06-11 18:03 [PATCH 0/3] RISC-V: Amo testsuite cleanup Patrick O'Neill
                   ` (2 preceding siblings ...)
  2024-06-11 18:03 ` [PATCH 3/3] RISC-V: Allow any temp register to be used in amo tests Patrick O'Neill
@ 2024-06-12 18:12 ` Jeff Law
  2024-06-12 18:20   ` [Committed] " Patrick O'Neill
  3 siblings, 1 reply; 7+ messages in thread
From: Jeff Law @ 2024-06-12 18:12 UTC (permalink / raw)
  To: Patrick O'Neill, gcc-patches; +Cc: kito.cheng, gnu-toolchain



On 6/11/24 12:03 PM, Patrick O'Neill wrote:
> This series moves the atomic-related riscv testcases into their own folder and
> fixes some minor bugs/rigidity of existing testcases.
This series is OK.
jeff


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Committed] RISC-V: Amo testsuite cleanup
  2024-06-12 18:12 ` [PATCH 0/3] RISC-V: Amo testsuite cleanup Jeff Law
@ 2024-06-12 18:20   ` Patrick O'Neill
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick O'Neill @ 2024-06-12 18:20 UTC (permalink / raw)
  To: Jeff Law, gcc-patches; +Cc: kito.cheng, gnu-toolchain


On 6/12/24 11:12, Jeff Law wrote:
>
>
> On 6/11/24 12:03 PM, Patrick O'Neill wrote:
>> This series moves the atomic-related riscv testcases into their own 
>> folder and
>> fixes some minor bugs/rigidity of existing testcases.
> This series is OK.
> jeff
>
Committed, thanks.

Patrick


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Committed] RISC-V: AMO testsuite cleanup
  2024-06-25 21:34 ` Jeff Law
@ 2024-06-26 16:42   ` Patrick O'Neill
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick O'Neill @ 2024-06-26 16:42 UTC (permalink / raw)
  To: Jeff Law, gcc-patches; +Cc: kito.cheng, palmer, gnu-toolchain


On 6/25/24 14:34, Jeff Law wrote:
>
>
> On 6/25/24 3:14 PM, Patrick O'Neill wrote:
>> This is another round of AMO testcase cleanup. Consolidates a lot of 
>> testcases
>> and unifies the testcase names.
>>
>> Patrick O'Neill (3):
>>    RISC-V: Rename amo testcases
>>    RISC-V: Consolidate amo testcase variants
>>    RISC-V: Update testcase comments to point to PSABI rather than Table
>>      A.6
> [ ... ]
> This series is OK for the trunk.
>
> Thanks,
> Jeff
>
Committed.

Patrick


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-06-26 16:42 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-11 18:03 [PATCH 0/3] RISC-V: Amo testsuite cleanup Patrick O'Neill
2024-06-11 18:03 ` [PATCH 1/3] RISC-V: Move amo tests into subfolder Patrick O'Neill
2024-06-11 18:03 ` [PATCH 2/3] RISC-V: Fix amoadd call arguments Patrick O'Neill
2024-06-11 18:03 ` [PATCH 3/3] RISC-V: Allow any temp register to be used in amo tests Patrick O'Neill
2024-06-12 18:12 ` [PATCH 0/3] RISC-V: Amo testsuite cleanup Jeff Law
2024-06-12 18:20   ` [Committed] " Patrick O'Neill
2024-06-25 21:14 [PATCH 0/3] RISC-V: AMO " Patrick O'Neill
2024-06-25 21:34 ` Jeff Law
2024-06-26 16:42   ` [Committed] " Patrick O'Neill

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).