[gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] testsuite: [arm/mve] Use arm_softfp and arm_hard as needed in MVE tests

[Tamar Christina]

https://gcc.gnu.org/g:ddce7c0cb30343a7fb8574907596699ca5332e65

commit ddce7c0cb30343a7fb8574907596699ca5332e65
Author: Christophe Lyon <christophe.lyon@linaro.org>
Date:   Wed Apr 22 13:45:05 2020 +0000

    testsuite: [arm/mve] Use arm_softfp and arm_hard as needed in MVE tests
    
    Some MVE tests explicitly test a -mfloat-abi=hard option, but we need
    to check that the toolchain actually supports it (which may not be the
    case for arm-linux-gnueabi* targets). We can thus remove the related
    dg-skip directives.
    
    We also make use of dg-add-options arm_v8_1m_mve_fp and arm_v8_1m_mve
    instead of duplicating the corresponding options in
    dg-additional-options where we keep only -mfloat-abi to override the
    option selected by arm_v8_1m_mve_fp.
    
    2020-04-22  Christophe Lyon  <christophe.lyon@linaro.org>
    
            gcc/testsuite/
            * gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c: Use arm_hard_ok
            effective target and arm_v8_1m_mve_fp options.
            * gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c: Use arm_softfp_ok
            effective target and arm_v8_1m_mve_fp options.
            * gcc.target/arm/mve/intrinsics/mve_fpu1.c: Use arm_hard_ok
            effective target and arm_v8_1m_mve options.
            * gcc.target/arm/mve/intrinsics/mve_fpu2.c: Use arm_softfp_ok
            effective target and arm_v8_1m_mve options.

Diff:
---
 gcc/testsuite/ChangeLog                                   | 11 +++++++++++
 gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c |  5 +++--
 gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c |  4 +++-
 gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu1.c    |  5 +++--
 gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu2.c    |  5 +++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c3a03cb73f..81f3caeb3d2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2020-04-22  Christophe Lyon  <christophe.lyon@linaro.org>
+
+        * gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c: Use arm_hard_ok
+        effective target and arm_v8_1m_mve_fp options.
+        * gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c: Use arm_softfp_ok
+        effective target and arm_v8_1m_mve_fp options.
+        * gcc.target/arm/mve/intrinsics/mve_fpu1.c: Use arm_hard_ok
+        effective target and arm_v8_1m_mve options.
+        * gcc.target/arm/mve/intrinsics/mve_fpu2.c: Use arm_softfp_ok
+        effective target and arm_v8_1m_mve options.
+
 2020-04-22  Christophe Lyon  <christophe.lyon@linaro.org>
 
         * lib/target-supports.exp (arm_softfp_ok): New effective target.
diff --git a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c
index 1462dd4be07..e375327fb97 100644
--- a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c
+++ b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu1.c
@@ -1,6 +1,7 @@
 /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
-/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=soft" } {""} } */
-/* { dg-additional-options "-march=armv8.1-m.main+mve.fp -mfloat-abi=hard -mthumb -mfpu=auto --save-temps" } */
+/* { dg-require-effective-target arm_hard_ok } */
+/* { dg-add-options arm_v8_1m_mve_fp } */
+/* { dg-additional-options "-mfloat-abi=hard" } */
 
 #include "arm_mve.h"
 
diff --git a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c
index d528133e36f..1fca1100cf0 100644
--- a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c
+++ b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fp_fpu2.c
@@ -1,5 +1,7 @@
 /* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
-/* { dg-additional-options "-march=armv8.1-m.main+mve.fp -mfloat-abi=softfp -mthumb -mfpu=auto --save-temps" } */
+/* { dg-require-effective-target arm_softfp_ok } */
+/* { dg-add-options arm_v8_1m_mve_fp } */
+/* { dg-additional-options "-mfloat-abi=softfp" } */
 
 #include "arm_mve.h"
 
diff --git a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu1.c b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu1.c
index 59ca724885f..611097ec956 100644
--- a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu1.c
+++ b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu1.c
@@ -1,6 +1,7 @@
 /* { dg-require-effective-target arm_v8_1m_mve_ok } */
-/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=soft" } {""} } */
-/* { dg-additional-options "-march=armv8.1-m.main+mve -mfloat-abi=hard -mthumb -mfpu=auto --save-temps" } */
+/* { dg-require-effective-target arm_hard_ok } */
+/* { dg-add-options arm_v8_1m_mve } */
+/* { dg-additional-options "-mfloat-abi=hard" } */
 
 #include "arm_mve.h"
 
diff --git a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu2.c b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu2.c
index ce297ead3ca..b8e105111de 100644
--- a/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu2.c
+++ b/gcc/testsuite/gcc.target/arm/mve/intrinsics/mve_fpu2.c
@@ -1,6 +1,7 @@
 /* { dg-require-effective-target arm_v8_1m_mve_ok } */
-/* { dg-skip-if "Incompatible float ABI" { *-*-* } { "-mfloat-abi=soft" } {""} } */
-/* { dg-additional-options "-march=armv8.1-m.main+mve -mfloat-abi=softfp -mthumb -mfpu=auto --save-temps" } */
+/* { dg-require-effective-target arm_softfp_ok } */
+/* { dg-add-options arm_v8_1m_mve } */
+/* { dg-additional-options "-mfloat-abi=softfp" } */
 
 #include "arm_mve.h"