Annotation of /trunk/cloog/patches/cloog-0.18.0-isl-0.11.2.patch
Parent Directory | Revision Log
Revision 2232 -
(hide annotations)
(download)
Sun Jul 7 13:17:47 2013 UTC (11 years, 2 months ago) by niro
File size: 2994 byte(s)
Sun Jul 7 13:17:47 2013 UTC (11 years, 2 months ago) by niro
File size: 2994 byte(s)
-fixed testsuite
1 | niro | 2232 | diff --git a/test/darte.c b/test/darte.c |
2 | index e185b7a..2a4a1b8 100644 | ||
3 | --- a/test/darte.c | ||
4 | +++ b/test/darte.c | ||
5 | @@ -6,14 +6,14 @@ if (n >= 1) { | ||
6 | } | ||
7 | } | ||
8 | for (t1=-n+2;t1<=n-1;t1++) { | ||
9 | - if (t1 >= 2) { | ||
10 | + if (t1 >= 0) { | ||
11 | for (t3=t1+4;t3<=t1+2*n+2;t3++) { | ||
12 | if ((t1+t3)%2 == 0) { | ||
13 | S1(t1+1,1,(-t1+t3-2)/2); | ||
14 | } | ||
15 | } | ||
16 | } | ||
17 | - for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) { | ||
18 | + for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) { | ||
19 | for (t3=t2+2;t3<=t2+2*n;t3++) { | ||
20 | if ((t1+t2)%2 == 0) { | ||
21 | if ((t1+t3)%2 == 0) { | ||
22 | diff --git a/test/dartef.f b/test/dartef.f | ||
23 | index 50e1073..3b5e3e2 100644 | ||
24 | --- a/test/dartef.f | ||
25 | +++ b/test/dartef.f | ||
26 | @@ -6,14 +6,14 @@ IF (n >= 1) THEN | ||
27 | END IF | ||
28 | END DO | ||
29 | DO t1=-n+2, n-1 | ||
30 | - IF (t1 >= 2) THEN | ||
31 | + IF (t1 >= 0) THEN | ||
32 | DO t3=t1+4, t1+2*n+2 | ||
33 | IF (MOD(t1+t3, 2) == 0) THEN | ||
34 | S1(t1+1,1,(-t1+t3-2)/2) | ||
35 | END IF | ||
36 | END DO | ||
37 | END IF | ||
38 | - DO t2=MAX(-t1+2,t1+2), -t1+4 | ||
39 | + DO t2=MAX(-t1+2,t1+3), -t1+4 | ||
40 | DO t3=t2+2, t2+2*n | ||
41 | IF (MOD(t1+t2, 2) == 0) THEN | ||
42 | IF (MOD(t1+t3, 2) == 0) THEN | ||
43 | diff --git a/test/dealII.c b/test/dealII.c | ||
44 | index 200b257..5d28c4a 100644 | ||
45 | --- a/test/dealII.c | ||
46 | +++ b/test/dealII.c | ||
47 | @@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) { | ||
48 | S1(scat_0); | ||
49 | S2(scat_0); | ||
50 | } | ||
51 | -if ((T_2 == 0) && (T_67 == 0)) { | ||
52 | +if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) { | ||
53 | S1(0); | ||
54 | } | ||
55 | -for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) { | ||
56 | +if ((T_66 <= -1) && (T_67 == 0)) { | ||
57 | + S1(0); | ||
58 | +} | ||
59 | +for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) { | ||
60 | S1(scat_0); | ||
61 | } | ||
62 | for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) { | ||
63 | diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c | ||
64 | index e8e5ec7..9e345c6 100644 | ||
65 | --- a/test/isl/jacobi-shared.c | ||
66 | +++ b/test/isl/jacobi-shared.c | ||
67 | @@ -1,6 +1,6 @@ | ||
68 | /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */ | ||
69 | if ((h0+1)%2 == 0) { | ||
70 | - if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { | ||
71 | + if ((16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (16*floord(N+15*g1+15*t0+15,16) >= 16*g1+15*t0+17) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { | ||
72 | for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) { | ||
73 | c1 = 32*floord(-t1,32)+t1+32; | ||
74 | if (c1 <= 32) { | ||
75 | diff --git a/test/vasilache.c b/test/vasilache.c | ||
76 | index 5a00a33..fdff031 100644 | ||
77 | --- a/test/vasilache.c | ||
78 | +++ b/test/vasilache.c | ||
79 | @@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) { | ||
80 | S6(p1,p3,p5,p7-1); | ||
81 | S7(p1,p3,p5,p7); | ||
82 | } | ||
83 | - if (p5 <= floord(N-33,32)) { | ||
84 | - S6(p1,p3,p5,32*p5+31); | ||
85 | - } | ||
86 | - if (p5 >= ceild(N-32,32)) { | ||
87 | + if (p5 >= ceild(N-31,32)) { | ||
88 | S6(p1,p3,p5,N-1); | ||
89 | } | ||
90 | + if (p5 <= floord(N-32,32)) { | ||
91 | + S6(p1,p3,p5,32*p5+31); | ||
92 | + } | ||
93 | } | ||
94 | } | ||
95 | } |