From 277c74df4888cad1621ef0636fe03d44671a2569 Mon Sep 17 00:00:00 2001 From: vries Date: Sat, 25 Jul 2015 07:52:59 +0000 Subject: [PATCH] Fixup graphite/uns-*.c testcases 2015-07-25 Tom de Vries * gcc.dg/graphite/graphite.exp: Include uns-*.c files in interchange_files and block_files variables. * gcc.dg/graphite/uns-block-1.c (main): Change signed into unsigned arithmetic. * gcc.dg/graphite/uns-interchange-12.c: Same. * gcc.dg/graphite/uns-interchange-14.c: Same. * gcc.dg/graphite/uns-interchange-15.c: Same. * gcc.dg/graphite/uns-interchange-9.c (foo): Same. * gcc.dg/graphite/uns-interchange-mvt.c: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226209 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 12 ++++++++++++ gcc/testsuite/gcc.dg/graphite/graphite.exp | 6 ++++-- gcc/testsuite/gcc.dg/graphite/uns-block-1.c | 6 +++--- gcc/testsuite/gcc.dg/graphite/uns-interchange-12.c | 7 ++++--- gcc/testsuite/gcc.dg/graphite/uns-interchange-14.c | 5 +++-- gcc/testsuite/gcc.dg/graphite/uns-interchange-15.c | 7 ++++--- gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c | 11 ++++++----- gcc/testsuite/gcc.dg/graphite/uns-interchange-mvt.c | 7 ++++--- 8 files changed, 40 insertions(+), 21 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8cb20118c5b..f832fb14e43 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2015-07-25 Tom de Vries + + * gcc.dg/graphite/graphite.exp: Include uns-*.c files in + interchange_files and block_files variables. + * gcc.dg/graphite/uns-block-1.c (main): Change signed into unsigned + arithmetic. + * gcc.dg/graphite/uns-interchange-12.c: Same. + * gcc.dg/graphite/uns-interchange-14.c: Same. + * gcc.dg/graphite/uns-interchange-15.c: Same. + * gcc.dg/graphite/uns-interchange-9.c (foo): Same. + * gcc.dg/graphite/uns-interchange-mvt.c: Same. + 2015-07-25 Jeff Law Revert: diff --git a/gcc/testsuite/gcc.dg/graphite/graphite.exp b/gcc/testsuite/gcc.dg/graphite/graphite.exp index 9dba5d66223..9e7ede69253 100644 --- a/gcc/testsuite/gcc.dg/graphite/graphite.exp +++ b/gcc/testsuite/gcc.dg/graphite/graphite.exp @@ -41,8 +41,10 @@ set wait_to_run_files [lsort [glob -nocomplain $srcdir/$subdir/*.c ] ] set scop_files [lsort [glob -nocomplain $srcdir/$subdir/scop-*.c ] ] set id_files [lsort [glob -nocomplain $srcdir/$subdir/id-*.c ] ] set run_id_files [lsort [glob -nocomplain $srcdir/$subdir/run-id-*.c ] ] -set interchange_files [lsort [glob -nocomplain $srcdir/$subdir/interchange-*.c ] ] -set block_files [lsort [glob -nocomplain $srcdir/$subdir/block-*.c ] ] +set interchange_files [lsort [glob -nocomplain $srcdir/$subdir/interchange-*.c \ + $srcdir/$subdir/uns-interchange-*.c ] ] +set block_files [lsort [glob -nocomplain $srcdir/$subdir/block-*.c \ + $srcdir/$subdir/uns-block-*.c ] ] set vect_files [lsort [glob -nocomplain $srcdir/$subdir/vect-*.c ] ] # Tests to be compiled. diff --git a/gcc/testsuite/gcc.dg/graphite/uns-block-1.c b/gcc/testsuite/gcc.dg/graphite/uns-block-1.c index 57d522b2842..c50b7708ef7 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-block-1.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-block-1.c @@ -13,9 +13,9 @@ int main (void) { int i, j; - int sum = 0; - int A[MAX * MAX]; - int B[MAX * MAX]; + unsigned int sum = 0; + unsigned int A[MAX * MAX]; + unsigned int B[MAX * MAX]; /* These loops should be loop blocked. */ for (i = 0; i < MAX; i++) diff --git a/gcc/testsuite/gcc.dg/graphite/uns-interchange-12.c b/gcc/testsuite/gcc.dg/graphite/uns-interchange-12.c index dc269266977..bd21ba9bc4b 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-interchange-12.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-interchange-12.c @@ -7,9 +7,9 @@ #define N 200 -int A[N][N], B[N][N], C[N][N]; +unsigned int A[N][N], B[N][N], C[N][N]; -static int __attribute__((noinline)) +static unsigned int __attribute__((noinline)) matmult (void) { int i, j, k; @@ -31,7 +31,8 @@ extern void abort (); int main (void) { - int i, j, res; + int i, j; + unsigned int res; for (i = 0; i < N; i++) for (j = 0; j < N; j++) diff --git a/gcc/testsuite/gcc.dg/graphite/uns-interchange-14.c b/gcc/testsuite/gcc.dg/graphite/uns-interchange-14.c index 36990ab40fd..b1abd13c02e 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-interchange-14.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-interchange-14.c @@ -7,7 +7,7 @@ #define N 200 -int A[N][N], B[N][N], C[N][N]; +unsigned int A[N][N], B[N][N], C[N][N]; static void __attribute__((noinline)) matmult (void) @@ -30,7 +30,8 @@ extern void abort (); int main (void) { - int i, j, res = 0; + int i, j; + unsigned res = 0; for (i = 0; i < N; i++) for (j = 0; j < N; j++) diff --git a/gcc/testsuite/gcc.dg/graphite/uns-interchange-15.c b/gcc/testsuite/gcc.dg/graphite/uns-interchange-15.c index 3ddb74f0407..a5a2e2781b6 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-interchange-15.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-interchange-15.c @@ -7,9 +7,9 @@ #define NMAX 2000 -static int x[NMAX], a[NMAX][NMAX]; +static unsigned int x[NMAX], a[NMAX][NMAX]; -static int __attribute__((noinline)) +static unsigned int __attribute__((noinline)) mvt (long N) { int i,j; @@ -27,7 +27,8 @@ extern void abort (); int main (void) { - int i, j, res; + int i, j; + unsigned int res; for (i = 0; i < NMAX; i++) for (j = 0; j < NMAX; j++) diff --git a/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c b/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c index cfec1100eee..6bfd3d61f23 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c @@ -8,11 +8,11 @@ #define N 111 #define M 111 -static int __attribute__((noinline)) -foo (int *x) +static unsigned int __attribute__((noinline)) +foo (unsigned int *x) { int i, j; - int sum = 0; + unsigned int sum = 0; for (j = 0; j < M; ++j) for (i = 0; i < N; ++i) @@ -26,8 +26,9 @@ extern void abort (); int main (void) { - int A[N*M]; - int i, res; + unsigned int A[N*M]; + int i; + unsigned int res; for (i = 0; i < N*M; i++) A[i] = 2; diff --git a/gcc/testsuite/gcc.dg/graphite/uns-interchange-mvt.c b/gcc/testsuite/gcc.dg/graphite/uns-interchange-mvt.c index 4b8f2646bef..80f67897f92 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-interchange-mvt.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-interchange-mvt.c @@ -7,9 +7,9 @@ #define NMAX 2000 -static int x1[NMAX], x2[NMAX], a[NMAX][NMAX], y1[NMAX], y2[NMAX]; +static unsigned int x1[NMAX], x2[NMAX], a[NMAX][NMAX], y1[NMAX], y2[NMAX]; -static int __attribute__((noinline)) +static unsigned int __attribute__((noinline)) mvt (long N) { @@ -32,7 +32,8 @@ extern void abort (); int main (void) { - int i, j, res; + int i, j; + unsigned int res; for (i = 0; i < NMAX; i++) for (j = 0; j < NMAX; j++) -- 2.11.4.GIT