Re: [PATCH] Allow new ISL/CLooG versions

[Richard Biener <rguenther@suse.de>]

On Wed, 16 Jan 2013, Richard Biener wrote:

> On Tue, 15 Jan 2013, Jack Howarth wrote:
> 
> > On Tue, Jan 15, 2013 at 11:05:51AM +0100, Richard Biener wrote:
> > > On Tue, 15 Jan 2013, Richard Biener wrote:
> > > 
> > > > On Mon, 14 Jan 2013, Jack Howarth wrote:
> > > > 
> > > > > On Mon, Jan 14, 2013 at 08:27:12PM +0100, Dominique Dhumieres wrote:
> > > > > > In order to bootstrap r195167 with the new ISL/CLooG versions,
> > > > > > I had to apply the following patch:
> > > > > > 
> > > > > > --- ../work/configure	2013-01-14 19:32:00.000000000 +0100
> > > > > > +++ configure	2013-01-14 19:42:15.000000000 +0100
> > > > > > @@ -5848,7 +5848,7 @@ else
> > > > > >  int
> > > > > >  main ()
> > > > > >  {
> > > > > > -if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0)
> > > > > > +if (strncmp (isl_version (), "isl-0.11", strlen ("isl-0.11")) != 0)
> > > > > >       return 1;
> > > > > >  
> > > > > >    ;
> > > > > > @@ -6033,7 +6033,7 @@ int
> > > > > >  main ()
> > > > > >  {
> > > > > >  #if CLOOG_VERSION_MAJOR != 0 \
> > > > > > -    || CLOOG_VERSION_MINOR != 17 \
> > > > > > +    || CLOOG_VERSION_MINOR != 18 \
> > > > > >      || CLOOG_VERSION_REVISION < 0
> > > > > >      choke me
> > > > > >     #endif
> > > > > > 
> > > > > > (I didn't bother to update the messages: got 
> > > > > > checking for version 0.10 of ISL... yes
> > > > > > checking for version 0.17.0 of CLooG... yes).
> > > > > > 
> > > > > > Dominique
> > > > > 
> > > > > Dominique,
> > > > >    I believe that hack effectively changes...
> > > > > 
> > > > > Index: configure.ac
> > > > > ===================================================================
> > > > > --- configure.ac	(revision 195174)
> > > > > +++ configure.ac	(working copy)
> > > > > @@ -1607,7 +1607,7 @@ if test "x$with_isl" != "xno" &&
> > > > >    dnl with user input.
> > > > >    ISL_INIT_FLAGS
> > > > >    dnl The versions of ISL that work for Graphite
> > > > > -  ISL_CHECK_VERSION(0,10)
> > > > > +  ISL_CHECK_VERSION(0,11)
> > > > >    if test "${gcc_cv_isl}" = no ; then
> > > > >      ISL_CHECK_VERSION(0,11)
> > > > >    fi
> > > > > 
> > > > > Richard seems to be assuming that the second call to ISL_CHECK_VERSION(0,11)
> > > > > in configure.ac will rerun the isl checks on 0.11.x but I suspect this doesn't
> > > > > take in account the caching of the results from the first call to ISL_CHECK_VERSION().
> > > > > Certainly from my config.log against isl 0.11.1 and cloog 0.18.0, it appears that
> > > > > the version tests from the ISL_CHECK_VERSION(0,11) call aren't run and the
> > > > > cached result from the first ISL_CHECK_VERSION(0,10) is used instead.
> > > > 
> > > > True - I missed that.  I re-tested allowing both versions only
> > > > with in-tree.  I'm going to fix this.
> > > 
> > > Like with the following.  Tested with both in-tree and out-of-tree 
> > > ISL/CLooG.
> > > 
> > > Ok?
> > 
> > Richard,
> >    The committed change solves the build issues here. Any chance we can get the
> > newer tarballs from...
> > 
> > ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/isl-0.11.1.tar.bz2
> > 
> > and
> > 
> > http://www.bastoul.net/cloog/pages/download/cloog-0.18.0.tar.gz
> > 
> > added to gcc/infrastructure subdirectory on the gcc/gnu ftp sites?
> 
> Done.
> 
> It seems we never remove files from that place ... I'll update
> the recommended versions stated in install.texi and would eventually
> remove the isl 0.10 and cloog 0.17.0 versions from the infrastructure.

Committed.

2013-01-16  Richard Biener  <rguenther@suse.de>

	* doc/install.texi: Update CLooG and ISL requirements to
	0.18.0 and 0.11.1.

Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 195204)
+++ gcc/doc/install.texi	(working copy)
@@ -367,23 +367,24 @@ installed but it is not in your default
 @option{--with-mpc} configure option should be used.  See also
 @option{--with-mpc-lib} and @option{--with-mpc-include}.
 
-@item ISL Library version 0.10
+@item ISL Library version 0.11.1
 
 Necessary to build GCC with the Graphite loop optimizations.
-It can be downloaded from @uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/}.
+It can be downloaded from @uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/}
+as @file{isl-0.11.1.tar.bz2}.
 
 The @option{--with-isl} configure option should be used if ISL is not
 installed in your default library search path.
 
-@item CLooG 0.17.0
+@item CLooG 0.18.0
 
 Necessary to build GCC with the Graphite loop optimizations.  It can be
 downloaded from @uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/} as
-@file{cloog-0.17.0.tar.gz}.  The @option{--with-cloog} configure option should
+@file{cloog-0.18.0.tar.gz}.  The @option{--with-cloog} configure option should
 be used if CLooG is not installed in your default library search path.
-CLooG needs to be built against ISL 0.10, not its included copy of ISL
-which is too old.  Use @option{--with-isl=system} to direct CLooG to pick
-up an already installed ISL.  CLooG needs to be configured to use GMP
+CLooG needs to be built against ISL 0.11.1.  Use @option{--with-isl=system}
+to direct CLooG to pick up an already installed ISL, otherwise it will use
+ISL 0.11.1 as bundled with CLooG.  CLooG needs to be configured to use GMP
 internally, use @option{--with-bits=gmp} to direct it to do that.
 
 @end table