Restore Graphite fuse-*.c testing

	* Makefile.tpl: Remove HOST_ISLVER.
	(HOST_EXPORTS): Remove ISLVER.
	* Makefile.in: Regenerate.
	gcc/
	* Makefile.in (site.exp): Remove "set ISLVER".
	gcc/testsuite/
	* gcc.dg/graphite/graphite.exp: Merge "fuse_files" into
	"opt_files".

From-SVN: r245483

diff --git a/ChangeLog b/ChangeLog
index 071a281b142ce2729d7c0c92d8fe9a867d3a28a8..f4e6dc32ab75a17a23acb60fe7367c7a9d36b565 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-15  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * Makefile.tpl: Remove HOST_ISLVER.
+       (HOST_EXPORTS): Remove ISLVER.
+       * Makefile.in: Regenerate.
+
 2017-02-13  Richard Biener  <rguenther@suse.de>
 
        * configure: Re-generate.

diff --git a/Makefile.in b/Makefile.in
index 1c0b9e7cdda9d72087d7d4b7ecc97261b83b2a80..da2600b321d08ac57744ddf8d8391d024628136d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -220,7 +220,6 @@ HOST_EXPORTS = \
        GMPINC="$(HOST_GMPINC)"; export GMPINC; \
        ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
        ISLINC="$(HOST_ISLINC)"; export ISLINC; \
-       ISLVER="$(HOST_ISLVER)"; export ISLVER; \
        LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
        LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
        XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@@ -313,7 +312,6 @@ HOST_GMPINC = @gmpinc@
 # Where to find isl
 HOST_ISLLIBS = @isllibs@
 HOST_ISLINC = @islinc@
-HOST_ISLVER = @islver@
 
 # Where to find libelf
 HOST_LIBELFLIBS = @libelflibs@

diff --git a/Makefile.tpl b/Makefile.tpl
index a6a31660a0fd449f1f5eae8651c6e5f23bff4ecc..d0fa07005be25969d0e2bba6f07397744f73499d 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -223,7 +223,6 @@ HOST_EXPORTS = \
        GMPINC="$(HOST_GMPINC)"; export GMPINC; \
        ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
        ISLINC="$(HOST_ISLINC)"; export ISLINC; \
-       ISLVER="$(HOST_ISLVER)"; export ISLVER; \
        LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
        LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
        XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@@ -316,7 +315,6 @@ HOST_GMPINC = @gmpinc@
 # Where to find isl
 HOST_ISLLIBS = @isllibs@
 HOST_ISLINC = @islinc@
-HOST_ISLVER = @islver@
 
 # Where to find libelf
 HOST_LIBELFLIBS = @libelflibs@

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7466dab12747ffc33ac129c9913ac66443508782..fa0b01ce1849cb35ea247d1c3dbf025840245567 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-15  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * Makefile.in (site.exp): Remove "set ISLVER".
+
 2017-02-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/79487

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 821584a170312f358663cd2cd817bdecf50f5318..0cde1aeb1a3217f74938bf752c295e77d89e86ae 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3805,7 +3805,6 @@ 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 a379d2ab6b8b5b9aef814f695a87eff0b98937aa..2097fc99d5a5788c213aedf1cb69565e48a3c0e3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-15  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * gcc.dg/graphite/graphite.exp: Merge "fuse_files" into
+       "opt_files".
+
 2017-02-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/79487

diff --git a/gcc/testsuite/gcc.dg/graphite/graphite.exp b/gcc/testsuite/gcc.dg/graphite/graphite.exp
index 2499431503c2acfcee41d5c21fcdfae0487070ef..50aae309ffdc1573da2dabdc5a4bbf57d755a870 100644 (file)
--- a/gcc/testsuite/gcc.dg/graphite/graphite.exp
+++ b/gcc/testsuite/gcc.dg/graphite/graphite.exp
@@ -49,10 +49,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
@@ -64,11 +64,6 @@ 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"
@@ -84,7 +79,6 @@ 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.