[patch][graphite]Add run time check and cleanup autopar test cases.

[Richard Guenther]

On Fri, Dec 4, 2009 at 2:27 PM, Li Feng <nemokingdom@gmail.com> wrote:
> Hi,
>
> This patch add run time check for the testcases in autopar.
> Add move all the checking options into *.exp file instead of
> in each file.
>
> OK for trunk? Tested without bootstrapped.

You should at least cleanup the dump files from the dg machinery
as well.  Note that setting DEFAULT_CFLAGS might have spurious
effects elsewhere IIRC.

And you need approval from a testsuite maintainer, CCing Janis.

Richard.

> diff --git a/gcc/testsuite/gcc.dg/autopar/autopar.exp
> b/gcc/testsuite/gcc.dg/autopar/autopar.exp
> index d19e51f..9583f0d 100644
> --- a/gcc/testsuite/gcc.dg/autopar/autopar.exp
> +++ b/gcc/testsuite/gcc.dg/autopar/autopar.exp
> @@ -23,10 +23,15 @@ if ![check_effective_target_pthread] {
>   return
>  }
>
> +# The default action for the tests is 'run'.  Save current default.
> +global dg-do-what-default
> +set save-dg-do-what-default ${dg-do-what-default}
> +set dg-do-what-default run
> +
>  # If a testcase doesn't have special options, use these.
>  global DEFAULT_CFLAGS
>  if ![info exists DEFAULT_CFLAGS] then {
> -    set DEFAULT_CFLAGS " -ansi -pedantic-errors"
> +    set DEFAULT_CFLAGS "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized"
>  }
>
>  # Initialize `dg'.
> @@ -36,5 +41,8 @@ dg-init
>  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
>        "" $DEFAULT_CFLAGS
>
> +# Clean up.
> +set dg-do-what-default ${save-dg-do-what-default}
> +
>  # All done.
>  dg-finish
> diff --git a/gcc/testsuite/gcc.dg/autopar/outer-1.c
> b/gcc/testsuite/gcc.dg/autopar/outer-1.c
> index 913d390..04d42bb 100644
> --- a/gcc/testsuite/gcc.dg/autopar/outer-1.c
> +++ b/gcc/testsuite/gcc.dg/autopar/outer-1.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
>  void parloop (int N)
> diff --git a/gcc/testsuite/gcc.dg/autopar/outer-2.c
> b/gcc/testsuite/gcc.dg/autopar/outer-2.c
> index 351b349..74f0499 100644
> --- a/gcc/testsuite/gcc.dg/autopar/outer-2.c
> +++ b/gcc/testsuite/gcc.dg/autopar/outer-2.c
> @@ -1,28 +1,25 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
> -void parloop (int N)
> +void parloop (int N, int M, int K)
>  {
>   int i, j,ii;
>   int x[400][10][400];
>
> -for (ii = 0; ii < N; ii++)
> +for (ii = 0; ii < K; ii++)
>   for (i = 0; i < N; i++)
> -    for (j = 0; j < N; j++)
> +    for (j = 0; j < M; j++)
>       x[i][j][ii] = ii+i + j + 3;
>
> -for (ii = 0; ii < N; ii++)
> +for (ii = 0; ii < K; ii++)
>   for (i = 0; i < N;i++)
> -    for (j = 0; j < N; j++)
> +    for (j = 0; j < M; j++)
>       if (x[i][j][ii] != ii+i + j + 3)
>        abort ();
>  }
>
>  int main(void)
>  {
> -  parloop(400);
> +  parloop(400, 10, 400);
>
>   return 0;
>  }
> diff --git a/gcc/testsuite/gcc.dg/autopar/outer-3.c
> b/gcc/testsuite/gcc.dg/autopar/outer-3.c
> index 2f1033f..872a2c8 100644
> --- a/gcc/testsuite/gcc.dg/autopar/outer-3.c
> +++ b/gcc/testsuite/gcc.dg/autopar/outer-3.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
>  void parloop (int N)
> diff --git a/gcc/testsuite/gcc.dg/autopar/outer-4.c
> b/gcc/testsuite/gcc.dg/autopar/outer-4.c
> index 56f6123..cdd5cf3 100644
> --- a/gcc/testsuite/gcc.dg/autopar/outer-4.c
> +++ b/gcc/testsuite/gcc.dg/autopar/outer-4.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
>  int g_sum=0;
> diff --git a/gcc/testsuite/gcc.dg/autopar/outer-5.c
> b/gcc/testsuite/gcc.dg/autopar/outer-5.c
> index 3a54298..662fa3b 100644
> --- a/gcc/testsuite/gcc.dg/autopar/outer-5.c
> +++ b/gcc/testsuite/gcc.dg/autopar/outer-5.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
>  int x[500][500];
> diff --git a/gcc/testsuite/gcc.dg/autopar/outer-6.c
> b/gcc/testsuite/gcc.dg/autopar/outer-6.c
> index 6e027d2..1cd8427 100644
> --- a/gcc/testsuite/gcc.dg/autopar/outer-6.c
> +++ b/gcc/testsuite/gcc.dg/autopar/outer-6.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
>  int x[500][500];
> diff --git a/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
> b/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
> index f53be85..845dcb7 100644
> --- a/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
> +++ b/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  void abort (void);
>
>  void parloop (int N)
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-1.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-1.c
> index 8018a55..7d82963 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-1.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-1.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
> index 76645c8..dca20f6 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
> index 526f170..f176e7d 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-2.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-2.c
> index e0abb26..dde3b6d 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-2.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-2.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
> index ada1275..58eeacc 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
> index 3363c68..6070ce5 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-3.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-3.c
> index 6bc2047..91c3508 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-3.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-3.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-6.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-6.c
> index fface8f..75faf5a 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-6.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-6.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdarg.h>
>  #include <stdlib.h>
>
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-7.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-7.c
> index f66069e..9b96e2e 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-7.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-7.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdlib.h>
>
>  #define N 3200
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-8.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-8.c
> index 4a416df..73d2a28 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-8.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-8.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdlib.h>
>
>  #define N 3200
> diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-9.c
> b/gcc/testsuite/gcc.dg/autopar/reduc-9.c
> index 2c1677c..02a59af 100644
> --- a/gcc/testsuite/gcc.dg/autopar/reduc-9.c
> +++ b/gcc/testsuite/gcc.dg/autopar/reduc-9.c
> @@ -1,6 +1,3 @@
> -/* { dg-do compile } */
> -/* { dg-options "-O2 -ftree-parallelize-loops=4
> -fdump-tree-parloops-details -fdump-tree-optimized" } */
> -
>  #include <stdlib.h>
>
>  #define N 3200
>
> Li
>