On Tue, 3 Jul 2012, Richard Guenther wrote:
> On Tue, 3 Jul 2012, Richard Guenther wrote:
>
> > On Tue, 3 Jul 2012, Richard Guenther wrote:
> >
> > > On Tue, 3 Jul 2012, Richard Guenther wrote:
> > >
> > > > On Mon, 2 Jul 2012, Nenad Vukicevic wrote:
> > > >
> > > > > On 6/27/2012 8:06 AM, Richard Guenther wrote:
> > > > > > This merges from the graphite branch the move of PPL to ISL,
> > > > > > and completes it where it was lacking - thanks to Micha.
> > > > > > It leaves unmerged the addition of a pluto-like ISL optimizer
> > > > > > as well as a bugfix for stride > 1 which did not come with
> > > > > > a testcase.
> > > > > >
> > > > > > With this patch (ontop of the one requiring ClooG 0.17.0)
> > > > > > we will require ISL 0.10 for enabling Graphite.
> > > > > >
> > > > > > I've bootstrapped and built various combinations with in-tree
> > > > > > and out-of-tree cloog and ISL, so I'm pretty confident that
> > > > > > this works.
> > > > > >
> > > > > > With out-of-tree ClooG and ISL a slightly older patch ontop of its
> > > > > > prerequesite passed bootstrap and testing on
> > > > > > x86_64-unknown-linux-gnu.
> > > > > >
> > > > > > Currently re-bootstrapping and testing on x86_64-unknown-linux-gnu.
> > > > > >
> > > > > > Ok for trunk?
> > > > >
> > > > > After trying to build from the trunk I got this error on x86_64
> > > > > platform:
> > > > >
> > > > > make[3]: Entering directory
> > > > > `/eng/upc/dev/nenad/bart/bld-trunk/cloog/test'
> > > > > CC generate_test.o
> > > > > cd ..; make libcloog-isl.la
> > > > > make[4]: Entering directory `/eng/upc/dev/nenad/bart/bld-trunk/cloog'
> > > > > CC libcloog_isl_la-domain.lo
> > > > > In file included from
> > > > > ../../gcc-trunk/cloog/include/cloog/isl/constraintset.h:4:0,
> > > > > from
> > > > > ../../gcc-trunk/cloog/include/cloog/isl/cloog.h:9,
> > > > > from ../../gcc-trunk/cloog/source/isl/domain.c:6:
> > > > > ../../gcc-trunk/cloog/include/cloog/isl/backend.h:4:28: fatal error:
> > >
> > > Looking again this is from the cloog build. If I repeat your tests
> > > (I suppose I didn't check non-bootstrap in-tree builds) it works just
> > > fine for me. The cloog/config.log should contain something like
> > >
> > > configure:11964: checking which isl to use
> > > configure:11966: result: system
> > >
> > > and all gcc invocations in the configury should have include paths
> > > set up to have the built isl/include first, then the source isl/include:
> > >
> > > configure:12073: gcc -c -g -O2 -I/abuild/rguenther/obj/./isl/include
> > > -I/space/rguenther/src/svn/trunk/isl/include conftest.c >&5
> > >
> > > Did you really unpack isl into the source tree as well?
> > >
> > > Ah, I see what might happen - if you forget to have isl inside the
> > > tree we disable graphite but cloog still gets built, but will fail.
> > > I'll see to fix that.
> >
> > Fixed with the following. I'll test it with some combinations of
> > valid/invalid cloog/isl versions before installing.
>
> Hum. Ok, I installed the following, but in-tree builds seem to no
> longer work for some reason. CPPFLAGS get dropped in some way,
> even as they are present properly ...
The following fixes that. Tested with various combinations of
in-tree/out-of-tree cloog/isl.
Installed.
Richard.
2012-06-03 Richard Guenther <rguent...@suse.de>
* Makfile.def (isl): Remove not necessary extra_exports and
extra_make_flags.
(cloog): Use $$CPPFLAGS instead of ${CPPFLAGS}.
* Makefile.in: Regenerated.
Index: Makefile.def
===================================================================
--- Makefile.def (revision 189209)
+++ Makefile.def (working copy)
@@ -63,13 +63,11 @@ host_modules= { module= mpc; lib_path=.l
no_install= true; };
host_modules= { module= isl; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared
--with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs
--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp';
- extra_exports='CPPFLAGS="${CPPFLAGS}"; export CPPFLAGS;
LDFLAGS="$$LDFLAGS"; export LDFLAGS; ';
- extra_make_flags='CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"';
no_install= true; };
host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared
--with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs
--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system';
- extra_exports='CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include
-I$$s/isl/include ${CPPFLAGS}"; export CPPFLAGS;
LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
- extra_make_flags='CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"
V=1';
+ extra_exports='CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include
-I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS;
LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
+ extra_make_flags='CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS"
V=1';
no_install= true; };
host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared';
