* [PATCH] Allow new ISL/CLooG versions
@ 2013-01-14 14:29 Richard Biener
2013-01-14 15:44 ` Tobias Grosser
2013-01-20 10:15 ` Eric Botcazou
0 siblings, 2 replies; 19+ messages in thread
From: Richard Biener @ 2013-01-14 14:29 UTC (permalink / raw)
To: gcc-patches; +Cc: Jakub Jelinek
This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo.
It's probably not the best stage to move the version checks to
gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids
it with the caveat that in-tree CLooG 0.18.0 will fail the
version check (they no longer ship built version.h but only
version.h.in).
I verified all GRAPHITE tests pass with 0.18.0/0.11.1.
Ok for trunk?
Or do people prefer to move CLooG/ISL checks to gcc/ configure
time to fix the in-tree use of 0.18.0 and also do version checks
of in-tree ISL at all (they don't have a version.h).
Thanks,
Richard.
2013-01-14 Richard Biener <rguenther@suse.de>
* configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0.
* configure: Re-generate.
Index: configure.ac
===================================================================
--- configure.ac (revision 195144)
+++ configure.ac (working copy)
@@ -1606,8 +1606,11 @@ if test "x$with_isl" != "xno" &&
dnl Provide configure switches and initialize islinc & isllibs
dnl with user input.
ISL_INIT_FLAGS
- dnl The minimal version of ISL required for Graphite.
+ dnl The versions of ISL that work for Graphite
ISL_CHECK_VERSION(0,10)
+ if test "${gcc_cv_isl}" = no ; then
+ ISL_CHECK_VERSION(0,11)
+ fi
dnl Only execute fail-action, if ISL has been requested.
ISL_IF_FAILED([
AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
@@ -1617,11 +1620,11 @@ if test "x$with_isl" != "xno" &&
dnl Provide configure switches and initialize clooginc & clooglibs
dnl with user input.
CLOOG_INIT_FLAGS
- dnl The minimal version of CLooG required for Graphite.
- dnl
- dnl If we use CLooG-Legacy, the provided version information is
- dnl ignored.
+ dnl The versions of CLooG that work for Graphite.
CLOOG_CHECK_VERSION(0,17,0)
+ if test "${gcc_cv_cloog}" = no ; then
+ CLOOG_CHECK_VERSION(0,18,0)
+ fi
dnl Only execute fail-action, if CLooG has been requested.
CLOOG_IF_FAILED([
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 14:29 [PATCH] Allow new ISL/CLooG versions Richard Biener @ 2013-01-14 15:44 ` Tobias Grosser 2013-01-14 16:03 ` Jack Howarth 2013-01-20 10:15 ` Eric Botcazou 1 sibling, 1 reply; 19+ messages in thread From: Tobias Grosser @ 2013-01-14 15:44 UTC (permalink / raw) To: Richard Biener; +Cc: gcc-patches, Jakub Jelinek On 01/14/2013 03:29 PM, Richard Biener wrote: > > This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo. > > It's probably not the best stage to move the version checks to > gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids > it with the caveat that in-tree CLooG 0.18.0 will fail the > version check (they no longer ship built version.h but only > version.h.in). > > I verified all GRAPHITE tests pass with 0.18.0/0.11.1. > > Ok for trunk? > > Or do people prefer to move CLooG/ISL checks to gcc/ configure > time to fix the in-tree use of 0.18.0 and also do version checks > of in-tree ISL at all (they don't have a version.h). Hi Richi, I think this is a good thing. But this probably requires some config guys to approve it. All the best, Tobi ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 15:44 ` Tobias Grosser @ 2013-01-14 16:03 ` Jack Howarth 2013-01-14 16:29 ` Jack Howarth 0 siblings, 1 reply; 19+ messages in thread From: Jack Howarth @ 2013-01-14 16:03 UTC (permalink / raw) To: Tobias Grosser; +Cc: Richard Biener, gcc-patches, Jakub Jelinek On Mon, Jan 14, 2013 at 04:44:04PM +0100, Tobias Grosser wrote: > On 01/14/2013 03:29 PM, Richard Biener wrote: >> >> This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo. >> >> It's probably not the best stage to move the version checks to >> gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids >> it with the caveat that in-tree CLooG 0.18.0 will fail the >> version check (they no longer ship built version.h but only >> version.h.in). >> >> I verified all GRAPHITE tests pass with 0.18.0/0.11.1. >> >> Ok for trunk? >> >> Or do people prefer to move CLooG/ISL checks to gcc/ configure >> time to fix the in-tree use of 0.18.0 and also do version checks >> of in-tree ISL at all (they don't have a version.h). > > Hi Richi, > > I think this is a good thing. But this probably requires some config > guys to approve it. > > All the best, > Tobi Tnis change has already been committed at... r195150 | rguenth | 2013-01-14 10:01:13 -0500 (Mon, 14 Jan 2013) | 5 lines 2013-01-14 Richard Biener <rguenther@suse.de> * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0. * configure: Re-generate This change is broken in several ways. The current commit doesn't handle isl 0.11.1 because it omits teaching config/isl.m4 how to handle revsions with... Index: config/isl.m4 =================================================================== --- config/isl.m4 (revision 194744) +++ config/isl.m4 (working copy) @@ -89,13 +89,13 @@ AC_DEFUN([ISL_REQUESTED], ] ) -# _ISL_CHECK_CT_PROG(MAJOR, MINOR) +# _ISL_CHECK_CT_PROG(MAJOR, MINOR, REVISION) # -------------------------------------------- # Helper for verifying ISL compile time version. m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( [#include <isl/version.h> #include <string.h>], - [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0) + [if (strncmp (isl_version (), "isl-$1.$2.$3", strlen ("isl-$1.$2.$3")) != 0) return 1; ])]) @@ -115,9 +115,9 @@ AC_DEFUN([ISL_CHECK_VERSION], LIBS="${_isl_saved_LIBS} -lisl" echo $CFLAGS - AC_CACHE_CHECK([for version $1.$2 of ISL], + AC_CACHE_CHECK([for version $1.$2.$3 of ISL], [gcc_cv_isl], - [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], + [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2,$3)], [gcc_cv_isl=yes], [gcc_cv_isl=no], [gcc_cv_isl=yes])]) like config/cloog.m4 does. Also the current commit leaves the legacy... ISL_CHECK_VERSION(0,10) + if test "${gcc_cv_isl}" = no ; then + ISL_CHECK_VERSION(0,11) + fi test on isl 0.10 present insuring that it will fail for any out of tree isl version. Jack ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 16:03 ` Jack Howarth @ 2013-01-14 16:29 ` Jack Howarth 2013-01-14 18:20 ` Richard Biener 0 siblings, 1 reply; 19+ messages in thread From: Jack Howarth @ 2013-01-14 16:29 UTC (permalink / raw) To: Tobias Grosser; +Cc: Richard Biener, gcc-patches, Jakub Jelinek On Mon, Jan 14, 2013 at 11:03:41AM -0500, Jack Howarth wrote: > On Mon, Jan 14, 2013 at 04:44:04PM +0100, Tobias Grosser wrote: > > On 01/14/2013 03:29 PM, Richard Biener wrote: > >> > >> This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo. > >> > >> It's probably not the best stage to move the version checks to > >> gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids > >> it with the caveat that in-tree CLooG 0.18.0 will fail the > >> version check (they no longer ship built version.h but only > >> version.h.in). > >> > >> I verified all GRAPHITE tests pass with 0.18.0/0.11.1. > >> > >> Ok for trunk? Richard, Did you see my patch proposal in the gcc mailing list before you crafted your patch? http://gcc.gnu.org/ml/gcc/2012-12/msg00195.html Jack > >> > >> Or do people prefer to move CLooG/ISL checks to gcc/ configure > >> time to fix the in-tree use of 0.18.0 and also do version checks > >> of in-tree ISL at all (they don't have a version.h). > > > > Hi Richi, > > > > I think this is a good thing. But this probably requires some config > > guys to approve it. > > > > All the best, > > Tobi > > Tnis change has already been committed at... > > r195150 | rguenth | 2013-01-14 10:01:13 -0500 (Mon, 14 Jan 2013) | 5 lines > > 2013-01-14 Richard Biener <rguenther@suse.de> > > * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0. > * configure: Re-generate > > > This change is broken in several ways. The current commit doesn't handle > isl 0.11.1 because it omits teaching config/isl.m4 how to handle revsions > with... > > Index: config/isl.m4 > =================================================================== > --- config/isl.m4 (revision 194744) > +++ config/isl.m4 (working copy) > @@ -89,13 +89,13 @@ AC_DEFUN([ISL_REQUESTED], > ] > ) > > -# _ISL_CHECK_CT_PROG(MAJOR, MINOR) > +# _ISL_CHECK_CT_PROG(MAJOR, MINOR, REVISION) > # -------------------------------------------- > # Helper for verifying ISL compile time version. > m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( > [#include <isl/version.h> > #include <string.h>], > - [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0) > + [if (strncmp (isl_version (), "isl-$1.$2.$3", strlen ("isl-$1.$2.$3")) != 0) > return 1; > ])]) > > @@ -115,9 +115,9 @@ AC_DEFUN([ISL_CHECK_VERSION], > LIBS="${_isl_saved_LIBS} -lisl" > echo $CFLAGS > > - AC_CACHE_CHECK([for version $1.$2 of ISL], > + AC_CACHE_CHECK([for version $1.$2.$3 of ISL], > [gcc_cv_isl], > - [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], > + [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2,$3)], > [gcc_cv_isl=yes], > [gcc_cv_isl=no], > [gcc_cv_isl=yes])]) > > like config/cloog.m4 does. Also the current commit leaves the legacy... > > ISL_CHECK_VERSION(0,10) > + if test "${gcc_cv_isl}" = no ; then > + ISL_CHECK_VERSION(0,11) > + fi > > test on isl 0.10 present insuring that it will fail for any out of tree > isl version. > Jack > > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 16:29 ` Jack Howarth @ 2013-01-14 18:20 ` Richard Biener 2013-01-14 20:04 ` Jack Howarth 0 siblings, 1 reply; 19+ messages in thread From: Richard Biener @ 2013-01-14 18:20 UTC (permalink / raw) To: Jack Howarth, Tobias Grosser; +Cc: gcc-patches, Jakub Jelinek Jack Howarth <howarth@bromo.med.uc.edu> wrote: >On Mon, Jan 14, 2013 at 11:03:41AM -0500, Jack Howarth wrote: >> On Mon, Jan 14, 2013 at 04:44:04PM +0100, Tobias Grosser wrote: >> > On 01/14/2013 03:29 PM, Richard Biener wrote: >> >> >> >> This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo. >> >> >> >> It's probably not the best stage to move the version checks to >> >> gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids >> >> it with the caveat that in-tree CLooG 0.18.0 will fail the >> >> version check (they no longer ship built version.h but only >> >> version.h.in). >> >> >> >> I verified all GRAPHITE tests pass with 0.18.0/0.11.1. >> >> >> >> Ok for trunk? > >Richard, >Did you see my patch proposal in the gcc mailing list before you >crafted your patch? > >http://gcc.gnu.org/ml/gcc/2012-12/msg00195.html > Yes I did. The patch is not broken, it restricts compare to major and minor. Richard. > Jack > >> >> >> >> Or do people prefer to move CLooG/ISL checks to gcc/ configure >> >> time to fix the in-tree use of 0.18.0 and also do version checks >> >> of in-tree ISL at all (they don't have a version.h). >> > >> > Hi Richi, >> > >> > I think this is a good thing. But this probably requires some >config >> > guys to approve it. >> > >> > All the best, >> > Tobi >> >> Tnis change has already been committed at... >> >> r195150 | rguenth | 2013-01-14 10:01:13 -0500 (Mon, 14 Jan 2013) | 5 >lines >> >> 2013-01-14 Richard Biener <rguenther@suse.de> >> >> * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG >0.18.0. >> * configure: Re-generate >> >> >> This change is broken in several ways. The current commit doesn't >handle >> isl 0.11.1 because it omits teaching config/isl.m4 how to handle >revsions >> with... >> >> Index: config/isl.m4 >> =================================================================== >> --- config/isl.m4 (revision 194744) >> +++ config/isl.m4 (working copy) >> @@ -89,13 +89,13 @@ AC_DEFUN([ISL_REQUESTED], >> ] >> ) >> >> -# _ISL_CHECK_CT_PROG(MAJOR, MINOR) >> +# _ISL_CHECK_CT_PROG(MAJOR, MINOR, REVISION) >> # -------------------------------------------- >> # Helper for verifying ISL compile time version. >> m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( >> [#include <isl/version.h> >> #include <string.h>], >> - [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) >!= 0) >> + [if (strncmp (isl_version (), "isl-$1.$2.$3", strlen >("isl-$1.$2.$3")) != 0) >> return 1; >> ])]) >> >> @@ -115,9 +115,9 @@ AC_DEFUN([ISL_CHECK_VERSION], >> LIBS="${_isl_saved_LIBS} -lisl" >> echo $CFLAGS >> >> - AC_CACHE_CHECK([for version $1.$2 of ISL], >> + AC_CACHE_CHECK([for version $1.$2.$3 of ISL], >> [gcc_cv_isl], >> - [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], >> + [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2,$3)], >> [gcc_cv_isl=yes], >> [gcc_cv_isl=no], >> [gcc_cv_isl=yes])]) >> >> like config/cloog.m4 does. Also the current commit leaves the >legacy... >> >> ISL_CHECK_VERSION(0,10) >> + if test "${gcc_cv_isl}" = no ; then >> + ISL_CHECK_VERSION(0,11) >> + fi >> >> test on isl 0.10 present insuring that it will fail for any out of >tree >> isl version. >> Jack >> >> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 18:20 ` Richard Biener @ 2013-01-14 20:04 ` Jack Howarth 0 siblings, 0 replies; 19+ messages in thread From: Jack Howarth @ 2013-01-14 20:04 UTC (permalink / raw) To: Richard Biener; +Cc: Tobias Grosser, gcc-patches, Jakub Jelinek On Mon, Jan 14, 2013 at 07:22:03PM +0100, Richard Biener wrote: > Jack Howarth <howarth@bromo.med.uc.edu> wrote: > > >On Mon, Jan 14, 2013 at 11:03:41AM -0500, Jack Howarth wrote: > >> On Mon, Jan 14, 2013 at 04:44:04PM +0100, Tobias Grosser wrote: > >> > On 01/14/2013 03:29 PM, Richard Biener wrote: > >> >> > >> >> This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo. > >> >> > >> >> It's probably not the best stage to move the version checks to > >> >> gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids > >> >> it with the caveat that in-tree CLooG 0.18.0 will fail the > >> >> version check (they no longer ship built version.h but only > >> >> version.h.in). > >> >> > >> >> I verified all GRAPHITE tests pass with 0.18.0/0.11.1. > >> >> > >> >> Ok for trunk? > > > >Richard, > >Did you see my patch proposal in the gcc mailing list before you > >crafted your patch? > > > >http://gcc.gnu.org/ml/gcc/2012-12/msg00195.html > > > Yes I did. The patch is not broken, it restricts compare to major and minor. How exactly did you test this? I am using isl 0.11.1 and cloog 0.18.0 from fink installed in /sw out of tree. This fails in config.log as... configure:5836: checking for version 0.10 of ISL configure:5858: gcc -o conftest -g -O2 -I/sw/include -I/sw/include -I/sw/include -L/sw/lib conftest.c -lisl >&5 configure:5858: $? = 0 configure:5858: ./conftest configure:5858: $? = 1 configure: program exited with status 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "" | #define PACKAGE_TARNAME "" | #define PACKAGE_VERSION "" | #define PACKAGE_STRING "" | #define PACKAGE_BUGREPORT "" | #define PACKAGE_URL "" | #define LT_OBJDIR ".libs/" | /* end confdefs.h. */ | #include <isl/version.h> | #include <string.h> | int | main () | { | if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0) | return 1; | | ; | return 0; | } configure:5868: result: no configure:5889: checking for version 0.11 of ISL configure:5921: result: no configure:5956: error: Unable to find a usable ISL. See config.log for details. This is with gcc trunk configured as... $ ../gcc-4.8-20130114/configure --prefix=/sw --prefix=/sw/lib/gcc4.8 --mandir=/sw/share/man --infodir=/sw/lib/gcc4.8/info --enable-languages=c,c++,fortran,lto,objc,obj-c++,java --with-gmp=/sw --with-libiconv-prefix=/sw --with-isl=/sw --with-cloog=/sw --with-mpc=/sw --with-system-zlib --enable-checking=yes --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --program-suffix=-fsf-4.8 > > Richard. > > Jack > > > >> >> > >> >> Or do people prefer to move CLooG/ISL checks to gcc/ configure > >> >> time to fix the in-tree use of 0.18.0 and also do version checks > >> >> of in-tree ISL at all (they don't have a version.h). > >> > > >> > Hi Richi, > >> > > >> > I think this is a good thing. But this probably requires some > >config > >> > guys to approve it. > >> > > >> > All the best, > >> > Tobi > >> > >> Tnis change has already been committed at... > >> > >> r195150 | rguenth | 2013-01-14 10:01:13 -0500 (Mon, 14 Jan 2013) | 5 > >lines > >> > >> 2013-01-14 Richard Biener <rguenther@suse.de> > >> > >> * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG > >0.18.0. > >> * configure: Re-generate > >> > >> > >> This change is broken in several ways. The current commit doesn't > >handle > >> isl 0.11.1 because it omits teaching config/isl.m4 how to handle > >revsions > >> with... > >> > >> Index: config/isl.m4 > >> =================================================================== > >> --- config/isl.m4 (revision 194744) > >> +++ config/isl.m4 (working copy) > >> @@ -89,13 +89,13 @@ AC_DEFUN([ISL_REQUESTED], > >> ] > >> ) > >> > >> -# _ISL_CHECK_CT_PROG(MAJOR, MINOR) > >> +# _ISL_CHECK_CT_PROG(MAJOR, MINOR, REVISION) > >> # -------------------------------------------- > >> # Helper for verifying ISL compile time version. > >> m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( > >> [#include <isl/version.h> > >> #include <string.h>], > >> - [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) > >!= 0) > >> + [if (strncmp (isl_version (), "isl-$1.$2.$3", strlen > >("isl-$1.$2.$3")) != 0) > >> return 1; > >> ])]) > >> > >> @@ -115,9 +115,9 @@ AC_DEFUN([ISL_CHECK_VERSION], > >> LIBS="${_isl_saved_LIBS} -lisl" > >> echo $CFLAGS > >> > >> - AC_CACHE_CHECK([for version $1.$2 of ISL], > >> + AC_CACHE_CHECK([for version $1.$2.$3 of ISL], > >> [gcc_cv_isl], > >> - [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], > >> + [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2,$3)], > >> [gcc_cv_isl=yes], > >> [gcc_cv_isl=no], > >> [gcc_cv_isl=yes])]) > >> > >> like config/cloog.m4 does. Also the current commit leaves the > >legacy... > >> > >> ISL_CHECK_VERSION(0,10) > >> + if test "${gcc_cv_isl}" = no ; then > >> + ISL_CHECK_VERSION(0,11) > >> + fi > >> > >> test on isl 0.10 present insuring that it will fail for any out of > >tree > >> isl version. > >> Jack > >> > >> > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 14:29 [PATCH] Allow new ISL/CLooG versions Richard Biener 2013-01-14 15:44 ` Tobias Grosser @ 2013-01-20 10:15 ` Eric Botcazou 2013-01-20 13:27 ` Richard Biener 1 sibling, 1 reply; 19+ messages in thread From: Eric Botcazou @ 2013-01-20 10:15 UTC (permalink / raw) To: Richard Biener; +Cc: gcc-patches, Jakub Jelinek > 2013-01-14 Richard Biener <rguenther@suse.de> > > * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0. > * configure: Re-generate. The output is strange: checking for the correct version of the gmp/mpfr/mpc libraries... yes -g -O2 checking for version 0.10 of ISL... no -g -O2 checking for version 0.11 of ISL... no Why are you echoing $CFLAGS here? -- Eric Botcazou ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-20 10:15 ` Eric Botcazou @ 2013-01-20 13:27 ` Richard Biener 0 siblings, 0 replies; 19+ messages in thread From: Richard Biener @ 2013-01-20 13:27 UTC (permalink / raw) To: Eric Botcazou; +Cc: gcc-patches, Jakub Jelinek Eric Botcazou <ebotcazou@adacore.com> wrote: >> 2013-01-14 Richard Biener <rguenther@suse.de> >> >> * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0. >> * configure: Re-generate. > >The output is strange: > >checking for the correct version of the gmp/mpfr/mpc libraries... yes >-g -O2 >checking for version 0.10 of ISL... no >-g -O2 >checking for version 0.11 of ISL... no > >Why are you echoing $CFLAGS here? Huh. That must have slipped through from a modified working copy at some point. A patch to remove it is obvious. Thanks, Richard. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions
@ 2013-01-14 19:27 Dominique Dhumieres
2013-01-14 20:20 ` Jack Howarth
0 siblings, 1 reply; 19+ messages in thread
From: Dominique Dhumieres @ 2013-01-14 19:27 UTC (permalink / raw)
To: gcc-patches; +Cc: tobias, howarth, rguenther
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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 19:27 Dominique Dhumieres @ 2013-01-14 20:20 ` Jack Howarth 2013-01-14 20:29 ` Dominique Dhumieres 2013-01-15 9:24 ` Richard Biener 0 siblings, 2 replies; 19+ messages in thread From: Jack Howarth @ 2013-01-14 20:20 UTC (permalink / raw) To: Dominique Dhumieres; +Cc: gcc-patches, tobias, rguenther 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. Jack ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 20:20 ` Jack Howarth @ 2013-01-14 20:29 ` Dominique Dhumieres 2013-01-14 20:45 ` Jack Howarth 2013-01-15 9:24 ` Richard Biener 1 sibling, 1 reply; 19+ messages in thread From: Dominique Dhumieres @ 2013-01-14 20:29 UTC (permalink / raw) To: howarth, dominiq; +Cc: tobias, rguenther, gcc-patches Jack, Without the change for isl, I get at configure time: -g -O2 -I/opt/mp/include -I/opt/mp/include checking for version 0.10 of ISL... no -g -O2 -I/opt/mp/include -I/opt/mp/include checking for version 0.11 of ISL... (cached) no configure: error: Unable to find a usable ISL. See config.log for details. and after it but without the change for CLooG checking for version 0.10 of ISL... yes checking for version 0.17.0 of CLooG... no checking for version 0.18.0 of CLooG... (cached) no I don't know if this support your claim or not. Dominique ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 20:29 ` Dominique Dhumieres @ 2013-01-14 20:45 ` Jack Howarth 0 siblings, 0 replies; 19+ messages in thread From: Jack Howarth @ 2013-01-14 20:45 UTC (permalink / raw) To: Dominique Dhumieres; +Cc: tobias, rguenther, gcc-patches On Mon, Jan 14, 2013 at 09:28:53PM +0100, Dominique Dhumieres wrote: > Jack, > > Without the change for isl, I get at configure time: > > -g -O2 -I/opt/mp/include -I/opt/mp/include > checking for version 0.10 of ISL... no > -g -O2 -I/opt/mp/include -I/opt/mp/include > checking for version 0.11 of ISL... (cached) no Exactly. If you look in config.log you will see that the first instance of 'checking for version 0.10 of ISL' actually compiles the version check but the second instance of 'checking for version 0.11 of ISL' is using the cached results from the first instance as indicated in the configure output. Your hack is just changing the first test from 0.10 to 0.11 so that it succeeds and configure doesn't even run the second instance of the ISL_CHECK_VERSION(). > configure: error: Unable to find a usable ISL. See config.log for details. > > and after it but without the change for CLooG > > checking for version 0.10 of ISL... yes > checking for version 0.17.0 of CLooG... no > checking for version 0.18.0 of CLooG... (cached) no > > I don't know if this support your claim or not. > > Dominique ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-14 20:20 ` Jack Howarth 2013-01-14 20:29 ` Dominique Dhumieres @ 2013-01-15 9:24 ` Richard Biener 2013-01-15 10:06 ` Richard Biener 1 sibling, 1 reply; 19+ messages in thread From: Richard Biener @ 2013-01-15 9:24 UTC (permalink / raw) To: Jack Howarth; +Cc: Dominique Dhumieres, gcc-patches, tobias 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. Richard. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-15 9:24 ` Richard Biener @ 2013-01-15 10:06 ` Richard Biener 2013-01-15 12:58 ` Jakub Jelinek 2013-01-15 14:07 ` Jack Howarth 0 siblings, 2 replies; 19+ messages in thread From: Richard Biener @ 2013-01-15 10:06 UTC (permalink / raw) To: Jack Howarth; +Cc: Dominique Dhumieres, gcc-patches, Jakub Jelinek, tobias 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? 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 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-15 10:06 ` Richard Biener @ 2013-01-15 12:58 ` Jakub Jelinek 2013-01-15 14:07 ` Jack Howarth 1 sibling, 0 replies; 19+ messages in thread From: Jakub Jelinek @ 2013-01-15 12:58 UTC (permalink / raw) To: Richard Biener; +Cc: Jack Howarth, Dominique Dhumieres, gcc-patches, tobias On Tue, Jan 15, 2013 at 11:05:51AM +0100, Richard Biener wrote: > 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. Okay. Jakub ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-15 10:06 ` Richard Biener 2013-01-15 12:58 ` Jakub Jelinek @ 2013-01-15 14:07 ` Jack Howarth 2013-01-16 9:31 ` Richard Biener 1 sibling, 1 reply; 19+ messages in thread From: Jack Howarth @ 2013-01-15 14:07 UTC (permalink / raw) To: Richard Biener; +Cc: Dominique Dhumieres, gcc-patches, Jakub Jelinek, tobias 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 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-15 14:07 ` Jack Howarth @ 2013-01-16 9:31 ` Richard Biener 2013-01-16 9:36 ` Richard Biener 0 siblings, 1 reply; 19+ messages in thread From: Richard Biener @ 2013-01-16 9:31 UTC (permalink / raw) To: Jack Howarth; +Cc: Dominique Dhumieres, gcc-patches, Jakub Jelinek, tobias 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. Richard. > 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 > > -- Richard Biener <rguenther@suse.de> SUSE / SUSE Labs SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 GF: Jeff Hawn, Jennifer Guild, Felix Imend ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions 2013-01-16 9:31 ` Richard Biener @ 2013-01-16 9:36 ` Richard Biener 0 siblings, 0 replies; 19+ messages in thread From: Richard Biener @ 2013-01-16 9:36 UTC (permalink / raw) To: Jack Howarth; +Cc: Dominique Dhumieres, gcc-patches, Jakub Jelinek, tobias 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 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Allow new ISL/CLooG versions
@ 2013-01-14 20:18 Dominique Dhumieres
0 siblings, 0 replies; 19+ messages in thread
From: Dominique Dhumieres @ 2013-01-14 20:18 UTC (permalink / raw)
To: gcc-patches; +Cc: tobias, howarth, rguenther
Jack,
> How exactly did you test this? I am using isl 0.11.1 and cloog 0.18.0 from fink
> installed in /sw out of tree. This fails in config.log as...
Same here (the libs are not in /sw but in /mp) and I got the same errors before
I did the changed in my previous post.
Dominique
^ permalink raw reply [flat|nested] 19+ messages in threadend of thread, other threads:[~2013-01-20 13:27 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-01-14 14:29 [PATCH] Allow new ISL/CLooG versions Richard Biener 2013-01-14 15:44 ` Tobias Grosser 2013-01-14 16:03 ` Jack Howarth 2013-01-14 16:29 ` Jack Howarth 2013-01-14 18:20 ` Richard Biener 2013-01-14 20:04 ` Jack Howarth 2013-01-20 10:15 ` Eric Botcazou 2013-01-20 13:27 ` Richard Biener 2013-01-14 19:27 Dominique Dhumieres 2013-01-14 20:20 ` Jack Howarth 2013-01-14 20:29 ` Dominique Dhumieres 2013-01-14 20:45 ` Jack Howarth 2013-01-15 9:24 ` Richard Biener 2013-01-15 10:06 ` Richard Biener 2013-01-15 12:58 ` Jakub Jelinek 2013-01-15 14:07 ` Jack Howarth 2013-01-16 9:31 ` Richard Biener 2013-01-16 9:36 ` Richard Biener 2013-01-14 20:18 Dominique Dhumieres
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).