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

login
register
mail settings
Submitter Sven Verdoolaege
Date Dec. 29, 2010, 4:36 p.m.
Message ID <20101229163623.GL4376MdfPADPa@purples>
Download mbox | patch
Permalink /patch/76929/
State New
Headers show

Comments

Sven Verdoolaege - Dec. 29, 2010, 4:36 p.m.
On Wed, Dec 29, 2010 at 11:23:39AM -0500, Jack Howarth wrote:
> 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

Try this:


skimo
Jack Howarth - Dec. 29, 2010, 5:12 p.m.
On Wed, Dec 29, 2010 at 05:36:23PM +0100, Sven Verdoolaege wrote:
> On Wed, Dec 29, 2010 at 11:23:39AM -0500, Jack Howarth wrote:
> > 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
> 
> Try this:
> 
> diff --git a/Makefile.am b/Makefile.am
> index 6a9d542..58be176 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -67,17 +67,18 @@ nodist_clooginclude_HEADERS = \
>  	$(cloog_srcdir)/include/cloog/clast.h \
>  	$(cloog_srcdir)/include/cloog/cloog.h \
>  	$(cloog_srcdir)/include/cloog/input.h \
> -	$(cloog_builddir)/include/cloog/int.h \
> +	$(cloog_srcdir)/include/cloog/int.h \
>  	$(cloog_srcdir)/include/cloog/matrix.h \
>  	$(cloog_srcdir)/include/cloog/state.h \
>  	$(cloog_srcdir)/include/cloog/domain.h \
>  	$(cloog_srcdir)/include/cloog/loop.h \
>  	$(cloog_srcdir)/include/cloog/constraints.h \
>  	$(cloog_srcdir)/include/cloog/names.h \
> -	$(cloog_builddir)/include/cloog/options.h \
> +	$(cloog_srcdir)/include/cloog/options.h \
>  	$(cloog_srcdir)/include/cloog/pprint.h \
>  	$(cloog_srcdir)/include/cloog/program.h \
>  	$(cloog_srcdir)/include/cloog/statement.h \
> +	$(cloog_srcdir)/include/cloog/stride.h \
>  	$(cloog_srcdir)/include/cloog/union_domain.h \
>  	$(cloog_builddir)/include/cloog/version.h
>  
> 
> skimo

Sven,
  Thanks. This eliminates the problem of uninstalled headers. Unfortunately, cloog-parma still
confuses configure in gcc trunk though and fails as...

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
configure:5919: $? = 0
configure:5927: result: PPL
configure:5974: checking for version 0.14.0 of CLooG
configure:5994: gcc -c -g -O2 -I/sw/include -DCLOOG_INT_GMP -DCLOOG_ORG -I/sw/include  -I/sw/include -I/sw/include   conftest.c >&5
conftest.c: In function 'main':
conftest.c:15: error: 'choke' undeclared (first use in this function)
conftest.c:15: error: (Each undeclared identifier is reported only once
conftest.c:15: error: for each function it appears in.)
conftest.c:15: error: expected ';' before 'me'
configure:5994: $? = 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"
| int
| main ()
| {
| #if CLOOG_VERSION_MAJOR != 0     || CLOOG_VERSION_MINOR != 14     || CLOOG_VERSION_REVISION < 0
|     choke me
|    #endif
|   ;
|   return 0;
| }
configure:6001: result: no
configure:6086: error: Unable to find a usable CLooG. See config.log for details.

         Jack
ps It appears that the version checks for cloog in the graphite branch are signficantly
different from those in gcc trunk so that today's cloog.org version bump for the graphite
branch can't be applied to trunk to solve this issue.
Tobias Grosser - Dec. 29, 2010, 5:30 p.m.
On 12/29/2010 12:12 PM, Jack Howarth wrote:
> On Wed, Dec 29, 2010 at 05:36:23PM +0100, Sven Verdoolaege wrote:
>> On Wed, Dec 29, 2010 at 11:23:39AM -0500, Jack Howarth wrote:
>>> 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
>>
>> Try this:
>> [..]
> Sven,
>    Thanks. This eliminates the problem of uninstalled headers. Unfortunately, cloog-parma still
> confuses configure in gcc trunk though and fails as...
>
>  [..]
>           Jack
> ps It appears that the version checks for cloog in the graphite branch are signficantly
> different from those in gcc trunk so that today's cloog.org version bump for the graphite
> branch can't be applied to trunk to solve this issue.

Hi Jack,

where do you see this huge difference? For me the config/cloog.m4 files 
are identical and the section in configure.ac looks in both files like this:

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
   dnl The first git revision that will work with
   dnl GCC is: bd91b845a65805c290d43fc1bef8139864a163fb
   dnl This is enforced implictly, as this is the commit that
   dnl introduced the versioning information used within our
   dnl checks.
   dnl
   dnl If we're using CLooG-Legacy, the provided version information
   dnl will be ignored.
   CLOOG_CHECK_VERSION(0,14,0)

Cheers
Tobias

Patch

diff --git a/Makefile.am b/Makefile.am
index 6a9d542..58be176 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,17 +67,18 @@  nodist_clooginclude_HEADERS = \
 	$(cloog_srcdir)/include/cloog/clast.h \
 	$(cloog_srcdir)/include/cloog/cloog.h \
 	$(cloog_srcdir)/include/cloog/input.h \
-	$(cloog_builddir)/include/cloog/int.h \
+	$(cloog_srcdir)/include/cloog/int.h \
 	$(cloog_srcdir)/include/cloog/matrix.h \
 	$(cloog_srcdir)/include/cloog/state.h \
 	$(cloog_srcdir)/include/cloog/domain.h \
 	$(cloog_srcdir)/include/cloog/loop.h \
 	$(cloog_srcdir)/include/cloog/constraints.h \
 	$(cloog_srcdir)/include/cloog/names.h \
-	$(cloog_builddir)/include/cloog/options.h \
+	$(cloog_srcdir)/include/cloog/options.h \
 	$(cloog_srcdir)/include/cloog/pprint.h \
 	$(cloog_srcdir)/include/cloog/program.h \
 	$(cloog_srcdir)/include/cloog/statement.h \
+	$(cloog_srcdir)/include/cloog/stride.h \
 	$(cloog_srcdir)/include/cloog/union_domain.h \
 	$(cloog_builddir)/include/cloog/version.h