pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/cloog Updated cloog to 0.18.4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/608847fd5561
branches: trunk
changeset: 353646:608847fd5561
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Oct 09 19:46:52 2016 +0000
description:
Updated cloog to 0.18.4.
Changes for 0.18.4 not found.
version: 0.18.3
date: Mon Dec 8 11:06:42 PDT 2014
changes:
- Update to isl 0.14
- Support for OpenScop loop extension
diffstat:
math/cloog/Makefile | 7 +-
math/cloog/PLIST | 3 +-
math/cloog/distinfo | 13 +-
math/cloog/patches/patch-include_cloog_isl_constraintset.h | 28 -
math/cloog/patches/patch-source_isl_constraints.c | 443 ---------
math/cloog/patches/patch-source_isl_domain.c | 634 -------------
6 files changed, 11 insertions(+), 1117 deletions(-)
diffs (truncated from 1176 to 300 lines):
diff -r d8a68d410057 -r 608847fd5561 math/cloog/Makefile
--- a/math/cloog/Makefile Sun Oct 09 18:49:23 2016 +0000
+++ b/math/cloog/Makefile Sun Oct 09 19:46:52 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/04/25 21:01:27 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/10/09 19:46:52 wiz Exp $
-DISTNAME= cloog-0.18.1
+DISTNAME= cloog-0.18.4
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_GNU:=gcc/infrastructure/}
+MASTER_SITES= http://www.bastoul.net/cloog/pages/download/
MAINTAINER= kuehro%gmx.de@localhost
HOMEPAGE= http://www.cloog.org/
@@ -18,6 +18,7 @@
CONFIGURE_ARGS+= --with-isl=system
CONFIGURE_ARGS+= --with-bits=gmp
+BUILDLINK_API_DEPENDS.gmp+= gmp>=6.0
.include "../../devel/gmp/buildlink3.mk"
.include "../../math/isl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d8a68d410057 -r 608847fd5561 math/cloog/PLIST
--- a/math/cloog/PLIST Sun Oct 09 18:49:23 2016 +0000
+++ b/math/cloog/PLIST Sun Oct 09 19:46:52 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/04/25 21:01:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/10/09 19:46:52 wiz Exp $
bin/cloog
include/cloog/block.h
include/cloog/clast.h
@@ -22,6 +22,7 @@
include/cloog/statement.h
include/cloog/stride.h
include/cloog/union_domain.h
+include/cloog/util.h
include/cloog/version.h
lib/cloog-isl/cloog-isl-config.cmake
lib/isl/isl-config.cmake
diff -r d8a68d410057 -r 608847fd5561 math/cloog/distinfo
--- a/math/cloog/distinfo Sun Oct 09 18:49:23 2016 +0000
+++ b/math/cloog/distinfo Sun Oct 09 19:46:52 2016 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:33:31 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/10/09 19:46:52 wiz Exp $
-SHA1 (cloog-0.18.1.tar.gz) = 2dc70313e8e2c6610b856d627bce9c9c3f848077
-RMD160 (cloog-0.18.1.tar.gz) = 5c4a182efc0d42e7d5c30e6fcca5832776a2e69a
-SHA512 (cloog-0.18.1.tar.gz) = 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
-Size (cloog-0.18.1.tar.gz) = 3857324 bytes
-SHA1 (patch-include_cloog_isl_constraintset.h) = ec640f64d8b40038abeff65122363bcd5aeb2e58
-SHA1 (patch-source_isl_constraints.c) = 377d1662787e389e00816fe42e529a26d28a7928
-SHA1 (patch-source_isl_domain.c) = 8afc17ec42ca25b702cfff644f5a5d3ae36d0419
+SHA1 (cloog-0.18.4.tar.gz) = 8f7568ca1873f8d55bb694c8b9b83f7f4c6c1aa5
+RMD160 (cloog-0.18.4.tar.gz) = 12d7a27442fc95f01f7c6445b5559579f8f614cc
+SHA512 (cloog-0.18.4.tar.gz) = d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
+Size (cloog-0.18.4.tar.gz) = 4796456 bytes
SHA1 (patch-test_checker.sh) = a62a4fba0f433e6c6685f2d7a92f0cb039a1d1f0
diff -r d8a68d410057 -r 608847fd5561 math/cloog/patches/patch-include_cloog_isl_constraintset.h
--- a/math/cloog/patches/patch-include_cloog_isl_constraintset.h Sun Oct 09 18:49:23 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-include_cloog_isl_constraintset.h,v 1.1 2014/04/25 21:01:27 wiz Exp $
-
-From: Taj Muhammad Khan <taj.khan%lri.fr@localhost>
-Date: Thu, 5 Dec 2013 02:25:16 +0000 (+0530)
-Subject: Use isl_val instead of isl_int
-X-Git-Url: http://repo.or.cz/w/cloog.git/commitdiff_plain/2d8b7c6b43ee46fee978a57fa6877de49675f357?hp=d02b7193c157b61ddeabae55718793c078d73961
-
-Use isl_val instead of isl_int
-
-isl is moving from the macro-based isl_int to a more generic
-integer type isl_val, so CLooG does with this patch.
-Authors are Uday Bondhugula, Taj Muhammad Khan and Cedric Bastoul.
-
---- include/cloog/isl/constraintset.h.orig 2013-10-11 07:27:03.000000000 +0000
-+++ include/cloog/isl/constraintset.h
-@@ -27,6 +27,12 @@ CloogConstraintSet *cloog_constraint_set
- CloogConstraint *cloog_constraint_from_isl_constraint(struct isl_constraint *constraint);
- isl_constraint *cloog_constraint_to_isl(CloogConstraint *constraint);
-
-+__isl_give isl_val *cloog_int_to_isl_val(isl_ctx* ctx, cloog_int_t c);
-+void isl_val_to_cloog_int(__isl_keep isl_val *val, cloog_int_t *cint);
-+
-+__isl_give isl_val *cloog_constraint_coefficient_get_val(CloogConstraint *constraint,
-+ int var);
-+
- #if defined(__cplusplus)
- }
- #endif
diff -r d8a68d410057 -r 608847fd5561 math/cloog/patches/patch-source_isl_constraints.c
--- a/math/cloog/patches/patch-source_isl_constraints.c Sun Oct 09 18:49:23 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,443 +0,0 @@
-$NetBSD: patch-source_isl_constraints.c,v 1.1 2014/04/25 21:01:27 wiz Exp $
-
-From: Taj Muhammad Khan <taj.khan%lri.fr@localhost>
-Date: Thu, 5 Dec 2013 02:25:16 +0000 (+0530)
-Subject: Use isl_val instead of isl_int
-X-Git-Url: http://repo.or.cz/w/cloog.git/commitdiff_plain/2d8b7c6b43ee46fee978a57fa6877de49675f357?hp=d02b7193c157b61ddeabae55718793c078d73961
-
-Use isl_val instead of isl_int
-
-isl is moving from the macro-based isl_int to a more generic
-integer type isl_val, so CLooG does with this patch.
-Authors are Uday Bondhugula, Taj Muhammad Khan and Cedric Bastoul.
-
---- source/isl/constraints.c.orig 2013-10-11 07:27:03.000000000 +0000
-+++ source/isl/constraints.c
-@@ -5,11 +5,51 @@
- #include <cloog/isl/backend.h>
- #include <isl/aff.h>
- #include <isl/set.h>
-+#include <isl/val.h>
-+#include <isl/val_gmp.h>
-
-
- #define ALLOC(type) (type*)malloc(sizeof(type))
- #define ALLOCN(type,n) (type*)malloc((n)*sizeof(type))
-
-+__isl_give isl_val *cloog_int_to_isl_val(isl_ctx* ctx, cloog_int_t c)
-+{
-+ isl_val *v;
-+#if defined(CLOOG_INT_INT)
-+ v = isl_val_int_from_si(ctx, c);
-+#elif defined(CLOOG_INT_LONG)
-+ v = isl_val_int_from_si(ctx, c);
-+#elif defined(CLOOG_INT_LONG_LONG)
-+ v = isl_val_int_from_si(ctx, c);
-+#elif defined(CLOOG_INT_GMP)
-+ v = isl_val_int_from_gmp(ctx, c);
-+#else
-+#error "No integer type defined"
-+#endif
-+ return v;
-+}
-+
-+/*
-+ * CLooG'll be dealing in integers so we expect numerator/1 form
-+ * from isl_val. Thus get numerator to assign to cloog_int
-+ */
-+void isl_val_to_cloog_int(__isl_keep isl_val *val, cloog_int_t *cint)
-+{
-+ assert(isl_val_is_int(val));
-+#if defined(CLOOG_INT_INT)
-+ *cint = isl_val_get_num_si(val);
-+#elif defined(CLOOG_INT_LONG)
-+ *cint = isl_val_get_num_si(val);
-+#elif defined(CLOOG_INT_LONG_LONG)
-+ *cint = isl_val_get_num_si(val);
-+#elif defined(CLOOG_INT_GMP)
-+ isl_val_get_num_gmp(val, *cint);
-+#else
-+#error "No integer type defined"
-+#endif
-+}
-+
-+
- CloogConstraintSet *cloog_constraint_set_from_isl_basic_set(struct isl_basic_set *bset)
- {
- return (CloogConstraintSet *)bset;
-@@ -266,53 +306,65 @@ int cloog_equal_count(CloogEqualities *e
- static int cloog_constraint_equal_type(CloogConstraint *cc, int level)
- {
- int i;
-- isl_int c;
-+ isl_val *c;
- int type = EQTYPE_NONE;
- struct isl_constraint *constraint = cloog_constraint_to_isl(cc);
-
-- isl_int_init(c);
-- isl_constraint_get_constant(constraint, &c);
-- if (!isl_int_is_zero(c))
-+ c = isl_constraint_get_constant_val(constraint);
-+ if (!isl_val_is_zero(c))
- type = EQTYPE_CONSTANT;
-- isl_constraint_get_coefficient(constraint, isl_dim_set, level - 1, &c);
-- if (!isl_int_is_one(c) && !isl_int_is_negone(c))
-+ isl_val_free(c);
-+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_set, level - 1);
-+ if (!isl_val_is_one(c) && !isl_val_is_negone(c))
- type = EQTYPE_EXAFFINE;
-+ isl_val_free(c);
- for (i = 0; i < isl_constraint_dim(constraint, isl_dim_param); ++i) {
-- isl_constraint_get_coefficient(constraint, isl_dim_param, i, &c);
-- if (isl_int_is_zero(c))
-+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_param, i);
-+ if (isl_val_is_zero(c)){
-+ isl_val_free(c);
- continue;
-- if ((!isl_int_is_one(c) && !isl_int_is_negone(c)) ||
-+ }
-+ if ((!isl_val_is_one(c) && !isl_val_is_negone(c)) ||
- type != EQTYPE_NONE) {
- type = EQTYPE_EXAFFINE;
-+ isl_val_free(c);
- break;
- }
- type = EQTYPE_PUREITEM;
-+ isl_val_free(c);
- }
- for (i = 0; i < isl_constraint_dim(constraint, isl_dim_set); ++i) {
- if (i == level - 1)
- continue;
-- isl_constraint_get_coefficient(constraint, isl_dim_set, i, &c);
-- if (isl_int_is_zero(c))
-+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_set, i);
-+ if (isl_val_is_zero(c)){
-+ isl_val_free(c);
- continue;
-- if ((!isl_int_is_one(c) && !isl_int_is_negone(c)) ||
-+ }
-+ if ((!isl_val_is_one(c) && !isl_val_is_negone(c)) ||
- type != EQTYPE_NONE) {
- type = EQTYPE_EXAFFINE;
-+ isl_val_free(c);
- break;
- }
- type = EQTYPE_PUREITEM;
-+ isl_val_free(c);
- }
- for (i = 0; i < isl_constraint_dim(constraint, isl_dim_div); ++i) {
-- isl_constraint_get_coefficient(constraint, isl_dim_div, i, &c);
-- if (isl_int_is_zero(c))
-+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_div, i);
-+ if (isl_val_is_zero(c)){
-+ isl_val_free(c);
- continue;
-- if ((!isl_int_is_one(c) && !isl_int_is_negone(c)) ||
-+ }
-+ if ((!isl_val_is_one(c) && !isl_val_is_negone(c)) ||
- type != EQTYPE_NONE) {
- type = EQTYPE_EXAFFINE;
-+ isl_val_free(c);
- break;
- }
- type = EQTYPE_PUREITEM;
-+ isl_val_free(c);
- }
-- isl_int_clear(c);
-
- if (type == EQTYPE_NONE)
- type = EQTYPE_CONSTANT;
-@@ -447,27 +499,31 @@ static struct clast_expr *div_expr(Cloog
- {
- int i, nb_elts;
- unsigned dim = cloog_constraint_total_dimension(constraint);
-- cloog_int_t c;
-+ isl_val *c;
- struct clast_reduction *r;
- struct clast_expr *e = NULL;
- isl_aff *div;
-+ cloog_int_t cint;
-
-+ cloog_int_init(cint);
- div = isl_constraint_get_div(cloog_constraint_to_isl(constraint), pos);
-
-- cloog_int_init(c);
- for (i = 0, nb_elts = 0; i < dim; ++i) {
- struct cloog_isl_dim dim;
-
- dim = constraint_cloog_dim_to_isl_dim(constraint, i);
- if (dim.type == isl_dim_set)
- dim.type = isl_dim_in;
-- isl_aff_get_coefficient(div, dim.type, dim.pos, &c);
-- if (!cloog_int_is_zero(c))
-+ c = isl_aff_get_coefficient_val(div, dim.type, dim.pos);
-+ if (!isl_val_is_zero(c))
- ++nb_elts;
-+
-+ isl_val_free(c);
- }
-- isl_aff_get_constant(div, &c);
-- if (!cloog_int_is_zero(c))
-+ c = isl_aff_get_constant_val(div);
-+ if (!isl_val_is_zero(c))
- ++nb_elts;
-+ isl_val_free(c);
-
- r = new_clast_reduction(clast_red_sum, nb_elts);
- for (i = 0, nb_elts = 0; i < dim; ++i) {
-@@ -477,22 +533,35 @@ static struct clast_expr *div_expr(Cloog
- dim = constraint_cloog_dim_to_isl_dim(constraint, i);
- if (dim.type == isl_dim_set)
- dim.type = isl_dim_in;
-- isl_aff_get_coefficient(div, dim.type, dim.pos, &c);
-- if (cloog_int_is_zero(c))
-+ c = isl_aff_get_coefficient_val(div, dim.type, dim.pos);
-+ if (isl_val_is_zero(c)){
-+ isl_val_free(c);
- continue;
-+ }
-
- v = cloog_constraint_variable_expr(constraint, 1 + i, names);
-
-- r->elts[nb_elts++] = &new_clast_term(c, v)->expr;
-+ /* We are interested only in the numerator */
-+ cloog_int_set_si(cint, isl_val_get_num_si(c));
-+ r->elts[nb_elts++] = &new_clast_term(cint, v)->expr;
Home |
Main Index |
Thread Index |
Old Index