Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-15 Thread Thomas Schwinge
Hi!

On Wed, 15 Feb 2017 13:44:13 +0100, I wrote:
> On Fri, 10 Feb 2017 15:13:57 +0100 (CET), Richard Biener  
> 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 
Date:   Wed Feb 15 14:43:42 2017 +

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  
+
+   * Makefile.tpl: Remove HOST_ISLVER.
+   (HOST_EXPORTS): Remove ISLVER.
+   * Makefile.in: Regenerate.
+
 2017-02-13  Richard Biener  
 
* 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  
+
+   * Makefile.in (site.exp): Remove "set ISLVER".
+
 2017-02-15  Jakub Jelinek  
 
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  
+
+   * gcc.dg/graphite/graphite.exp: Merge "fuse_files" into
+   "opt_files".
+
 2017-02-15  Jakub Jelinek  
 
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 

Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-15 Thread Sebastian Pop
On Wed, Feb 15, 2017 at 6:44 AM, Thomas Schwinge
 wrote:
> Hi!
>
> On Fri, 10 Feb 2017 15:13:57 +0100 (CET), Richard Biener  
> 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


Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-15 Thread Richard Biener
On February 15, 2017 1:44:13 PM GMT+01:00, Thomas Schwinge 
 wrote:
>Hi!
>
>On Fri, 10 Feb 2017 15:13:57 +0100 (CET), Richard Biener
> 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.

OK.

Richard.

> 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



Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-15 Thread Thomas Schwinge
Hi!

On Fri, 10 Feb 2017 15:13:57 +0100 (CET), Richard Biener  
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.

 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


Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-13 Thread Martin Liška
On 02/11/2017 08:24 AM, Richard Biener wrote:
> On February 11, 2017 12:38:32 AM GMT+01:00, Jakub Jelinek  
> wrote:
>> On Fri, Feb 10, 2017 at 04:34:30PM -0700, Jeff Law wrote:
 2017-02-10  Richard Biener  

config/
* isl.m4: Remove support for ISL 0.14.

* configure: Re-generate.

gcc/
* configure.ac (HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS):
Remove.
* configure: Re-generate.
* config.in: Likewise.
* graphite-dependences.c: Simplify as if
HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS was defined.
* graphite-isl-ast-to-gimple.c: Likewise.
* graphite-optimize-isl.c: Likewise.
* graphite-poly.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* graphite.h: Likewise.
* toplev.c: Include isl/version.h and use isl_version () for
printing the ISL version.
* doc/install.texi: Update ISL requirement.
>>> My concern here would be that distributions may still be shipping
>> isl-0.14.
>>> Fedora 25 (for example) still uses iso-0.14.
>>
>> isl isn't a mandatory requirement for building gcc, worst case you just
>> don't have graphite support.  Fedora 26 already has isl-0.16.1.
> 
> Yeah.  Note that even with ISL 0.15 there are known bugs.  I just hope that 
> w/o the legacy code maintainance would be easier.

And there are at least 2 bugs (PR79471 and PR69675) which ICE with ISL 0.16 and 
are fixed (well no transformation is done)
in 0.18. But maybe it just hide the ICE instead of not introducing PHI nodes 
usage before a definition.

Martin

> 
> Richard.
> 
>>  Jakub
> 



Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-10 Thread Richard Biener
On February 11, 2017 12:38:32 AM GMT+01:00, Jakub Jelinek  
wrote:
>On Fri, Feb 10, 2017 at 04:34:30PM -0700, Jeff Law wrote:
>> > 2017-02-10  Richard Biener  
>> > 
>> >config/
>> >* isl.m4: Remove support for ISL 0.14.
>> > 
>> >* configure: Re-generate.
>> > 
>> >gcc/
>> >* configure.ac (HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS):
>> >Remove.
>> >* configure: Re-generate.
>> >* config.in: Likewise.
>> >* graphite-dependences.c: Simplify as if
>> >HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS was defined.
>> >* graphite-isl-ast-to-gimple.c: Likewise.
>> >* graphite-optimize-isl.c: Likewise.
>> >* graphite-poly.c: Likewise.
>> >* graphite-sese-to-poly.c: Likewise.
>> >* graphite.h: Likewise.
>> >* toplev.c: Include isl/version.h and use isl_version () for
>> >printing the ISL version.
>> >* doc/install.texi: Update ISL requirement.
>> My concern here would be that distributions may still be shipping
>isl-0.14.
>> Fedora 25 (for example) still uses iso-0.14.
>
>isl isn't a mandatory requirement for building gcc, worst case you just
>don't have graphite support.  Fedora 26 already has isl-0.16.1.

Yeah.  Note that even with ISL 0.15 there are known bugs.  I just hope that w/o 
the legacy code maintainance would be easier.

Richard.

>   Jakub



Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-10 Thread Jakub Jelinek
On Fri, Feb 10, 2017 at 04:34:30PM -0700, Jeff Law wrote:
> > 2017-02-10  Richard Biener  
> > 
> > config/
> > * isl.m4: Remove support for ISL 0.14.
> > 
> > * configure: Re-generate.
> > 
> > gcc/
> > * configure.ac (HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS):
> > Remove.
> > * configure: Re-generate.
> > * config.in: Likewise.
> > * graphite-dependences.c: Simplify as if
> > HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS was defined.
> > * graphite-isl-ast-to-gimple.c: Likewise.
> > * graphite-optimize-isl.c: Likewise.
> > * graphite-poly.c: Likewise.
> > * graphite-sese-to-poly.c: Likewise.
> > * graphite.h: Likewise.
> > * toplev.c: Include isl/version.h and use isl_version () for
> > printing the ISL version.
> > * doc/install.texi: Update ISL requirement.
> My concern here would be that distributions may still be shipping isl-0.14.
> Fedora 25 (for example) still uses iso-0.14.

isl isn't a mandatory requirement for building gcc, worst case you just
don't have graphite support.  Fedora 26 already has isl-0.16.1.

Jakub


Re: [PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-10 Thread Jeff Law

On 02/10/2017 07:13 AM, Richard Biener 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 removes quite
a bit of legacy code (which would need to be maintained).

Bootstrap / regtest in progress with ISL 0.14 installed and once with ISL
0.16.1 installed.

Ok?

I've adjusted to "0.15 or later" everywhere as ISL seems to be quite
stable API (and recently even ABI) wise.

Thanks,
Richard.

2017-02-10  Richard Biener  

config/
* isl.m4: Remove support for ISL 0.14.

* configure: Re-generate.

gcc/
* configure.ac (HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS):
Remove.
* configure: Re-generate.
* config.in: Likewise.
* graphite-dependences.c: Simplify as if
HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS was defined.
* graphite-isl-ast-to-gimple.c: Likewise.
* graphite-optimize-isl.c: Likewise.
* graphite-poly.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* graphite.h: Likewise.
* toplev.c: Include isl/version.h and use isl_version () for
printing the ISL version.
* doc/install.texi: Update ISL requirement.
My concern here would be that distributions may still be shipping 
isl-0.14.  Fedora 25 (for example) still uses iso-0.14.


But I guess with the configure test in place at least folks trying to 
build on their own will get the configure error and can download 
something newer.


No objections from me.

jeff



[PATCH][GRAPHITE] Remove support for ISL 0.14

2017-02-10 Thread Richard Biener

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 removes quite
a bit of legacy code (which would need to be maintained).

Bootstrap / regtest in progress with ISL 0.14 installed and once with ISL 
0.16.1 installed.

Ok?

I've adjusted to "0.15 or later" everywhere as ISL seems to be quite
stable API (and recently even ABI) wise.

Thanks,
Richard.

2017-02-10  Richard Biener  

config/
* isl.m4: Remove support for ISL 0.14.

* configure: Re-generate.

gcc/
* configure.ac (HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS):
Remove.
* configure: Re-generate.
* config.in: Likewise.
* graphite-dependences.c: Simplify as if
HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS was defined.
* graphite-isl-ast-to-gimple.c: Likewise.
* graphite-optimize-isl.c: Likewise.
* graphite-poly.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* graphite.h: Likewise.
* toplev.c: Include isl/version.h and use isl_version () for
printing the ISL version.
* doc/install.texi: Update ISL requirement.


Index: config/isl.m4
===
--- config/isl.m4   (revision 245328)
+++ config/isl.m4   (working copy)
@@ -106,27 +106,15 @@ AC_DEFUN([ISL_CHECK_VERSION],
 LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
 LIBS="${_isl_saved_LIBS} -lisl -lgmp"
 
-AC_MSG_CHECKING([for isl 0.16, 0.15, or deprecated 0.14])
-AC_TRY_LINK([#include ],
-[isl_ctx_get_max_operations (isl_ctx_alloc ());],
+AC_MSG_CHECKING([for isl 0.15 or later])
+AC_TRY_LINK([#include ],
+[isl_options_set_schedule_serialize_sccs (NULL, 0);],
 [gcc_cv_isl=yes],
 [gcc_cv_isl=no])
 AC_MSG_RESULT([$gcc_cv_isl])
 
 if test "${gcc_cv_isl}" = no ; then
-  AC_MSG_RESULT([recommended isl version is 0.16 or 0.15, the minimum 
required isl version 0.14 is deprecated])
-fi
-
-AC_MSG_CHECKING([for isl 0.16 or 0.15])
-AC_TRY_LINK([#include ],
-[isl_options_set_schedule_serialize_sccs (NULL, 0);],
-[ac_has_isl_options_set_schedule_serialize_sccs=yes],
-[ac_has_isl_options_set_schedule_serialize_sccs=no])
-AC_MSG_RESULT($ac_has_isl_options_set_schedule_serialize_sccs)
-
-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
 
 CFLAGS=$_isl_saved_CFLAGS
Index: configure
===
--- configure   (revision 245328)
+++ configure   (working copy)
@@ -649,7 +649,6 @@ extra_linker_plugin_flags
 extra_linker_plugin_configure_flags
 islinc
 isllibs
-islver
 poststage1_ldflags
 poststage1_libs
 stage1_ldflags
@@ -5939,15 +5938,15 @@ $as_echo "$as_me: WARNING: using in-tree
 LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
 LIBS="${_isl_saved_LIBS} -lisl -lgmp"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16, 0.15, or 
deprecated 0.14" >&5
-$as_echo_n "checking for isl 0.16, 0.15, or deprecated 0.14... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.15 or later" 
>&5
+$as_echo_n "checking for isl 0.15 or later... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include 
+#include 
 int
 main ()
 {
-isl_ctx_get_max_operations (isl_ctx_alloc ());
+isl_options_set_schedule_serialize_sccs (NULL, 0);
   ;
   return 0;
 }
@@ -5963,36 +5962,8 @@ rm -f core conftest.err conftest.$ac_obj
 $as_echo "$gcc_cv_isl" >&6; }
 
 if test "${gcc_cv_isl}" = no ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: recommended isl version 
is 0.16 or 0.15, the minimum required isl version 0.14 is deprecated" >&5
-$as_echo "recommended isl version is 0.16 or 0.15, the minimum required isl 
version 0.14 is deprecated" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16 or 0.15" >&5
-$as_echo_n "checking for isl 0.16 or 0.15... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-int
-main ()
-{
-isl_options_set_schedule_serialize_sccs (NULL, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_has_isl_options_set_schedule_serialize_sccs=yes
-else
-  ac_has_isl_options_set_schedule_serialize_sccs=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ac_has_isl_options_set_schedule_serialize_sccs" >&5
-$as_echo "$ac_has_isl_options_set_schedule_serialize_sccs" >&6; }
-
-if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then
-