[gcc(refs/vendors/ARM/heads/morello)] testsuite: Re-organise morello directory

[gcc(refs/vendors/ARM/heads/morello)] testsuite: Re-organise morello directory

[Matthew Malcomson]

https://gcc.gnu.org/g:0f4d52827c4424327302e27161840d26c8118b4a

commit 0f4d52827c4424327302e27161840d26c8118b4a
Author: Alex Coplan <alex.coplan@arm.com>
Date:   Mon Feb 28 14:35:56 2022 +0000

    testsuite: Re-organise morello directory
    
    This patch moves the Morello atomics tests into their own directory,
    with their own morello-atomics.exp file. The -moutline-atomics torture
    options can then be applied only to the atomics tests, which avoids
    tests that force purecap in the main morello directory FAILing when
    -moutline-atomics is forced on them.

Diff:
---
 .../morello/{ => atomics}/atomic-store-asm.c       |  0
 .../morello/{ => atomics}/fake_atomics_runtest.c   |  0
 .../aarch64/morello/atomics/morello-atomics.exp    | 52 ++++++++++++++++++++++
 .../gcc.target/aarch64/morello/morello.exp         |  6 +--
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/gcc.target/aarch64/morello/atomic-store-asm.c b/gcc/testsuite/gcc.target/aarch64/morello/atomics/atomic-store-asm.c
similarity index 100%
rename from gcc/testsuite/gcc.target/aarch64/morello/atomic-store-asm.c
rename to gcc/testsuite/gcc.target/aarch64/morello/atomics/atomic-store-asm.c
diff --git a/gcc/testsuite/gcc.target/aarch64/morello/fake_atomics_runtest.c b/gcc/testsuite/gcc.target/aarch64/morello/atomics/fake_atomics_runtest.c
similarity index 100%
rename from gcc/testsuite/gcc.target/aarch64/morello/fake_atomics_runtest.c
rename to gcc/testsuite/gcc.target/aarch64/morello/atomics/fake_atomics_runtest.c
diff --git a/gcc/testsuite/gcc.target/aarch64/morello/atomics/morello-atomics.exp b/gcc/testsuite/gcc.target/aarch64/morello/atomics/morello-atomics.exp
new file mode 100644
index 00000000000..e114fec30ed
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/morello/atomics/morello-atomics.exp
@@ -0,0 +1,52 @@
+#  Specific regression driver for AArch64 Morello.
+#  Copyright (C) 2021 Free Software Foundation, Inc.
+#
+#  This file is part of GCC.
+#
+#  GCC 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, or (at your option)
+#  any later version.
+#
+#  GCC 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/>.  */
+
+# Exit immediately if this isn't an AArch64 target.
+if {![istarget aarch64*-*-*] } then {
+  return
+}
+
+# Load support procs.
+load_lib gcc-dg.exp
+load_lib c-torture.exp
+
+# Initialize `dg'.
+dg-init
+
+if { [check_effective_target_aarch64_capability_any] } {
+  set capability_flags ""
+} else {
+  set capability_flags "-mfake-capability"
+}
+
+torture-init
+
+if { [check_effective_target_cheri_capability_pure] } {
+  set-torture-options "$C_TORTURE_OPTIONS" [list { } { -mno-outline-atomics } ]
+} else {
+  set-torture-options "$C_TORTURE_OPTIONS" [list { } { -mno-outline-atomics } { -moutline-atomics } ]
+}
+
+# Main loop.
+gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cCS\]]] \
+    "" "$capability_flags -ansi"
+
+torture-finish
+# All done.
+dg-finish
diff --git a/gcc/testsuite/gcc.target/aarch64/morello/morello.exp b/gcc/testsuite/gcc.target/aarch64/morello/morello.exp
index e114fec30ed..f0440fbd4f0 100644
--- a/gcc/testsuite/gcc.target/aarch64/morello/morello.exp
+++ b/gcc/testsuite/gcc.target/aarch64/morello/morello.exp
@@ -37,11 +37,7 @@ if { [check_effective_target_aarch64_capability_any] } {
 
 torture-init
 
-if { [check_effective_target_cheri_capability_pure] } {
-  set-torture-options "$C_TORTURE_OPTIONS" [list { } { -mno-outline-atomics } ]
-} else {
-  set-torture-options "$C_TORTURE_OPTIONS" [list { } { -mno-outline-atomics } { -moutline-atomics } ]
-}
+set-torture-options "$C_TORTURE_OPTIONS"
 
 # Main loop.
 gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cCS\]]] \