From 556d3a2433a6e2207c6f36fe292d89d81f46f924 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 24 Jan 2018 16:22:40 +0000 Subject: [PATCH] Remove explicit dg-do runs from gcc.dg/vect (PR 83889) The failures in this PR were from forcing { dg-do run } even when vect.exp chooses options that are incompatible with the runtime. The default vect.exp behaviour is to execute when possible, so there's no need for a dg-do at all. The patch removes other unconditional { dg-do run }s too. Many of them were already failing in the same way. Also, the dg-do run condition in vect-reduc-or* seems unnecessary: the test should run correctly whatever happens, and the scan tests are already guarded properly. 2018-01-24 Richard Sandiford gcc/testsuite/ PR testsuite/83889 * gcc.dg/vect/pr79920.c: Remove explicit dg-do run. * gcc.dg/vect/pr80631-1.c: Likewise. * gcc.dg/vect/pr80631-2.c: Likewise. * gcc.dg/vect/pr81410.c: Likewise. * gcc.dg/vect/pr81633.c: Likewise. * gcc.dg/vect/pr81815.c: Likewise. * gcc.dg/vect/pr82108.c: Likewise. * gcc.dg/vect/pr83857.c: Likewise. * gcc.dg/vect/vect-alias-check-8.c: Likewise. * gcc.dg/vect/vect-alias-check-9.c: Likewise. * gcc.dg/vect/vect-alias-check-10.c: Likewise. * gcc.dg/vect/vect-alias-check-11.c: Likewise. * gcc.dg/vect/vect-alias-check-12.c: Likewise. * gcc.dg/vect/vect-reduc-11.c: Likewise. * gcc.dg/vect/vect-tail-nomask-1.c: Likewise. * gcc.dg/vect/vect-reduc-in-order-1.c: Remove dg-do run and use dg-xfail-run-if instead. * gcc.dg/vect/vect-reduc-in-order-2.c: Likewise. * gcc.dg/vect/vect-reduc-in-order-3.c: Likewise. * gcc.dg/vect/vect-reduc-in-order-4.c: Likewise. * gcc.dg/vect/vect-reduc-or_1.c: Remove conditional dg-do run. * gcc.dg/vect/vect-reduc-or_2.c: Likewise. From-SVN: r257022 --- gcc/testsuite/ChangeLog | 26 +++++++++++++++++++ gcc/testsuite/gcc.dg/vect/pr79920.c | 1 - gcc/testsuite/gcc.dg/vect/pr80631-1.c | 1 - gcc/testsuite/gcc.dg/vect/pr80631-2.c | 1 - gcc/testsuite/gcc.dg/vect/pr81410.c | 1 - gcc/testsuite/gcc.dg/vect/pr81633.c | 2 -- gcc/testsuite/gcc.dg/vect/pr81815.c | 2 -- gcc/testsuite/gcc.dg/vect/pr82108.c | 1 - gcc/testsuite/gcc.dg/vect/pr83857.c | 1 - .../gcc.dg/vect/vect-alias-check-10.c | 2 -- .../gcc.dg/vect/vect-alias-check-11.c | 2 -- .../gcc.dg/vect/vect-alias-check-12.c | 2 -- .../gcc.dg/vect/vect-alias-check-8.c | 2 -- .../gcc.dg/vect/vect-alias-check-9.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-reduc-11.c | 1 - .../gcc.dg/vect/vect-reduc-in-order-1.c | 2 +- .../gcc.dg/vect/vect-reduc-in-order-2.c | 2 +- .../gcc.dg/vect/vect-reduc-in-order-3.c | 2 +- .../gcc.dg/vect/vect-reduc-in-order-4.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c | 2 -- .../gcc.dg/vect/vect-tail-nomask-1.c | 1 - 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b5ecce01358..00592b7b3f3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,29 @@ +2018-01-24 Richard Sandiford + + PR testsuite/83889 + * gcc.dg/vect/pr79920.c: Remove explicit dg-do run. + * gcc.dg/vect/pr80631-1.c: Likewise. + * gcc.dg/vect/pr80631-2.c: Likewise. + * gcc.dg/vect/pr81410.c: Likewise. + * gcc.dg/vect/pr81633.c: Likewise. + * gcc.dg/vect/pr81815.c: Likewise. + * gcc.dg/vect/pr82108.c: Likewise. + * gcc.dg/vect/pr83857.c: Likewise. + * gcc.dg/vect/vect-alias-check-8.c: Likewise. + * gcc.dg/vect/vect-alias-check-9.c: Likewise. + * gcc.dg/vect/vect-alias-check-10.c: Likewise. + * gcc.dg/vect/vect-alias-check-11.c: Likewise. + * gcc.dg/vect/vect-alias-check-12.c: Likewise. + * gcc.dg/vect/vect-reduc-11.c: Likewise. + * gcc.dg/vect/vect-tail-nomask-1.c: Likewise. + * gcc.dg/vect/vect-reduc-in-order-1.c: Remove dg-do run and use + dg-xfail-run-if instead. + * gcc.dg/vect/vect-reduc-in-order-2.c: Likewise. + * gcc.dg/vect/vect-reduc-in-order-3.c: Likewise. + * gcc.dg/vect/vect-reduc-in-order-4.c: Likewise. + * gcc.dg/vect/vect-reduc-or_1.c: Remove conditional dg-do run. + * gcc.dg/vect/vect-reduc-or_2.c: Likewise. + 2018-01-24 Richard Sandiford PR tree-optimization/83979 diff --git a/gcc/testsuite/gcc.dg/vect/pr79920.c b/gcc/testsuite/gcc.dg/vect/pr79920.c index 51992c42082..276a2806f0c 100644 --- a/gcc/testsuite/gcc.dg/vect/pr79920.c +++ b/gcc/testsuite/gcc.dg/vect/pr79920.c @@ -1,4 +1,3 @@ -/* { dg-do run } */ /* { dg-additional-options "-O3 -fno-fast-math" } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/pr80631-1.c b/gcc/testsuite/gcc.dg/vect/pr80631-1.c index 92bf35a0a3e..f2405198a10 100644 --- a/gcc/testsuite/gcc.dg/vect/pr80631-1.c +++ b/gcc/testsuite/gcc.dg/vect/pr80631-1.c @@ -1,5 +1,4 @@ /* PR tree-optimization/80631 */ -/* { dg-do run } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/pr80631-2.c b/gcc/testsuite/gcc.dg/vect/pr80631-2.c index 777738ad763..6bf239adac5 100644 --- a/gcc/testsuite/gcc.dg/vect/pr80631-2.c +++ b/gcc/testsuite/gcc.dg/vect/pr80631-2.c @@ -1,5 +1,4 @@ /* PR tree-optimization/80631 */ -/* { dg-do run } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/pr81410.c b/gcc/testsuite/gcc.dg/vect/pr81410.c index 8d1bd6c8efd..9c91c08d33c 100644 --- a/gcc/testsuite/gcc.dg/vect/pr81410.c +++ b/gcc/testsuite/gcc.dg/vect/pr81410.c @@ -1,4 +1,3 @@ -/* { dg-do run } */ /* { dg-require-effective-target vect_long_long } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/pr81633.c b/gcc/testsuite/gcc.dg/vect/pr81633.c index 1ae15504e81..9689ab3959c 100644 --- a/gcc/testsuite/gcc.dg/vect/pr81633.c +++ b/gcc/testsuite/gcc.dg/vect/pr81633.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - static double identity[4][4] = {{1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, diff --git a/gcc/testsuite/gcc.dg/vect/pr81815.c b/gcc/testsuite/gcc.dg/vect/pr81815.c index 1eb7c59b70e..79f345a641a 100644 --- a/gcc/testsuite/gcc.dg/vect/pr81815.c +++ b/gcc/testsuite/gcc.dg/vect/pr81815.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - int __attribute__ ((noinline, noclone)) f (int *x, int n) { diff --git a/gcc/testsuite/gcc.dg/vect/pr82108.c b/gcc/testsuite/gcc.dg/vect/pr82108.c index 5b8faf1aefb..074c416b7d9 100644 --- a/gcc/testsuite/gcc.dg/vect/pr82108.c +++ b/gcc/testsuite/gcc.dg/vect/pr82108.c @@ -1,4 +1,3 @@ -/* { dg-do run } */ /* { dg-require-effective-target vect_float } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/pr83857.c b/gcc/testsuite/gcc.dg/vect/pr83857.c index 92e648b857b..f90f5d43a8d 100644 --- a/gcc/testsuite/gcc.dg/vect/pr83857.c +++ b/gcc/testsuite/gcc.dg/vect/pr83857.c @@ -1,4 +1,3 @@ -/* { dg-do run } */ /* { dg-additional-options "-ffast-math" } */ #define N 100 diff --git a/gcc/testsuite/gcc.dg/vect/vect-alias-check-10.c b/gcc/testsuite/gcc.dg/vect/vect-alias-check-10.c index d4eea873ccb..0e6285e4a23 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-alias-check-10.c +++ b/gcc/testsuite/gcc.dg/vect/vect-alias-check-10.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - #define N 87 #define M 6 diff --git a/gcc/testsuite/gcc.dg/vect/vect-alias-check-11.c b/gcc/testsuite/gcc.dg/vect/vect-alias-check-11.c index 601e17fd1dc..a0d5abc3aa4 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-alias-check-11.c +++ b/gcc/testsuite/gcc.dg/vect/vect-alias-check-11.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - #define N 87 #define M 6 diff --git a/gcc/testsuite/gcc.dg/vect/vect-alias-check-12.c b/gcc/testsuite/gcc.dg/vect/vect-alias-check-12.c index a44c9bb5258..788cdfc3cdc 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-alias-check-12.c +++ b/gcc/testsuite/gcc.dg/vect/vect-alias-check-12.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - #define N 87 #define M 7 diff --git a/gcc/testsuite/gcc.dg/vect/vect-alias-check-8.c b/gcc/testsuite/gcc.dg/vect/vect-alias-check-8.c index 5aeaf2173dc..0569ca487b5 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-alias-check-8.c +++ b/gcc/testsuite/gcc.dg/vect/vect-alias-check-8.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - #define N 200 #define DIST 32 diff --git a/gcc/testsuite/gcc.dg/vect/vect-alias-check-9.c b/gcc/testsuite/gcc.dg/vect/vect-alias-check-9.c index 9bc38af3692..5685bfee576 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-alias-check-9.c +++ b/gcc/testsuite/gcc.dg/vect/vect-alias-check-9.c @@ -1,5 +1,3 @@ -/* { dg-do run } */ - #define N 200 #define M 4 diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-11.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-11.c index 29408edcfce..5906f23690d 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-11.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-11.c @@ -1,4 +1,3 @@ -/* { dg-do run } */ /* { dg-require-effective-target vect_int } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c index cc73d524d54..4c17f2c1978 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c @@ -1,4 +1,4 @@ -/* { dg-do run { xfail { { i?86-*-* x86_64-*-* } && ia32 } } } */ +/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */ /* { dg-require-effective-target vect_double } */ /* { dg-add-options ieee } */ /* { dg-additional-options "-fno-fast-math" } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c index dea6cdd0048..3b4c68aa8d1 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c @@ -1,4 +1,4 @@ -/* { dg-do run { xfail { { i?86-*-* x86_64-*-* } && ia32 } } } */ +/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */ /* { dg-require-effective-target vect_double } */ /* { dg-add-options ieee } */ /* { dg-additional-options "-fno-fast-math" } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c index 037213ee31c..3fd19f90d74 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c @@ -1,4 +1,4 @@ -/* { dg-do run { xfail { { i?86-*-* x86_64-*-* } && ia32 } } } */ +/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */ /* { dg-require-effective-target vect_double } */ /* { dg-add-options ieee } */ /* { dg-additional-options "-fno-fast-math" } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c index 46d0f3a0464..1cc046e4af4 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c @@ -1,4 +1,4 @@ -/* { dg-do run { xfail { { i?86-*-* x86_64-*-* } && ia32 } } } */ +/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */ /* { dg-require-effective-target vect_double } */ /* { dg-add-options ieee } */ /* { dg-additional-options "-fno-fast-math" } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c index cff3f16107f..acb0e30383d 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c @@ -1,5 +1,3 @@ -/* { dg-do run { target { whole_vector_shift || vect_logical_reduc } } } */ - /* Write a reduction loop to be reduced using vector shifts. */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c index cd1af6dc9ae..d8751185155 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c @@ -1,5 +1,3 @@ -/* { dg-do run { target { whole_vector_shift || vect_logical_reduc } } } */ - /* Write a reduction loop to be reduced using vector shifts and folded. */ #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/vect-tail-nomask-1.c b/gcc/testsuite/gcc.dg/vect/vect-tail-nomask-1.c index 2c3a3c95eb0..b912a3431f7 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-tail-nomask-1.c +++ b/gcc/testsuite/gcc.dg/vect/vect-tail-nomask-1.c @@ -1,4 +1,3 @@ -/* { dg-do run } */ /* { dg-require-weak "" } */ /* { dg-skip-if "No undefined weak" { hppa*-*-hpux* && { ! lp64 } } } */ /* { dg-skip-if "No undefined weak" { nvptx-*-* } } */ -- 2.30.2