testsuite: arm: use effective-target for vsel*, mod* and pr65647.c tests

Update test cases to use -mcpu=unset/-march=unset feature introduced in
r15-3606-g7d6c6a0d15c.

gcc/testsuite/ChangeLog

	* gcc.target/arm/pr65647.c: Use effective-target arm_arch_v6m.
	Removed unneeded dg-skip-if.
	* gcc.target/arm/mod_2.c: Use effective-target arm_cpu_cortex_a57.
	* gcc.target/arm/mod_256.c: Likewise.
	* gcc.target/arm/vseleqdf.c: Likewise.
	* gcc.target/arm/vseleqsf.c: Likewise.
	* gcc.target/arm/vselgedf.c: Likewise.
	* gcc.target/arm/vselgesf.c: Likewise.
	* gcc.target/arm/vselgtdf.c: Likewise.
	* gcc.target/arm/vselgtsf.c: Likewise.
	* gcc.target/arm/vselledf.c: Likewise.
	* gcc.target/arm/vsellesf.c: Likewise.
	* gcc.target/arm/vselltdf.c: Likewise.
	* gcc.target/arm/vselltsf.c: Likewise.
	* gcc.target/arm/vselnedf.c: Likewise.
	* gcc.target/arm/vselnesf.c: Likewise.
	* gcc.target/arm/vselvcdf.c: Likewise.
	* gcc.target/arm/vselvcsf.c: Likewise.
	* gcc.target/arm/vselvsdf.c: Likewise.
	* gcc.target/arm/vselvssf.c: Likewise.
	* lib/target-supports.exp: Define effective-target arm_cpu_cortex_a57.
	Update effective-target arm_v8_1_lob_ok to use -mcpu=unset.

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>

diff --git a/gcc/testsuite/gcc.target/arm/mod_2.c b/gcc/testsuite/gcc.target/arm/mod_2.c
index 1143725d59a68a216106540dbf025039f5ed44f9..3a203b67d73eab1421e34308d108e4bc7b10589f 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/mod_2.c
+++ b/gcc/testsuite/gcc.target/arm/mod_2.c
@@ -1,7 +1,9 @@
 /* { dg-do compile } */
 /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } { "-mpure-code" } } */
 /* { dg-require-effective-target arm32 } */
-/* { dg-options "-O2 -mcpu=cortex-a57 -save-temps" } */
+/* { dg-require-effective-target arm_cpu_cortex_a57 } */
+/* { dg-options "-O2 -save-temps" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 
 #include "../aarch64/mod_2.x"
 

diff --git a/gcc/testsuite/gcc.target/arm/mod_256.c b/gcc/testsuite/gcc.target/arm/mod_256.c
index d8dca0fe7d566f4b2ecc5fa5104315b933acf5b8..3521d7a05f3e378ab0c03dddb5ea721267ad4e5b 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/mod_256.c
+++ b/gcc/testsuite/gcc.target/arm/mod_256.c
@@ -1,7 +1,9 @@
 /* { dg-do compile } */
 /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } { "-mpure-code" } } */
 /* { dg-require-effective-target arm32 } */
-/* { dg-options "-O2 -mcpu=cortex-a57 -save-temps" } */
+/* { dg-require-effective-target arm_cpu_cortex_a57 } */
+/* { dg-options "-O2 -save-temps" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 
 #include "../aarch64/mod_256.x"
 

diff --git a/gcc/testsuite/gcc.target/arm/pr65647.c b/gcc/testsuite/gcc.target/arm/pr65647.c
index 3cbf6b804ec08c77d50f3da36e080e56598759a1..e0c534bc813a1c11cc8470b7d9d1661f625e5192 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr65647.c
+++ b/gcc/testsuite/gcc.target/arm/pr65647.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target arm_arch_v6m_ok } */
-/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } {"-mfloat-abi=soft" } } */
-/* { dg-options "-march=armv6-m -mthumb -O3 -w -mfloat-abi=soft -fpermissive" } */
+/* { dg-options "-O3 -w -fpermissive" } */
+/* { dg-add-options arm_arch_v6m } */
 
 a, b, c, e, g = &e, h, i = 7, l = 1, m, n, o, q = &m, r, s = &r, u, w = 9, x,
   y = 6, z, t6 = 7, t8, t9 = 1, t11 = 5, t12 = &t8, t13 = 3, t15,

diff --git a/gcc/testsuite/gcc.target/arm/vseleqdf.c b/gcc/testsuite/gcc.target/arm/vseleqdf.c
index 8a433356492d4ead629b6720d98994b8b3deeb2b..5be3ed2b1f9b3269c71b2e292daeeaf518a41a18 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vseleqdf.c
+++ b/gcc/testsuite/gcc.target/arm/vseleqdf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vseleqsf.c b/gcc/testsuite/gcc.target/arm/vseleqsf.c
index fc4631887d84863e1a348627d742bede652a1c16..f870b5e92e994cdf2390e11b1a017641e19a6663 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vseleqsf.c
+++ b/gcc/testsuite/gcc.target/arm/vseleqsf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselgedf.c b/gcc/testsuite/gcc.target/arm/vselgedf.c
index 9a74eddbea9eb88e87ab28aa70e145e69fd7c113..a769f2e4577c8b4c524d83b19cfaa5688072a123 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselgedf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgedf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vselgesf.c b/gcc/testsuite/gcc.target/arm/vselgesf.c
index 5f1095416ee922b5bf3e809cba7b746c5810962c..ecf9157928e6b911c5944544f0649f9d8793c892 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselgesf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgesf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselgtdf.c b/gcc/testsuite/gcc.target/arm/vselgtdf.c
index 7ceaa34a529c450b817c1137aa170750d081a7ba..5267a87569f8ba311bdca1b038efb515c2bc73d3 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselgtdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgtdf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vselgtsf.c b/gcc/testsuite/gcc.target/arm/vselgtsf.c
index 9062ba2966658c8c3b60f1351bf41eef3eb76bed..f60629eafa81554b25eef72a1aab853f7b25ce14 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselgtsf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgtsf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselledf.c b/gcc/testsuite/gcc.target/arm/vselledf.c
index 4aa66ce7d9a379050aa69c15639b2be4b241bca4..4cf09818931413292d064b0d6af8c9de4b309570 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselledf.c
+++ b/gcc/testsuite/gcc.target/arm/vselledf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vsellesf.c b/gcc/testsuite/gcc.target/arm/vsellesf.c
index 9dcb791ed8ea345a0b27c8fbc15d409e7e891c03..68d29d0b5aa9c20d599bec0b4dbacf32fdf2e5aa 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vsellesf.c
+++ b/gcc/testsuite/gcc.target/arm/vsellesf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselltdf.c b/gcc/testsuite/gcc.target/arm/vselltdf.c
index 238860d7ae29be850bdffae44f09df4718dbbe14..80b3787ffa4932e9277923a39604f4b65b588801 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselltdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselltdf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vselltsf.c b/gcc/testsuite/gcc.target/arm/vselltsf.c
index 6f179bae625417640d53a7ebefa95ed5235697a4..c06378ad09786ebfbb2133730b20070ea06b0091 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselltsf.c
+++ b/gcc/testsuite/gcc.target/arm/vselltsf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselnedf.c b/gcc/testsuite/gcc.target/arm/vselnedf.c
index 3f5881e980929d6291c2e2e49c9ca0db9a9b67fb..f17ceba8d0c26ef5aa0db35758d879754eaffa36 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselnedf.c
+++ b/gcc/testsuite/gcc.target/arm/vselnedf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vselnesf.c b/gcc/testsuite/gcc.target/arm/vselnesf.c
index e72b902c2ca81ab1bd417ba7953150e82b12c3dd..a06a4d92f3bc153f24b50cbf474041c62cc1d9f5 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselnesf.c
+++ b/gcc/testsuite/gcc.target/arm/vselnesf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselvcdf.c b/gcc/testsuite/gcc.target/arm/vselvcdf.c
index 408d0957c85bef7720d2f4f21432ddc2947e54c8..6d46bf31ba4957dc924dbb531ee5432c33107f7e 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselvcdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvcdf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vselvcsf.c b/gcc/testsuite/gcc.target/arm/vselvcsf.c
index ccded1f714f68cd47a43c8d89fe745db9516b0c4..0f25a1c0ebd31d8781e8abfe9f99713487a6bc0b 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselvcsf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvcsf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/gcc.target/arm/vselvsdf.c b/gcc/testsuite/gcc.target/arm/vselvsdf.c
index f67bde18c66b85e3cec3e0c246dbca72f287caa2..be225b124a1ae566f0a911c75b33f4a2e6fc050d 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselvsdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvsdf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 double

diff --git a/gcc/testsuite/gcc.target/arm/vselvssf.c b/gcc/testsuite/gcc.target/arm/vselvssf.c
index 1e1d2c57f20c12affa14da681f69131df772baee..65b8c3202711dbdb099a86ac1487dc4e84f1ba76 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/vselvssf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvssf.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_cpu_cortex_a57_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
-/* { dg-options "-O2 -mcpu=cortex-a57" } */
+/* { dg-options "-O2" } */
+/* { dg-add-options arm_cpu_cortex_a57 } */
 /* { dg-add-options arm_v8_vfp } */
 
 float

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 1c9bbf64817a731a9fe4961897d7e640f78b66cf..d113a08dff7b2a8ab5bdfe24386d271bff255afc 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -5811,6 +5811,7 @@ foreach { armfunc armflag armdefs } {
 # flags).  See above for setting -march=.
 foreach { armfunc armflag armdefs } {
            xscale_arm "-mcpu=xscale -mfloat-abi=soft -marm" "__XSCALE__ && !__thumb__"
+           cortex_a57 "-mcpu=cortex-a57" __ARM_ARCH_8A__
        } {
     eval [string map [list FUNC $armfunc FLAG $armflag DEFS $armdefs ] {
        proc check_effective_target_arm_cpu_FUNC_ok { } {
@@ -13158,7 +13159,7 @@ proc check_effective_target_arm_v8_1_lob_ok { } {
                  asm goto ("le lr, %l0" : : : "lr" : loop);
                  return i != 10;
                }
-       } "-march=armv8.1-m.main -mthumb" ]
+       } "-mcpu=unset -march=armv8.1-m.main -mthumb" ]
     }
 }