On Wed, Feb 15, 2017 at 6:44 AM, Thomas Schwinge
<tho...@codesourcery.com> wrote:
> Hi!
>
> 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.
>
> (This got committed in r245382.)
>
>> --- config/isl.m4 (revision 245328)
>> +++ config/isl.m4 (working copy)
>> @@ -106,27 +106,15 @@ AC_DEFUN([ISL_CHECK_VERSION],
>
>> - if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes";
>> then
>> - islver="0.15"
>> - AC_SUBST([islver])
>> + AC_MSG_RESULT([required isl version is 0.15 or later])
>> fi
>
> This removed "islver", which is still used:
>
> Makefile.tpl: ISLVER="$(HOST_ISLVER)"; export ISLVER; \
> Makefile.tpl:HOST_ISLVER = @islver@
> gcc/Makefile.in: @echo "set ISLVER \"$(ISLVER)\"" >> ./site.tmp
> gcc/testsuite/gcc.dg/graphite/graphite.exp:global ISLVER
> gcc/testsuite/gcc.dg/graphite/graphite.exp:if { $ISLVER == "0.15" } {
> gcc/testsuite/gcc.dg/graphite/graphite.exp- dg-runtest $fuse_files
> "" "-O2 -ffast-math -floop-nest-optimize -fdump-tree-graphite-all"
> gcc/testsuite/gcc.dg/graphite/graphite.exp-}
>
> OK to commit the following to restore graphite fuse-*.c testing? That
> is, revert most of (the remaining pieces of) r232811.
>
Looks good. Thanks!
Sebastian
> Makefile.in | 2 --
> Makefile.tpl | 2 --
> gcc/testsuite/gcc.dg/graphite/graphite.exp | 8 +-------
> 3 files changed, 1 insertion(+), 11 deletions(-)
>
> diff --git Makefile.in Makefile.in
> [snipped]
> 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/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
