This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [PATCH] Allow new ISL/CLooG versions

From: Jack Howarth <howarth at bromo dot med dot uc dot edu>
To: Richard Biener <rguenther at suse dot de>
Cc: Dominique Dhumieres <dominiq at lps dot ens dot fr>, gcc-patches at gcc dot gnu dot org, Jakub Jelinek <jakub at redhat dot com>, tobias at grosser dot es
Date: Tue, 15 Jan 2013 09:07:37 -0500
Subject: Re: [PATCH] Allow new ISL/CLooG versions
References: <20130114192712.BE33A3BE1B@mailhost.lps.ens.fr> <20130114202039.GA22255@bromo.med.uc.edu> <alpine.LNX.2.00.1301151023270.6889@zhemvz.fhfr.qr> <alpine.LNX.2.00.1301151105120.6889@zhemvz.fhfr.qr>

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?
          Jack

> 
> Thanks,
> Richard.
> 
> 2013-01-15  Richard Biener  <rguenther@suse.de>
> 
> 	PR other/55973
> 	* configure: Re-generate.
> 
> 	config/
> 	* isl.m4 (ISL_INIT_FLAGS): Warn about disabled version check
> 	for in-tree build.
> 	(ISL_CHECK_VERSION): Do not use AC_CACHE_CHECK.
> 	* cloog.m4 (CLOOG_INIT_FLAGS): Disable version check for
> 	in-tree build and warn about that.
> 	(CLOOG_CHECK_VERSION): Do not use AC_CACHE_CHECK.
> 
> Index: config/isl.m4
> ===================================================================
> --- config/isl.m4	(revision 195190)
> +++ config/isl.m4	(working copy)
> @@ -66,6 +66,7 @@ AC_DEFUN([ISL_INIT_FLAGS],
>      isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
>      islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
>      ENABLE_ISL_CHECK=no
> +    AC_MSG_WARN([using in-tree ISL, disabling version check])
>    fi
>  ]
>  )
> @@ -115,12 +116,12 @@ AC_DEFUN([ISL_CHECK_VERSION],
>      LIBS="${_isl_saved_LIBS} -lisl"
>      echo $CFLAGS
>  
> -    AC_CACHE_CHECK([for version $1.$2 of ISL],
> -      [gcc_cv_isl],
> -      [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
> +    AC_MSG_CHECKING([for version $1.$2 of ISL])
> +    AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
>  	[gcc_cv_isl=yes],
>  	[gcc_cv_isl=no],
> -	[gcc_cv_isl=yes])])
> +	[gcc_cv_isl=yes])
> +    AC_MSG_RESULT([$gcc_cv_isl])
>  
>      CFLAGS=$_isl_saved_CFLAGS
>      LDFLAGS=$_isl_saved_LDFLAGS
> Index: config/cloog.m4
> ===================================================================
> --- config/cloog.m4	(revision 195190)
> +++ config/cloog.m4	(working copy)
> @@ -57,12 +57,15 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
>    if test "x${with_cloog_lib}" != x; then
>      clooglibs="-L$with_cloog_lib"
>    fi
> -  dnl If no --with-cloog flag was specified and there is in-tree ClooG
> -  dnl source, set up flags to use that.
> +  dnl If no --with-cloog flag was specified and there is in-tree CLooG
> +  dnl source, set up flags to use that and skip any version tests
> +  dnl as we cannot run them reliably before building CLooG
>    if test "x${clooginc}" = x && test "x${clooglibs}" = x \
>       && test -d ${srcdir}/cloog; then
>       clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
>       clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
> +    ENABLE_CLOOG_CHECK=no
> +    AC_MSG_WARN([using in-tree CLooG, disabling version check])
>    fi
>  
>    clooginc="-DCLOOG_INT_GMP ${clooginc}"
> @@ -115,11 +118,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION],
>      CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
>      LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
>  
> -    AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
> -      [gcc_cv_cloog],
> -      [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
> +    AC_MSG_CHECKING([for version $1.$2.$3 of CLooG])
> +    AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
>  	[gcc_cv_cloog=yes],
> -	[gcc_cv_cloog=no])])
> +	[gcc_cv_cloog=no])
> +    AC_MSG_RESULT([$gcc_cv_cloog])
>  
>      CFLAGS=$_cloog_saved_CFLAGS
>      LDFLAGS=$_cloog_saved_LDFLAGS
> Index: configure
> ===================================================================
> --- configure	(revision 195190)
> +++ configure	(working copy)
> @@ -5819,6 +5819,8 @@ fi
>      isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
>      islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
>      ENABLE_ISL_CHECK=no
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5
> +$as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
>    fi
>  
>  
> @@ -5835,10 +5837,7 @@ fi
>  
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
>  $as_echo_n "checking for version 0.10 of ISL... " >&6; }
> -if test "${gcc_cv_isl+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test "$cross_compiling" = yes; then :
> +    if test "$cross_compiling" = yes; then :
>    gcc_cv_isl=yes
>  else
>    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -5864,8 +5863,7 @@ rm -f core *.core core.conftest.* gmon.o
>    conftest.$ac_objext conftest.beam conftest.$ac_ext
>  fi
>  
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
>  $as_echo "$gcc_cv_isl" >&6; }
>  
>      CFLAGS=$_isl_saved_CFLAGS
> @@ -5888,10 +5886,7 @@ $as_echo "$gcc_cv_isl" >&6; }
>  
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
>  $as_echo_n "checking for version 0.11 of ISL... " >&6; }
> -if test "${gcc_cv_isl+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test "$cross_compiling" = yes; then :
> +    if test "$cross_compiling" = yes; then :
>    gcc_cv_isl=yes
>  else
>    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -5917,8 +5912,7 @@ rm -f core *.core core.conftest.* gmon.o
>    conftest.$ac_objext conftest.beam conftest.$ac_ext
>  fi
>  
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
>  $as_echo "$gcc_cv_isl" >&6; }
>  
>      CFLAGS=$_isl_saved_CFLAGS
> @@ -6001,10 +5995,13 @@ fi
>    if test "x${with_cloog_lib}" != x; then
>      clooglibs="-L$with_cloog_lib"
>    fi
> -      if test "x${clooginc}" = x && test "x${clooglibs}" = x \
> +        if test "x${clooginc}" = x && test "x${clooglibs}" = x \
>       && test -d ${srcdir}/cloog; then
>       clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
>       clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
> +    ENABLE_CLOOG_CHECK=no
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree CLooG, disabling version check" >&5
> +$as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;}
>    fi
>  
>    clooginc="-DCLOOG_INT_GMP ${clooginc}"
> @@ -6023,10 +6020,7 @@ fi
>  
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5
>  $as_echo_n "checking for version 0.17.0 of CLooG... " >&6; }
> -if test "${gcc_cv_cloog+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  #include "cloog/version.h"
>  int
> @@ -6047,8 +6041,7 @@ else
>    gcc_cv_cloog=no
>  fi
>  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
>  $as_echo "$gcc_cv_cloog" >&6; }
>  
>      CFLAGS=$_cloog_saved_CFLAGS
> @@ -6069,10 +6062,7 @@ $as_echo "$gcc_cv_cloog" >&6; }
>  
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5
>  $as_echo_n "checking for version 0.18.0 of CLooG... " >&6; }
> -if test "${gcc_cv_cloog+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  #include "cloog/version.h"
>  int
> @@ -6093,8 +6083,7 @@ else
>    gcc_cv_cloog=no
>  fi
>  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
>  $as_echo "$gcc_cv_cloog" >&6; }
>  
>      CFLAGS=$_cloog_saved_CFLAGS

Follow-Ups:
- Re: [PATCH] Allow new ISL/CLooG versions
  - From: Richard Biener

References:
- Re: [PATCH] Allow new ISL/CLooG versions
  - From: Dominique Dhumieres
- Re: [PATCH] Allow new ISL/CLooG versions
  - From: Jack Howarth
- Re: [PATCH] Allow new ISL/CLooG versions
  - From: Richard Biener
- Re: [PATCH] Allow new ISL/CLooG versions
  - From: Richard Biener

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]