Patchwork [1/2] Bump CLooG.org version to 0.16.0.

login
register
mail settings
Submitter Sebastian Pop
Date Dec. 29, 2010, 9:17 a.m.
Message ID <1293614239-3538-1-git-send-email-sebpop@gmail.com>
Download mbox | patch
Permalink /patch/76883/
State New
Headers show

Comments

Sebastian Pop - Dec. 29, 2010, 9:17 a.m.
Hi,

I merged trunk into the graphite branch (168000:168310).
I committed the following two patches to the graphite branch:

- bump the CLooG.org version to 0.16.0 (currently available from
  http://www.kotnet.org/~skimo/cloog/ that is a pre-release of
  CLooG.org 1.0.0 or so.)

- remove unused .h files from the graphite-opencl files.

Sebastian

2010-12-29  Sebastian Pop  <sebastian.pop@amd.com>

	* configure: Regenerated.
	* configure.ac: Use CLOOG_CHECK_VERSION(0,16,0).
---
 ChangeLog.graphite |    5 +++++
 configure          |    6 +++---
 configure.ac       |    4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)
Jack Howarth - Dec. 29, 2010, 2:20 p.m.
On Wed, Dec 29, 2010 at 03:17:17AM -0600, Sebastian Pop wrote:
> Hi,
> 
> I merged trunk into the graphite branch (168000:168310).
> I committed the following two patches to the graphite branch:
> 
> - bump the CLooG.org version to 0.16.0 (currently available from
>   http://www.kotnet.org/~skimo/cloog/ that is a pre-release of
>   CLooG.org 1.0.0 or so.)

Sebastian,
   I noticed that there also is a cloog-parma pre-release posted
as well. Has cloog-parma been fixed to allow graphite in gcc trunk
to work properly? I recall that cloog-parma was lagging behind
cloog-isl in the cloog.org git with respect to graphite compatibility.
               Jack

> 
> - remove unused .h files from the graphite-opencl files.
> 
> Sebastian
> 
> 2010-12-29  Sebastian Pop  <sebastian.pop@amd.com>
> 
> 	* configure: Regenerated.
> 	* configure.ac: Use CLOOG_CHECK_VERSION(0,16,0).
> ---
>  ChangeLog.graphite |    5 +++++
>  configure          |    6 +++---
>  configure.ac       |    4 ++--
>  3 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/ChangeLog.graphite b/ChangeLog.graphite
> index 90fed1e..d5dbacf 100644
> --- a/ChangeLog.graphite
> +++ b/ChangeLog.graphite
> @@ -1,5 +1,10 @@
>  2010-12-29  Sebastian Pop  <sebastian.pop@amd.com>
>  
> +	* configure: Regenerated.
> +	* configure.ac: Use CLOOG_CHECK_VERSION(0,16,0).
> +
> +2010-12-29  Sebastian Pop  <sebastian.pop@amd.com>
> +
>  	* Merge from mainline (168000:168310).
>  
>  2010-12-17  Sebastian Pop  <sebastian.pop@amd.com>
> diff --git a/configure b/configure
> index 66ca5d3..e2926c4 100755
> --- a/configure
> +++ b/configure
> @@ -5971,8 +5971,8 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
>      LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>  
>      if test "${cloog_org}" = yes ; then
> -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.14.0 of CLooG" >&5
> -$as_echo_n "checking for version 0.14.0 of CLooG... " >&6; }
> +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.0 of CLooG" >&5
> +$as_echo_n "checking for version 0.16.0 of CLooG... " >&6; }
>  if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> @@ -5983,7 +5983,7 @@ int
>  main ()
>  {
>  #if CLOOG_VERSION_MAJOR != 0 \
> -    || CLOOG_VERSION_MINOR != 14 \
> +    || CLOOG_VERSION_MINOR != 16 \
>      || CLOOG_VERSION_REVISION < 0
>      choke me
>     #endif
> diff --git a/configure.ac b/configure.ac
> index 4807ffb..2184038 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1667,7 +1667,7 @@ fi
>  if test "x$with_cloog" != "xno"; then
>    dnl Version check for CLooG-Org
>    dnl As long as there is no new release of CLooG,
> -  dnl we will check for 0.14.0.
> +  dnl we will check for 0.16.0.
>    dnl
>    dnl The first git revision that will work with
>    dnl GCC is: bd91b845a65805c290d43fc1bef8139864a163fb
> @@ -1677,7 +1677,7 @@ if test "x$with_cloog" != "xno"; then
>    dnl
>    dnl If we're using CLooG-Legacy, the provided version information
>    dnl will be ignored.
> -  CLOOG_CHECK_VERSION(0,14,0)
> +  CLOOG_CHECK_VERSION(0,16,0)
>  
>    dnl Only execute fail-action, if CLooG has been
>    dnl requested.
> -- 
> 1.7.1
Tobias Grosser - Dec. 29, 2010, 2:32 p.m.
On 12/29/2010 09:20 AM, Jack Howarth wrote:
> On Wed, Dec 29, 2010 at 03:17:17AM -0600, Sebastian Pop wrote:
>> Hi,
>>
>> I merged trunk into the graphite branch (168000:168310).
>> I committed the following two patches to the graphite branch:
>>
>> - bump the CLooG.org version to 0.16.0 (currently available from
>>    http://www.kotnet.org/~skimo/cloog/ that is a pre-release of
>>    CLooG.org 1.0.0 or so.)
>
> Sebastian,
>     I noticed that there also is a cloog-parma pre-release posted
> as well. Has cloog-parma been fixed to allow graphite in gcc trunk
> to work properly? I recall that cloog-parma was lagging behind
> cloog-isl in the cloog.org git with respect to graphite compatibility.
>                 Jack

Hi Jack,

cloog parma should now compile flawless with graphite. It is however not 
yet very thoroughly tested. The better tested cloog is definitely cloog-isl.

Cheers
Tobi
Jack Howarth - Dec. 29, 2010, 4:23 p.m.
On Wed, Dec 29, 2010 at 09:32:12AM -0500, Tobias Grosser wrote:
> On 12/29/2010 09:20 AM, Jack Howarth wrote:
>> On Wed, Dec 29, 2010 at 03:17:17AM -0600, Sebastian Pop wrote:
>>> Hi,
>>>
>>> I merged trunk into the graphite branch (168000:168310).
>>> I committed the following two patches to the graphite branch:
>>>
>>> - bump the CLooG.org version to 0.16.0 (currently available from
>>>    http://www.kotnet.org/~skimo/cloog/ that is a pre-release of
>>>    CLooG.org 1.0.0 or so.)
>>
>> Sebastian,
>>     I noticed that there also is a cloog-parma pre-release posted
>> as well. Has cloog-parma been fixed to allow graphite in gcc trunk
>> to work properly? I recall that cloog-parma was lagging behind
>> cloog-isl in the cloog.org git with respect to graphite compatibility.
>>                 Jack
>
> Hi Jack,
>
> cloog parma should now compile flawless with graphite. It is however not  
> yet very thoroughly tested. The better tested cloog is definitely 
> cloog-isl.

Tobi,
   I am not having any luck building gcc trunk against the current
cloog-parma pre-release. Using...

 ../gcc-4.6-20101229/configure --prefix=/sw --prefix=/sw/lib/gcc4.6 --mandir=/sw/share/man --infodir=/sw/lib/gcc4.6/info --enable-languages=c,c++,fortran,objc,obj-c++,java --with-gmp=/sw --with-libiconv-prefix=/sw --with-ppl=/sw --with-cloog=/sw --with-mpc=/sw --with-system-zlib --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --program-suffix=-fsf-4.6 --enable-checking=yes --enable-cloog-backend=ppl

...configure fails with...

configure:5901: checking for installed CLooG PPL
configure:5919: gcc -o conftest -g -O2 -I/sw/include -I/sw/include -I/sw/include  -I/sw/include   -DCLOOG_INT_GMP -DCLOOG_ORG  -L/sw/lib -L/sw/lib -lppl_c -lppl -lgmpxx conftest.c -lcloog-ppl  >&5
In file included from conftest.c:10:
/sw/include/cloog/cloog.h:51:26: error: cloog/stride.h: No such file or directory
In file included from /sw/include/cloog/cloog.h:52,
                 from conftest.c:10:
/sw/include/cloog/domain.h:136: error: expected declaration specifiers or '...' before 'CloogStride'
/sw/include/cloog/domain.h:161: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
In file included from /sw/include/cloog/cloog.h:55,
                 from conftest.c:10:
/sw/include/cloog/loop.h:68: error: expected specifier-qualifier-list before 'CloogStride'
In file included from /sw/include/cloog/cloog.h:59,
                 from conftest.c:10:
/sw/include/cloog/clast.h:136: error: expected declaration specifiers or '...' before 'CloogStride'
configure:5919: $? = 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 "cloog/cloog.h"
|    #include "cloog/ppl/cloog.h"
| int
| main ()
| {
| cloog_version ()
|   ;
|   return 0;
| }
configure:5927: result: no
configure:6086: error: Unable to find a usable CLooG. See config.log for details.

I was able to build cloog-parma and it passed its testsuite, but the cloog-parma
pre-release doesn't seem to install the stride.h header from the cloog-core subdirectory.
              Jack

>
> Cheers
> Tobi

Patch

diff --git a/ChangeLog.graphite b/ChangeLog.graphite
index 90fed1e..d5dbacf 100644
--- a/ChangeLog.graphite
+++ b/ChangeLog.graphite
@@ -1,5 +1,10 @@ 
 2010-12-29  Sebastian Pop  <sebastian.pop@amd.com>
 
+	* configure: Regenerated.
+	* configure.ac: Use CLOOG_CHECK_VERSION(0,16,0).
+
+2010-12-29  Sebastian Pop  <sebastian.pop@amd.com>
+
 	* Merge from mainline (168000:168310).
 
 2010-12-17  Sebastian Pop  <sebastian.pop@amd.com>
diff --git a/configure b/configure
index 66ca5d3..e2926c4 100755
--- a/configure
+++ b/configure
@@ -5971,8 +5971,8 @@  $as_echo "$gcc_cv_cloog_type" >&6; }
     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
 
     if test "${cloog_org}" = yes ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.14.0 of CLooG" >&5
-$as_echo_n "checking for version 0.14.0 of CLooG... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.0 of CLooG" >&5
+$as_echo_n "checking for version 0.16.0 of CLooG... " >&6; }
 if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5983,7 +5983,7 @@  int
 main ()
 {
 #if CLOOG_VERSION_MAJOR != 0 \
-    || CLOOG_VERSION_MINOR != 14 \
+    || CLOOG_VERSION_MINOR != 16 \
     || CLOOG_VERSION_REVISION < 0
     choke me
    #endif
diff --git a/configure.ac b/configure.ac
index 4807ffb..2184038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1667,7 +1667,7 @@  fi
 if test "x$with_cloog" != "xno"; then
   dnl Version check for CLooG-Org
   dnl As long as there is no new release of CLooG,
-  dnl we will check for 0.14.0.
+  dnl we will check for 0.16.0.
   dnl
   dnl The first git revision that will work with
   dnl GCC is: bd91b845a65805c290d43fc1bef8139864a163fb
@@ -1677,7 +1677,7 @@  if test "x$with_cloog" != "xno"; then
   dnl
   dnl If we're using CLooG-Legacy, the provided version information
   dnl will be ignored.
-  CLOOG_CHECK_VERSION(0,14,0)
+  CLOOG_CHECK_VERSION(0,16,0)
 
   dnl Only execute fail-action, if CLooG has been
   dnl requested.