On Wed, Dec 3, 2014 at 4:24 PM, Tobias Burnus
<tobias.bur...@physik.fu-berlin.de> wrote:
> Dear all,
>
> the attached patches permit an in-tree build of GCC 4.9 using
> CLooG with ISL-0.14 backend and ISL-0.14 - as wished by Richard.
>
> The CLooG patches have been extracted from the CLooG git repository
> and have been included as courtesy for Linux distribution people.
>
>
> I do not intent to backport this patch to 4.8, but my hope would be
> that they apply without any or with only minor modifications.
>
>
> I have bootstrapped GCC with an in-tree-build of ISL and CLooG.
> I haven't done any intensive tests, but given that the CLooG patches
> come from CLooG's git repository, the #include changes are obvious, and
> the single code change comes from the trunk, it really should work.
>
> OK for the 4.9 branch?
Just trying to verify stuff - I see cloog testsuite failures with ISL 0.14
and your patch:
[ 242s] Check file ./reservoir/QR.cloog \c
[ 242s] (no option), \c
[ 242s] generating... \c
[ 243s] --- cloog_temp 2014-12-04 10:08:32.189015995 +0000
[ 243s] +++ ./reservoir/QR.c 2013-10-11 07:27:03.000000000 +0000
[ 243s] @@ -1,12 +1,6 @@
[ 243s] -/* Generated from ./reservoir/QR.cloog by CLooG
0.18.1-UNKNOWN gmp bits in 0.25s. */
[ 243s] +/* Generated from
../../../git/cloog/test/./reservoir/QR.cloog by CLooG
0.14.0-136-gb91ef26 gmp bits in 0.21s. */
[ 243s] if (N >= 1) {
[ 243s] S1(0);
[ 243s] - if ((M <= 0) && (N >= 2)) {
[ 243s] - S3(0);
[ 243s] - S10(0);
[ 243s] - S1(1);
[ 243s] - S5(0);
[ 243s] - }
[ 243s] if ((M >= 1) && (N == 1)) {
[ 243s] for (c4=0;c4<=M-1;c4++) {
[ 243s] S2(0,c4);
[ 243s] @@ -35,6 +29,12 @@
[ 243s] S1(1);
[ 243s] S5(0);
[ 243s] }
[ 243s] + if ((M <= 0) && (N >= 2)) {
[ 243s] + S3(0) ;
[ 243s] + S10(0) ;
[ 243s] + S1(1) ;
[ 243s] + S5(0) ;
[ 243s] + }
[ 243s] for (c2=2;c2<=min(M,N-1);c2++) {
[ 243s] for (c4=c2-1;c4<=N-1;c4++) {
[ 243s] S6(c2-2,c4);
[ 243s] [31mFAIL: ./reservoir/QR.c is not the same[0m
and
[ 245s] Check file ./isl/jacobi-shared.cloog \c
[ 245s] (options -f 4 -l -1 -override -strides 1 -sh 1 ), \c
[ 245s] generating... \c
[ 246s] --- cloog_temp 2014-12-04 10:08:36.081015995 +0000
[ 246s] +++ ./isl/jacobi-shared.c 2013-10-11 07:27:03.000000000 +0000
[ 246s] @@ -3,7 +3,7 @@
[ 246s] if ((16*floord(t0-1,16) >= -N+g1+t0+1) &&
(16*floord(g1+t0-3,16) >= -N+g1+t0+1) && (32*floord(t1-1,32) >=
-N+g2+t1+1) && (32*floord(g2+t1-3,32) >= t1-32)) {
[ 246s] for
(c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16)
{
[ 246s] for (c1=-32*floord(t1-1,32)+t1;c1<=min(32,N-g2-1);c1+=32) {
[ 246s] - if (c1 >= 1) {
[ 246s] + if ((c1 >= 1) && (c1 <= 32)) {
[ 246s] S1(c0+g1-1,c1+g2-1);
[ 246s] }
[ 246s] }
[ 246s] [31mFAIL: ./isl/jacobi-shared.c is not the same[0m
they do not appear when using ISL 0.12.2. I suppose the fails
might be harmless? Are there other patches to cloog that fix those
that you have not sent?
I've sofar tested the patched gcc 4.9 still works with old cloog/isl.
Richard.
> NOTE: I have only tested with ISL 0.14; I have no idea whether it works
> with ISL 0.13. However, given that one reason for the patch is to make
> it possible to use a system ISL for both GCC 5 and GCC (4.8/)4.9,
> supporting only 0.12.2 and 0.14 should be sufficient: ISL 0.14 is
> required to avoid a testsuite ICE with GCC 5 and if one really wants
> to use an older version, 0.12.2 should be fine.
>
> Tobias
