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/testsuite/gcc.dg/vect/vect-alias-check-10.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-alias-check-11.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-alias-check-12.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-alias-check-8.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-alias-check-9.c | 2 -- gcc/testsuite/gcc.dg/vect/vect-reduc-11.c | 1 - gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c | 2 +- gcc/testsuite/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/testsuite/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 b5ecce0..00592b7b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,31 @@ 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 * g++.dg/pr83979.c: New test. diff --git a/gcc/testsuite/gcc.dg/vect/pr79920.c b/gcc/testsuite/gcc.dg/vect/pr79920.c index 51992c4..276a280 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 92bf35a..f240519 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 777738a..6bf239a 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 8d1bd6c..9c91c08 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 1ae1550..9689ab3 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 1eb7c59..79f345a 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 5b8faf1..074c416 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 92e648b..f90f5d4 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 d4eea87..0e6285e 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 601e17f..a0d5abc 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 a44c9bb..788cdfc 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 5aeaf21..0569ca4 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 9bc38af..5685bfe 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 29408ed..5906f23 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 cc73d52..4c17f2c 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 dea6cdd..3b4c68a 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 037213e..3fd19f9 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 46d0f3a..1cc046e 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 cff3f16..acb0e30 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 cd1af6d..d875118 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 2c3a3c9..b912a34 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.7.4