X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_fold.c;h=4b7cd7674c76f3eedce52c201f2934200efab78c;hb=ca90b151a05f17ccc1c3215ff24dc5d7b9198ff4;hp=70ccbc3d9dedcd27020c621c67769e4b2a79603c;hpb=d07eed3bf4d0e290118588ca80997a8035eaeb21;p=platform%2Fupstream%2Fisl.git diff --git a/isl_fold.c b/isl_fold.c index 70ccbc3..4b7cd76 100644 --- a/isl_fold.c +++ b/isl_fold.c @@ -1,7 +1,7 @@ /* * Copyright 2010 INRIA Saclay * - * Use of this software is governed by the GNU LGPLv2.1 license + * Use of this software is governed by the MIT license * * Written by Sven Verdoolaege, INRIA Saclay - Ile-de-France, * Parc Club Orsay Universite, ZAC des vignes, 4 rue Jacques Monod, @@ -65,13 +65,25 @@ isl_ctx *isl_qpolynomial_fold_get_ctx(__isl_keep isl_qpolynomial_fold *fold) return fold ? fold->dim->ctx : NULL; } -__isl_give isl_space *isl_qpolynomial_fold_get_space( +__isl_give isl_space *isl_qpolynomial_fold_get_domain_space( __isl_keep isl_qpolynomial_fold *fold) { return fold ? isl_space_copy(fold->dim) : NULL; } -__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_reset_space( +__isl_give isl_space *isl_qpolynomial_fold_get_space( + __isl_keep isl_qpolynomial_fold *fold) +{ + isl_space *space; + if (!fold) + return NULL; + space = isl_space_copy(fold->dim); + space = isl_space_from_domain(space); + space = isl_space_add_dims(space, isl_dim_out, 1); + return space; +} + +__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_reset_domain_space( __isl_take isl_qpolynomial_fold *fold, __isl_take isl_space *dim) { int i; @@ -81,7 +93,7 @@ __isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_reset_space( goto error; for (i = 0; i < fold->n; ++i) { - fold->qp[i] = isl_qpolynomial_reset_space(fold->qp[i], + fold->qp[i] = isl_qpolynomial_reset_domain_space(fold->qp[i], isl_space_copy(dim)); if (!fold->qp[i]) goto error; @@ -97,6 +109,18 @@ error: return NULL; } +/* Reset the space of "fold". This function is called from isl_pw_templ.c + * and doesn't know if the space of an element object is represented + * directly or through its domain. It therefore passes along both. + */ +__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_reset_space_and_domain( + __isl_take isl_qpolynomial_fold *fold, __isl_take isl_space *space, + __isl_take isl_space *domain) +{ + isl_space_free(space); + return isl_qpolynomial_fold_reset_domain_space(fold, domain); +} + int isl_qpolynomial_fold_involves_dims(__isl_keep isl_qpolynomial_fold *fold, enum isl_dim_type type, unsigned first, unsigned n) { @@ -147,16 +171,19 @@ __isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_drop_dims( enum isl_dim_type type, unsigned first, unsigned n) { int i; + enum isl_dim_type set_type; if (!fold) return NULL; if (n == 0) return fold; + set_type = type == isl_dim_in ? isl_dim_set : type; + fold = isl_qpolynomial_fold_cow(fold); if (!fold) return NULL; - fold->dim = isl_space_drop_dims(fold->dim, type, first, n); + fold->dim = isl_space_drop_dims(fold->dim, set_type, first, n); if (!fold->dim) goto error; @@ -319,8 +346,8 @@ static int isl_qpolynomial_sign(__isl_keep isl_set *set, isl_qpolynomial *r, *q; isl_qpolynomial *t; - min = isl_qpolynomial_cst(isl_space_copy(qp->dim), l); - base = isl_qpolynomial_var_pow(isl_space_copy(qp->dim), + min = isl_qpolynomial_cst_on_domain(isl_space_copy(qp->dim), l); + base = isl_qpolynomial_var_pow_on_domain(isl_space_copy(qp->dim), qp->upoly->var, 1); r = isl_qpolynomial_alloc(isl_space_copy(qp->dim), 0, @@ -584,6 +611,15 @@ error: return NULL; } +__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_gist_params( + __isl_take isl_qpolynomial_fold *fold, __isl_take isl_set *context) +{ + isl_space *space = isl_qpolynomial_fold_get_domain_space(fold); + isl_set *dom_context = isl_set_universe(space); + dom_context = isl_set_intersect_params(dom_context, context); + return isl_qpolynomial_fold_gist(fold, dom_context); +} + #define HAS_TYPE #undef PW @@ -598,8 +634,11 @@ error: #define IS_ZERO is_zero #undef FIELD #define FIELD fold +#undef DEFAULT_IS_ZERO +#define DEFAULT_IS_ZERO 1 #define NO_NEG +#define NO_PULLBACK #include @@ -609,6 +648,9 @@ error: #define PART isl_pw_qpolynomial_fold #undef PARTS #define PARTS pw_qpolynomial_fold +#define ALIGN_DOMAIN + +#define NO_SUB #include @@ -793,7 +835,7 @@ __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_fold( "fold types don't match", goto error); n = (pw1->n + 1) * (pw2->n + 1); - res = isl_pw_qpolynomial_fold_alloc_(isl_space_copy(pw1->dim), + res = isl_pw_qpolynomial_fold_alloc_size(isl_space_copy(pw1->dim), pw1->type, n); for (i = 0; i < pw1->n; ++i) { @@ -917,8 +959,8 @@ __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_from_pw_qpolynomial( if (!pwqp) return NULL; - pwf = isl_pw_qpolynomial_fold_alloc_(isl_space_copy(pwqp->dim), type, - pwqp->n); + pwf = isl_pw_qpolynomial_fold_alloc_size(isl_space_copy(pwqp->dim), + type, pwqp->n); for (i = 0; i < pwqp->n; ++i) pwf = isl_pw_qpolynomial_fold_add_piece(pwf, @@ -931,6 +973,13 @@ __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_from_pw_qpolynomial( return pwf; } +__isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_add( + __isl_take isl_pw_qpolynomial_fold *pwf1, + __isl_take isl_pw_qpolynomial_fold *pwf2) +{ + return isl_pw_qpolynomial_fold_union_add_(pwf1, pwf2); +} + int isl_qpolynomial_fold_plain_is_equal(__isl_keep isl_qpolynomial_fold *fold1, __isl_keep isl_qpolynomial_fold *fold2) { @@ -965,7 +1014,7 @@ __isl_give isl_qpolynomial *isl_qpolynomial_fold_eval( goto error); if (fold->n == 0) - qp = isl_qpolynomial_zero(isl_space_copy(fold->dim)); + qp = isl_qpolynomial_zero_on_domain(isl_space_copy(fold->dim)); else { int i; qp = isl_qpolynomial_eval(isl_qpolynomial_copy(fold->qp[0]), @@ -1015,7 +1064,7 @@ __isl_give isl_qpolynomial *isl_qpolynomial_fold_opt_on_domain( isl_space *dim = isl_space_copy(fold->dim); isl_set_free(set); isl_qpolynomial_fold_free(fold); - return isl_qpolynomial_zero(dim); + return isl_qpolynomial_zero_on_domain(dim); } opt = isl_qpolynomial_opt_on_domain(isl_qpolynomial_copy(fold->qp[0]), @@ -1130,7 +1179,7 @@ int isl_pw_qpolynomial_fold_covers(__isl_keep isl_pw_qpolynomial_fold *pwf1, return 1; } -__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_morph( +__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_morph_domain( __isl_take isl_qpolynomial_fold *fold, __isl_take isl_morph *morph) { int i; @@ -1152,7 +1201,7 @@ __isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_morph( goto error; for (i = 0; i < fold->n; ++i) { - fold->qp[i] = isl_qpolynomial_morph(fold->qp[i], + fold->qp[i] = isl_qpolynomial_morph_domain(fold->qp[i], isl_morph_copy(morph)); if (!fold->qp[i]) goto error; @@ -1360,13 +1409,13 @@ error: return NULL; } -static int compatible_range(__isl_keep isl_space *dim1, __isl_keep isl_space *dim2) +static int join_compatible(__isl_keep isl_space *dim1, __isl_keep isl_space *dim2) { int m; m = isl_space_match(dim1, isl_dim_param, dim2, isl_dim_param); if (m < 0 || !m) return m; - return isl_space_tuple_match(dim1, isl_dim_out, dim2, isl_dim_set); + return isl_space_tuple_match(dim1, isl_dim_out, dim2, isl_dim_in); } /* Compute the intersection of the range of the map and the domain @@ -1395,7 +1444,7 @@ __isl_give isl_pw_qpolynomial_fold *isl_map_apply_pw_qpolynomial_fold( map_dim = isl_map_get_space(map); pwf_dim = isl_pw_qpolynomial_fold_get_space(pwf); - ok = compatible_range(map_dim, pwf_dim); + ok = join_compatible(map_dim, pwf_dim); isl_space_free(map_dim); isl_space_free(pwf_dim); if (!ok) @@ -1403,10 +1452,11 @@ __isl_give isl_pw_qpolynomial_fold *isl_map_apply_pw_qpolynomial_fold( goto error); n_in = isl_map_dim(map, isl_dim_in); - pwf = isl_pw_qpolynomial_fold_insert_dims(pwf, isl_dim_set, 0, n_in); + pwf = isl_pw_qpolynomial_fold_insert_dims(pwf, isl_dim_in, 0, n_in); dom = isl_map_wrap(map); - pwf = isl_pw_qpolynomial_fold_reset_space(pwf, isl_set_get_space(dom)); + pwf = isl_pw_qpolynomial_fold_reset_domain_space(pwf, + isl_set_get_space(dom)); pwf = isl_pw_qpolynomial_fold_intersect_domain(pwf, dom); pwf = isl_pw_qpolynomial_fold_bound(pwf, tight); @@ -1422,10 +1472,7 @@ __isl_give isl_pw_qpolynomial_fold *isl_set_apply_pw_qpolynomial_fold( __isl_take isl_set *set, __isl_take isl_pw_qpolynomial_fold *pwf, int *tight) { - isl_map *map; - - map = isl_map_from_range(set); - return isl_map_apply_pw_qpolynomial_fold(map, pwf, tight); + return isl_map_apply_pw_qpolynomial_fold(set, pwf, tight); } struct isl_apply_fold_data { @@ -1445,7 +1492,7 @@ static int pw_qpolynomial_fold_apply(__isl_take isl_pw_qpolynomial_fold *pwf, map_dim = isl_map_get_space(data->map); pwf_dim = isl_pw_qpolynomial_fold_get_space(pwf); - ok = compatible_range(map_dim, pwf_dim); + ok = join_compatible(map_dim, pwf_dim); isl_space_free(map_dim); isl_space_free(pwf_dim); @@ -1517,7 +1564,7 @@ __isl_give isl_union_pw_qpolynomial_fold *isl_union_set_apply_union_pw_qpolynomi /* Reorder the dimension of "fold" according to the given reordering. */ -__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_realign( +__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_realign_domain( __isl_take isl_qpolynomial_fold *fold, __isl_take isl_reordering *r) { int i; @@ -1527,13 +1574,14 @@ __isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_realign( goto error; for (i = 0; i < fold->n; ++i) { - fold->qp[i] = isl_qpolynomial_realign(fold->qp[i], + fold->qp[i] = isl_qpolynomial_realign_domain(fold->qp[i], isl_reordering_copy(r)); if (!fold->qp[i]) goto error; } - fold = isl_qpolynomial_fold_reset_space(fold, isl_space_copy(r->dim)); + fold = isl_qpolynomial_fold_reset_domain_space(fold, + isl_space_copy(r->dim)); isl_reordering_free(r); @@ -1582,3 +1630,50 @@ __isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_scale( { return isl_qpolynomial_fold_mul_isl_int(fold, v); } + +/* Multiply "fold" by "v". + */ +__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_scale_val( + __isl_take isl_qpolynomial_fold *fold, __isl_take isl_val *v) +{ + int i; + + if (!fold || !v) + goto error; + + if (isl_val_is_one(v)) { + isl_val_free(v); + return fold; + } + if (isl_val_is_zero(v)) { + isl_qpolynomial_fold *zero; + isl_space *space = isl_qpolynomial_fold_get_domain_space(fold); + zero = isl_qpolynomial_fold_empty(fold->type, space); + isl_qpolynomial_fold_free(fold); + isl_val_free(v); + return zero; + } + if (!isl_val_is_rat(v)) + isl_die(isl_qpolynomial_fold_get_ctx(fold), isl_error_invalid, + "expecting rational factor", goto error); + + fold = isl_qpolynomial_fold_cow(fold); + if (!fold) + goto error; + + if (isl_val_is_neg(v)) + fold->type = isl_fold_type_negate(fold->type); + for (i = 0; i < fold->n; ++i) { + fold->qp[i] = isl_qpolynomial_scale_val(fold->qp[i], + isl_val_copy(v)); + if (!fold->qp[i]) + goto error; + } + + isl_val_free(v); + return fold; +error: + isl_val_free(v); + isl_qpolynomial_fold_free(fold); + return NULL; +}