[arch-commits] Commit in cloog/repos (6 files)
Allan McRae
allan at nymeria.archlinux.org
Mon Jun 17 01:18:37 UTC 2013
Date: Monday, June 17, 2013 @ 03:18:36
Author: allan
Revision: 188617
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
cloog/repos/testing-i686/
cloog/repos/testing-i686/PKGBUILD
(from rev 188616, cloog/trunk/PKGBUILD)
cloog/repos/testing-i686/cloog-0.18.0-isl-0.11.2.patch
(from rev 188616, cloog/trunk/cloog-0.18.0-isl-0.11.2.patch)
cloog/repos/testing-x86_64/
cloog/repos/testing-x86_64/PKGBUILD
(from rev 188616, cloog/trunk/PKGBUILD)
cloog/repos/testing-x86_64/cloog-0.18.0-isl-0.11.2.patch
(from rev 188616, cloog/trunk/cloog-0.18.0-isl-0.11.2.patch)
----------------------------------------------+
testing-i686/PKGBUILD | 39 ++++++++++
testing-i686/cloog-0.18.0-isl-0.11.2.patch | 95 +++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 39 ++++++++++
testing-x86_64/cloog-0.18.0-isl-0.11.2.patch | 95 +++++++++++++++++++++++++
4 files changed, 268 insertions(+)
Copied: cloog/repos/testing-i686/PKGBUILD (from rev 188616, cloog/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-17 01:18:36 UTC (rev 188617)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+
+pkgname=cloog
+pkgver=0.18.0
+pkgrel=2
+pkgdesc="Library that generates loops for scanning polyhedra"
+arch=('i686' 'x86_64')
+url="http://www.bastoul.net/cloog/"
+license=('GPL')
+depends=('isl' 'gmp')
+options=('!libtool')
+source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz
+ cloog-0.18.0-isl-0.11.2.patch)
+md5sums=('be78a47bd82523250eb3e91646db5b3d'
+ '1bec9a7f1c3e9e0f3f10f23898f7148d')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # test-suite fix - commit fc8b0627
+ patch -p1 -i $srcdir/cloog-0.18.0-isl-0.11.2.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --with-isl=system
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir/ install
+}
Copied: cloog/repos/testing-i686/cloog-0.18.0-isl-0.11.2.patch (from rev 188616, cloog/trunk/cloog-0.18.0-isl-0.11.2.patch)
===================================================================
--- testing-i686/cloog-0.18.0-isl-0.11.2.patch (rev 0)
+++ testing-i686/cloog-0.18.0-isl-0.11.2.patch 2013-06-17 01:18:36 UTC (rev 188617)
@@ -0,0 +1,95 @@
+diff --git a/test/darte.c b/test/darte.c
+index e185b7a..2a4a1b8 100644
+--- a/test/darte.c
++++ b/test/darte.c
+@@ -6,14 +6,14 @@ if (n >= 1) {
+ }
+ }
+ for (t1=-n+2;t1<=n-1;t1++) {
+- if (t1 >= 2) {
++ if (t1 >= 0) {
+ for (t3=t1+4;t3<=t1+2*n+2;t3++) {
+ if ((t1+t3)%2 == 0) {
+ S1(t1+1,1,(-t1+t3-2)/2);
+ }
+ }
+ }
+- for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) {
++ for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) {
+ for (t3=t2+2;t3<=t2+2*n;t3++) {
+ if ((t1+t2)%2 == 0) {
+ if ((t1+t3)%2 == 0) {
+diff --git a/test/dartef.f b/test/dartef.f
+index 50e1073..3b5e3e2 100644
+--- a/test/dartef.f
++++ b/test/dartef.f
+@@ -6,14 +6,14 @@ IF (n >= 1) THEN
+ END IF
+ END DO
+ DO t1=-n+2, n-1
+- IF (t1 >= 2) THEN
++ IF (t1 >= 0) THEN
+ DO t3=t1+4, t1+2*n+2
+ IF (MOD(t1+t3, 2) == 0) THEN
+ S1(t1+1,1,(-t1+t3-2)/2)
+ END IF
+ END DO
+ END IF
+- DO t2=MAX(-t1+2,t1+2), -t1+4
++ DO t2=MAX(-t1+2,t1+3), -t1+4
+ DO t3=t2+2, t2+2*n
+ IF (MOD(t1+t2, 2) == 0) THEN
+ IF (MOD(t1+t3, 2) == 0) THEN
+diff --git a/test/dealII.c b/test/dealII.c
+index 200b257..5d28c4a 100644
+--- a/test/dealII.c
++++ b/test/dealII.c
+@@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) {
+ S1(scat_0);
+ S2(scat_0);
+ }
+-if ((T_2 == 0) && (T_67 == 0)) {
++if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) {
+ S1(0);
+ }
+-for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) {
++if ((T_66 <= -1) && (T_67 == 0)) {
++ S1(0);
++}
++for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) {
+ S1(scat_0);
+ }
+ for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) {
+diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c
+index e8e5ec7..9e345c6 100644
+--- a/test/isl/jacobi-shared.c
++++ b/test/isl/jacobi-shared.c
+@@ -1,6 +1,6 @@
+ /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */
+ if ((h0+1)%2 == 0) {
+- 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)) {
++ 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)) {
+ for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) {
+ c1 = 32*floord(-t1,32)+t1+32;
+ if (c1 <= 32) {
+diff --git a/test/vasilache.c b/test/vasilache.c
+index 5a00a33..fdff031 100644
+--- a/test/vasilache.c
++++ b/test/vasilache.c
+@@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) {
+ S6(p1,p3,p5,p7-1);
+ S7(p1,p3,p5,p7);
+ }
+- if (p5 <= floord(N-33,32)) {
+- S6(p1,p3,p5,32*p5+31);
+- }
+- if (p5 >= ceild(N-32,32)) {
++ if (p5 >= ceild(N-31,32)) {
+ S6(p1,p3,p5,N-1);
+ }
++ if (p5 <= floord(N-32,32)) {
++ S6(p1,p3,p5,32*p5+31);
++ }
+ }
+ }
+ }
Copied: cloog/repos/testing-x86_64/PKGBUILD (from rev 188616, cloog/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-17 01:18:36 UTC (rev 188617)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+
+pkgname=cloog
+pkgver=0.18.0
+pkgrel=2
+pkgdesc="Library that generates loops for scanning polyhedra"
+arch=('i686' 'x86_64')
+url="http://www.bastoul.net/cloog/"
+license=('GPL')
+depends=('isl' 'gmp')
+options=('!libtool')
+source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz
+ cloog-0.18.0-isl-0.11.2.patch)
+md5sums=('be78a47bd82523250eb3e91646db5b3d'
+ '1bec9a7f1c3e9e0f3f10f23898f7148d')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # test-suite fix - commit fc8b0627
+ patch -p1 -i $srcdir/cloog-0.18.0-isl-0.11.2.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --with-isl=system
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir/ install
+}
Copied: cloog/repos/testing-x86_64/cloog-0.18.0-isl-0.11.2.patch (from rev 188616, cloog/trunk/cloog-0.18.0-isl-0.11.2.patch)
===================================================================
--- testing-x86_64/cloog-0.18.0-isl-0.11.2.patch (rev 0)
+++ testing-x86_64/cloog-0.18.0-isl-0.11.2.patch 2013-06-17 01:18:36 UTC (rev 188617)
@@ -0,0 +1,95 @@
+diff --git a/test/darte.c b/test/darte.c
+index e185b7a..2a4a1b8 100644
+--- a/test/darte.c
++++ b/test/darte.c
+@@ -6,14 +6,14 @@ if (n >= 1) {
+ }
+ }
+ for (t1=-n+2;t1<=n-1;t1++) {
+- if (t1 >= 2) {
++ if (t1 >= 0) {
+ for (t3=t1+4;t3<=t1+2*n+2;t3++) {
+ if ((t1+t3)%2 == 0) {
+ S1(t1+1,1,(-t1+t3-2)/2);
+ }
+ }
+ }
+- for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) {
++ for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) {
+ for (t3=t2+2;t3<=t2+2*n;t3++) {
+ if ((t1+t2)%2 == 0) {
+ if ((t1+t3)%2 == 0) {
+diff --git a/test/dartef.f b/test/dartef.f
+index 50e1073..3b5e3e2 100644
+--- a/test/dartef.f
++++ b/test/dartef.f
+@@ -6,14 +6,14 @@ IF (n >= 1) THEN
+ END IF
+ END DO
+ DO t1=-n+2, n-1
+- IF (t1 >= 2) THEN
++ IF (t1 >= 0) THEN
+ DO t3=t1+4, t1+2*n+2
+ IF (MOD(t1+t3, 2) == 0) THEN
+ S1(t1+1,1,(-t1+t3-2)/2)
+ END IF
+ END DO
+ END IF
+- DO t2=MAX(-t1+2,t1+2), -t1+4
++ DO t2=MAX(-t1+2,t1+3), -t1+4
+ DO t3=t2+2, t2+2*n
+ IF (MOD(t1+t2, 2) == 0) THEN
+ IF (MOD(t1+t3, 2) == 0) THEN
+diff --git a/test/dealII.c b/test/dealII.c
+index 200b257..5d28c4a 100644
+--- a/test/dealII.c
++++ b/test/dealII.c
+@@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) {
+ S1(scat_0);
+ S2(scat_0);
+ }
+-if ((T_2 == 0) && (T_67 == 0)) {
++if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) {
+ S1(0);
+ }
+-for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) {
++if ((T_66 <= -1) && (T_67 == 0)) {
++ S1(0);
++}
++for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) {
+ S1(scat_0);
+ }
+ for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) {
+diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c
+index e8e5ec7..9e345c6 100644
+--- a/test/isl/jacobi-shared.c
++++ b/test/isl/jacobi-shared.c
+@@ -1,6 +1,6 @@
+ /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */
+ if ((h0+1)%2 == 0) {
+- 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)) {
++ 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)) {
+ for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) {
+ c1 = 32*floord(-t1,32)+t1+32;
+ if (c1 <= 32) {
+diff --git a/test/vasilache.c b/test/vasilache.c
+index 5a00a33..fdff031 100644
+--- a/test/vasilache.c
++++ b/test/vasilache.c
+@@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) {
+ S6(p1,p3,p5,p7-1);
+ S7(p1,p3,p5,p7);
+ }
+- if (p5 <= floord(N-33,32)) {
+- S6(p1,p3,p5,32*p5+31);
+- }
+- if (p5 >= ceild(N-32,32)) {
++ if (p5 >= ceild(N-31,32)) {
+ S6(p1,p3,p5,N-1);
+ }
++ if (p5 <= floord(N-32,32)) {
++ S6(p1,p3,p5,32*p5+31);
++ }
+ }
+ }
+ }
More information about the arch-commits
mailing list