Patchwork Allow new ISL/CLooG versions

login
register
mail settings
Submitter Richard Guenther
Date Jan. 14, 2013, 2:29 p.m.
Message ID <alpine.LNX.2.00.1301141525590.6889@zhemvz.fhfr.qr>
Download mbox | patch
Permalink /patch/211797/
State New
Headers show

Comments

Richard Guenther - Jan. 14, 2013, 2:29 p.m.
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.
Tobias Grosser - Jan. 14, 2013, 3:44 p.m.
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
Eric Botcazou - Jan. 20, 2013, 10:15 a.m.
> 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?
Richard Guenther - Jan. 20, 2013, 1:27 p.m.
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.

Patch

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([