X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_polynomial.c;h=2dfdd0f2170fcb0985c75308bc5169d4d1841cbc;hb=63fb8a7f484648c3caa25351c8c94ac2395ec563;hp=2341bab09a803e6435b1b322a8f6caff4083a244;hpb=3280c051ef3dc4b05fbe855340547ace629071c6;p=platform%2Fupstream%2Fisl.git diff --git a/isl_polynomial.c b/isl_polynomial.c index 2341bab..2dfdd0f 100644 --- a/isl_polynomial.c +++ b/isl_polynomial.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, @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -2127,57 +2126,6 @@ error: return NULL; } -/* Assumes each div only depends on earlier divs. - */ -__isl_give isl_qpolynomial *isl_qpolynomial_div_pow(__isl_take isl_div *div, - int power) -{ - struct isl_qpolynomial *qp = NULL; - struct isl_upoly_rec *rec; - struct isl_upoly_cst *cst; - int i, d; - int pos; - - if (!div) - return NULL; - - d = div->line - div->bmap->div; - - pos = isl_space_dim(div->bmap->dim, isl_dim_all) + d; - rec = isl_upoly_alloc_rec(div->ctx, pos, 1 + power); - qp = isl_qpolynomial_alloc(isl_basic_map_get_space(div->bmap), - div->bmap->n_div, &rec->up); - if (!qp) - goto error; - - for (i = 0; i < div->bmap->n_div; ++i) - isl_seq_cpy(qp->div->row[i], div->bmap->div[i], qp->div->n_col); - - for (i = 0; i < 1 + power; ++i) { - rec->p[i] = isl_upoly_zero(div->ctx); - if (!rec->p[i]) - goto error; - rec->n++; - } - cst = isl_upoly_as_cst(rec->p[power]); - isl_int_set_si(cst->n, 1); - - isl_div_free(div); - - qp = reduce_divs(qp); - - return qp; -error: - isl_qpolynomial_free(qp); - isl_div_free(div); - return NULL; -} - -__isl_give isl_qpolynomial *isl_qpolynomial_div(__isl_take isl_div *div) -{ - return isl_qpolynomial_div_pow(div, 1); -} - __isl_give isl_qpolynomial *isl_qpolynomial_rat_cst_on_domain( __isl_take isl_space *dim, const isl_int n, const isl_int d) { @@ -2555,7 +2503,7 @@ __isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities( if (!qp || !eq) goto error; if (qp->div->n_row > 0) - eq = isl_basic_set_add(eq, isl_dim_set, qp->div->n_row); + eq = isl_basic_set_add_dims(eq, isl_dim_set, qp->div->n_row); return isl_qpolynomial_substitute_equalities_lifted(qp, eq); error: isl_basic_set_free(eq); @@ -2619,6 +2567,15 @@ error: return NULL; } +__isl_give isl_qpolynomial *isl_qpolynomial_gist_params( + __isl_take isl_qpolynomial *qp, __isl_take isl_set *context) +{ + isl_space *space = isl_qpolynomial_get_domain_space(qp); + isl_set *dom_context = isl_set_universe(space); + dom_context = isl_set_intersect_params(dom_context, context); + return isl_qpolynomial_gist(qp, dom_context); +} + __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_from_qpolynomial( __isl_take isl_qpolynomial *qp) { @@ -2648,6 +2605,10 @@ __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_from_qpolynomial( #define IS_ZERO is_zero #undef FIELD #define FIELD qp +#undef DEFAULT_IS_ZERO +#define DEFAULT_IS_ZERO 1 + +#define NO_PULLBACK #include @@ -2675,6 +2636,13 @@ int isl_pw_qpolynomial_is_one(__isl_keep isl_pw_qpolynomial *pwqp) return isl_qpolynomial_is_one(pwqp->p[0].qp); } +__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_add( + __isl_take isl_pw_qpolynomial *pwqp1, + __isl_take isl_pw_qpolynomial *pwqp2) +{ + return isl_pw_qpolynomial_union_add_(pwqp1, pwqp2); +} + __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_mul( __isl_take isl_pw_qpolynomial *pwqp1, __isl_take isl_pw_qpolynomial *pwqp2) @@ -3247,7 +3215,7 @@ int isl_qpolynomial_as_polynomial_on_domain(__isl_keep isl_qpolynomial *qp, dim = isl_space_add_dims(dim, isl_dim_set, qp->div->n_row); poly = isl_qpolynomial_alloc(dim, 0, isl_upoly_copy(qp->upoly)); bset = isl_basic_set_copy(bset); - bset = isl_basic_set_add(bset, isl_dim_set, qp->div->n_row); + bset = isl_basic_set_add_dims(bset, isl_dim_set, qp->div->n_row); bset = add_div_constraints(bset, div); return fn(bset, poly, user); @@ -3516,7 +3484,7 @@ __isl_give isl_term *isl_term_dup(__isl_keep isl_term *term) isl_term *dup; unsigned total; - if (term) + if (!term) return NULL; total = isl_space_dim(term->dim, isl_dim_all) + term->div->n_row; @@ -3611,11 +3579,10 @@ int isl_term_get_exp(__isl_keep isl_term *term, return term->pow[pos]; } -__isl_give isl_div *isl_term_get_div(__isl_keep isl_term *term, unsigned pos) +__isl_give isl_aff *isl_term_get_div(__isl_keep isl_term *term, unsigned pos) { - isl_basic_map *bmap; - unsigned total; - int k; + isl_local_space *ls; + isl_aff *aff; if (!term) return NULL; @@ -3623,23 +3590,17 @@ __isl_give isl_div *isl_term_get_div(__isl_keep isl_term *term, unsigned pos) isl_assert(term->dim->ctx, pos < isl_term_dim(term, isl_dim_div), return NULL); - total = term->div->n_col - term->div->n_row - 2; - /* No nested divs for now */ - isl_assert(term->dim->ctx, - isl_seq_first_non_zero(term->div->row[pos] + 2 + total, - term->div->n_row) == -1, - return NULL); + ls = isl_local_space_alloc_div(isl_space_copy(term->dim), + isl_mat_copy(term->div)); + aff = isl_aff_alloc(ls); + if (!aff) + return NULL; - bmap = isl_basic_map_alloc_space(isl_space_copy(term->dim), 1, 0, 0); - if ((k = isl_basic_map_alloc_div(bmap)) < 0) - goto error; + isl_seq_cpy(aff->v->el, term->div->row[pos], aff->v->size); - isl_seq_cpy(bmap->div[k], term->div->row[pos], 2 + total); + aff = isl_aff_normalize(aff); - return isl_basic_map_div(bmap, k); -error: - isl_basic_map_free(bmap); - return NULL; + return aff; } __isl_give isl_term *isl_upoly_foreach_term(__isl_keep struct isl_upoly *up, @@ -3919,7 +3880,7 @@ __isl_give isl_qpolynomial *isl_qpolynomial_morph_domain( int n_sub; isl_ctx *ctx; struct isl_upoly **subs; - isl_mat *mat; + isl_mat *mat, *diag; qp = isl_qpolynomial_cow(qp); if (!qp || !morph) @@ -3949,8 +3910,10 @@ __isl_give isl_qpolynomial *isl_qpolynomial_morph_domain( isl_upoly_free(subs[i]); free(subs); - mat = isl_mat_diagonal(isl_mat_identity(ctx, 1), isl_mat_copy(morph->inv)); - mat = isl_mat_diagonal(mat, isl_mat_identity(ctx, qp->div->n_row)); + diag = isl_mat_diag(ctx, 1, morph->inv->row[0][0]); + mat = isl_mat_diagonal(diag, isl_mat_copy(morph->inv)); + diag = isl_mat_diag(ctx, qp->div->n_row, morph->inv->row[0][0]); + mat = isl_mat_diagonal(mat, diag); qp->div = isl_mat_product(qp->div, mat); isl_space_free(qp->dim); qp->dim = isl_space_copy(morph->ran->dim); @@ -3993,52 +3956,11 @@ error: return NULL; } -__isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_sub( - __isl_take isl_union_pw_qpolynomial *upwqp1, - __isl_take isl_union_pw_qpolynomial *upwqp2) -{ - return isl_union_pw_qpolynomial_add(upwqp1, - isl_union_pw_qpolynomial_neg(upwqp2)); -} - -static int mul_entry(void **entry, void *user) -{ - struct isl_union_pw_qpolynomial_match_bin_data *data = user; - uint32_t hash; - struct isl_hash_table_entry *entry2; - isl_pw_qpolynomial *pwpq = *entry; - int empty; - - hash = isl_space_get_hash(pwpq->dim); - entry2 = isl_hash_table_find(data->u2->dim->ctx, &data->u2->table, - hash, &has_dim, pwpq->dim, 0); - if (!entry2) - return 0; - - pwpq = isl_pw_qpolynomial_copy(pwpq); - pwpq = isl_pw_qpolynomial_mul(pwpq, - isl_pw_qpolynomial_copy(entry2->data)); - - empty = isl_pw_qpolynomial_is_zero(pwpq); - if (empty < 0) { - isl_pw_qpolynomial_free(pwpq); - return -1; - } - if (empty) { - isl_pw_qpolynomial_free(pwpq); - return 0; - } - - data->res = isl_union_pw_qpolynomial_add_pw_qpolynomial(data->res, pwpq); - - return 0; -} - __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_mul( __isl_take isl_union_pw_qpolynomial *upwqp1, __isl_take isl_union_pw_qpolynomial *upwqp2) { - return match_bin_op(upwqp1, upwqp2, &mul_entry); + return match_bin_op(upwqp1, upwqp2, &isl_pw_qpolynomial_mul); } /* Reorder the columns of the given div definitions according to the