Hi! On Wed, 15 Feb 2017 13:44:13 +0100, I wrote: > On Fri, 10 Feb 2017 15:13:57 +0100 (CET), Richard Biener <rguent...@suse.de> > wrote: > > As a cleanup (and to be able to close bugs only reproducing with ISL 0.14) > > the following removes support for ISL 0.14 for GCC 7.
> OK to commit the following to restore graphite fuse-*.c testing? That > is, revert most of (the remaining pieces of) r232811. ;-) Heh, I forgot to include the obvious gcc/Makefile.in change. With that added, committed to trunk in r245483: commit a7355f503d3d6f0a8e98b48440fcfc72cc7a8963 Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Wed Feb 15 14:43:42 2017 +0000 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". git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@245483 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 6 ++++++ Makefile.in | 2 -- Makefile.tpl | 2 -- gcc/ChangeLog | 4 ++++ gcc/Makefile.in | 1 - gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/graphite/graphite.exp | 8 +------- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git ChangeLog ChangeLog index 071a281..f4e6dc3 100644 --- ChangeLog +++ ChangeLog @@ -1,3 +1,9 @@ +2017-02-15 Thomas Schwinge <tho...@codesourcery.com> + + * Makefile.tpl: Remove HOST_ISLVER. + (HOST_EXPORTS): Remove ISLVER. + * Makefile.in: Regenerate. + 2017-02-13 Richard Biener <rguent...@suse.de> * configure: Re-generate. diff --git Makefile.in Makefile.in index 1c0b9e7..da2600b 100644 --- Makefile.in +++ 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 Makefile.tpl Makefile.tpl index a6a3166..d0fa070 100644 --- Makefile.tpl +++ 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 gcc/ChangeLog gcc/ChangeLog index 7466dab..fa0b01c 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,7 @@ +2017-02-15 Thomas Schwinge <tho...@codesourcery.com> + + * Makefile.in (site.exp): Remove "set ISLVER". + 2017-02-15 Jakub Jelinek <ja...@redhat.com> PR target/79487 diff --git gcc/Makefile.in gcc/Makefile.in index 821584a..0cde1ae 100644 --- gcc/Makefile.in +++ 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 gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog index a379d2a..2097fc9 100644 --- gcc/testsuite/ChangeLog +++ gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-15 Thomas Schwinge <tho...@codesourcery.com> + + * gcc.dg/graphite/graphite.exp: Merge "fuse_files" into + "opt_files". + 2017-02-15 Jakub Jelinek <ja...@redhat.com> PR target/79487 diff --git gcc/testsuite/gcc.dg/graphite/graphite.exp gcc/testsuite/gcc.dg/graphite/graphite.exp index 2499431..50aae30 100644 --- gcc/testsuite/gcc.dg/graphite/graphite.exp +++ 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. Grüße Thomas