fix PR68343: disable fuse-*.c tests for isl 0.14 or earlier

The patch disables all fuse-*.c tests when configuring gcc with isl 0.14 or earlier.

ChangeLog:

	* Makefile.in: Regenerate.
	* Makefile.tpl: Export ISLVER.
	* configure: Regenerate.
	* config/isl.m4: Detect isl-0.15.

gcc/

	* Makefile.in: Set ISLVER in site.exp.

gcc/testsuite/

	* gcc.dg/graphite/graphite.exp: Only run the fuse-*.c tests with isl-0.15.

Co-Authored-By: Sebastian Pop <s.pop@samsung.com>

From-SVN: r232811

5 files changed, 21 insertions, 3 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00652e8..f161d27 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-25  Aditya Kumar  <aditya.k7@samsung.com>
+	    Sebastian Pop  <s.pop@samsung.com>
+
+	* Makefile.in: Set ISLVER in site.exp.
+
 2016-01-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* omp-low.c (lower_omp_target) <case USE_DEVICE_PTR>: Set
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index ab9cbbf..aa3c018 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3698,6 +3698,7 @@ site.exp: ./config.status Makefile
 	  echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./site.tmp; \
 	  echo "set GMPINC \"$(GMPINC)\"" >> ./site.tmp; \
 	fi
+	@echo "set ISLVER \"$(ISLVER)\"" >> ./site.tmp
 # If newlib has been configured, we need to pass -B to gcc so it can find
 # newlib's crt0.o if it exists.  This will cause a "path prefix not used"
 # message if it doesn't, but the testsuite is supposed to ignore the message -
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9f17192..b06599e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 2016-01-25  Aditya Kumar  <aditya.k7@samsung.com>
 	    Sebastian Pop  <s.pop@samsung.com>
 
+	* gcc.dg/graphite/graphite.exp: Only run the fuse-*.c tests with
+	isl-0.15.
+
+2016-01-25  Aditya Kumar  <aditya.k7@samsung.com>
+	    Sebastian Pop  <s.pop@samsung.com>
+
 	* gcc.dg/graphite/pr69292.c: New.
 
 2016-01-25  Jakub Jelinek  <jakub@redhat.com>
diff --git a/gcc/testsuite/gcc.dg/graphite/fuse-2.c b/gcc/testsuite/gcc.dg/graphite/fuse-2.c
index a76f3a6..f4cea43 100644
--- a/gcc/testsuite/gcc.dg/graphite/fuse-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/fuse-2.c
@@ -28,9 +28,9 @@ main (void)
       B[i] = i + 2;
       C[i] = i + 1;
     }
-  for(int i=0; i<MAX; i++)
+  for(i=0; i<MAX; i++)
     A[i] += B[i];
-  for(int i=0; i<MAX; i++)
+  for(i=0; i<MAX; i++)
     A[i] += C[i];
 
   for (i = 0; i < MAX; i++)
diff --git a/gcc/testsuite/gcc.dg/graphite/graphite.exp b/gcc/testsuite/gcc.dg/graphite/graphite.exp
index bcf342c..f24d10e 100644
--- a/gcc/testsuite/gcc.dg/graphite/graphite.exp
+++ b/gcc/testsuite/gcc.dg/graphite/graphite.exp
@@ -44,10 +44,10 @@ set run_id_files      [lsort [glob -nocomplain $srcdir/$subdir/run-id-*.c ] ]
 set opt_files         [lsort [glob -nocomplain $srcdir/$subdir/interchange-*.c \
 					       $srcdir/$subdir/uns-interchange-*.c \
 					       $srcdir/$subdir/isl-ast-gen-*.c \
-					       $srcdir/$subdir/fuse-*.c \
 					       $srcdir/$subdir/block-*.c \
 					       $srcdir/$subdir/uns-block-*.c ] ]
 set vect_files        [lsort [glob -nocomplain $srcdir/$subdir/vect-*.c ] ]
+set fuse_files        [lsort [glob -nocomplain $srcdir/$subdir/fuse-*.c ] ]
 
 # Tests to be compiled.
 set dg-do-what-default compile
@@ -59,6 +59,11 @@ set dg-do-what-default run
 dg-runtest $run_id_files      "" "-O2 -fgraphite-identity"
 dg-runtest $opt_files         "" "-O2 -ffast-math -floop-nest-optimize -fdump-tree-graphite-all"
 
+global ISLVER
+if { $ISLVER == "0.15" } {
+    dg-runtest $fuse_files         "" "-O2 -ffast-math -floop-nest-optimize -fdump-tree-graphite-all"
+}
+
 # Vectorizer tests, to be run or compiled, depending on target capabilities.
 global DEFAULT_VECTCFLAGS
 set DEFAULT_VECTCFLAGS "-O2 -fgraphite-identity -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details -ffast-math"
@@ -74,6 +79,7 @@ foreach f $id_files          {lremove wait_to_run_files $f}
 foreach f $run_id_files      {lremove wait_to_run_files $f}
 foreach f $opt_files         {lremove wait_to_run_files $f}
 foreach f $vect_files        {lremove wait_to_run_files $f}
+foreach f $fuse_files        {lremove wait_to_run_files $f}
 dg-runtest $wait_to_run_files "" "-ansi -pedantic-errors"
 
 # Clean up.