/*
* 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,
*/
#include <stdlib.h>
+#define ISL_DIM_H
+#include <isl_ctx_private.h>
#include <isl_map_private.h>
#include <isl_factorization.h>
#include <isl/lp.h>
#include <isl/seq.h>
#include <isl_union_map_private.h>
+#include <isl_constraint_private.h>
#include <isl_polynomial_private.h>
#include <isl_point_private.h>
-#include <isl_dim_private.h>
+#include <isl_space_private.h>
#include <isl_mat_private.h>
#include <isl_range.h>
+#include <isl_local_space_private.h>
+#include <isl_aff_private.h>
+#include <isl_config.h>
-static unsigned pos(__isl_keep isl_dim *dim, enum isl_dim_type type)
+static unsigned pos(__isl_keep isl_space *dim, enum isl_dim_type type)
{
switch (type) {
case isl_dim_param: return 0;
isl_assert(ctx, size >= 0, return NULL);
rec = isl_calloc(ctx, struct isl_upoly_rec,
sizeof(struct isl_upoly_rec) +
- (size - 1) * sizeof(struct isl_upoly *));
+ size * sizeof(struct isl_upoly *));
if (!rec)
return NULL;
return rec;
}
-__isl_give isl_qpolynomial *isl_qpolynomial_reset_dim(
- __isl_take isl_qpolynomial *qp, __isl_take isl_dim *dim)
+__isl_give isl_qpolynomial *isl_qpolynomial_reset_domain_space(
+ __isl_take isl_qpolynomial *qp, __isl_take isl_space *dim)
{
qp = isl_qpolynomial_cow(qp);
if (!qp || !dim)
goto error;
- isl_dim_free(qp->dim);
+ isl_space_free(qp->dim);
qp->dim = dim;
return qp;
error:
isl_qpolynomial_free(qp);
- isl_dim_free(dim);
+ isl_space_free(dim);
return NULL;
}
+/* Reset the space of "qp". 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 *isl_qpolynomial_reset_space_and_domain(
+ __isl_take isl_qpolynomial *qp, __isl_take isl_space *space,
+ __isl_take isl_space *domain)
+{
+ isl_space_free(space);
+ return isl_qpolynomial_reset_domain_space(qp, domain);
+}
+
isl_ctx *isl_qpolynomial_get_ctx(__isl_keep isl_qpolynomial *qp)
{
return qp ? qp->dim->ctx : NULL;
}
-__isl_give isl_dim *isl_qpolynomial_get_dim(__isl_keep isl_qpolynomial *qp)
+__isl_give isl_space *isl_qpolynomial_get_domain_space(
+ __isl_keep isl_qpolynomial *qp)
+{
+ return qp ? isl_space_copy(qp->dim) : NULL;
+}
+
+__isl_give isl_space *isl_qpolynomial_get_space(__isl_keep isl_qpolynomial *qp)
{
- return qp ? isl_dim_copy(qp->dim) : NULL;
+ isl_space *space;
+ if (!qp)
+ return NULL;
+ space = isl_space_copy(qp->dim);
+ space = isl_space_from_domain(space);
+ space = isl_space_add_dims(space, isl_dim_out, 1);
+ return space;
}
+/* Externally, an isl_qpolynomial has a map space, but internally, the
+ * ls field corresponds to the domain of that space.
+ */
unsigned isl_qpolynomial_dim(__isl_keep isl_qpolynomial *qp,
enum isl_dim_type type)
{
- return qp ? isl_dim_size(qp->dim, type) : 0;
+ if (!qp)
+ return 0;
+ if (type == isl_dim_out)
+ return 1;
+ if (type == isl_dim_in)
+ type = isl_dim_set;
+ return isl_space_dim(qp->dim, type);
}
int isl_qpolynomial_is_zero(__isl_keep isl_qpolynomial *qp)
__isl_give struct isl_upoly *isl_upoly_dup(__isl_keep struct isl_upoly *up)
{
- struct isl_upoly *dup;
-
if (!up)
return NULL;
{
struct isl_upoly_rec *rec1;
struct isl_upoly_rec *rec2;
- struct isl_upoly_rec *res;
+ struct isl_upoly_rec *res = NULL;
int i, j;
int size;
return res;
}
-__isl_give isl_qpolynomial *isl_qpolynomial_alloc(__isl_take isl_dim *dim,
+__isl_give isl_qpolynomial *isl_qpolynomial_alloc(__isl_take isl_space *dim,
unsigned n_div, __isl_take struct isl_upoly *up)
{
struct isl_qpolynomial *qp = NULL;
if (!dim || !up)
goto error;
- total = isl_dim_total(dim);
+ if (!isl_space_is_set(dim))
+ isl_die(isl_space_get_ctx(dim), isl_error_invalid,
+ "domain of polynomial should be a set", goto error);
+
+ total = isl_space_dim(dim, isl_dim_all);
qp = isl_calloc_type(dim->ctx, struct isl_qpolynomial);
if (!qp)
return qp;
error:
- isl_dim_free(dim);
+ isl_space_free(dim);
isl_upoly_free(up);
isl_qpolynomial_free(qp);
return NULL;
if (!qp)
return NULL;
- dup = isl_qpolynomial_alloc(isl_dim_copy(qp->dim), qp->div->n_row,
+ dup = isl_qpolynomial_alloc(isl_space_copy(qp->dim), qp->div->n_row,
isl_upoly_copy(qp->upoly));
if (!dup)
return NULL;
return isl_qpolynomial_dup(qp);
}
-void isl_qpolynomial_free(__isl_take isl_qpolynomial *qp)
+void *isl_qpolynomial_free(__isl_take isl_qpolynomial *qp)
{
if (!qp)
- return;
+ return NULL;
if (--qp->ref > 0)
- return;
+ return NULL;
- isl_dim_free(qp->dim);
+ isl_space_free(qp->dim);
isl_mat_free(qp->div);
isl_upoly_free(qp->upoly);
free(qp);
+ return NULL;
}
__isl_give struct isl_upoly *isl_upoly_var_pow(isl_ctx *ctx, int pos, int power)
{
int i;
- struct isl_upoly *up;
struct isl_upoly_rec *rec;
struct isl_upoly_cst *cst;
return equal;
}
-static void expand_row(__isl_keep isl_mat *dst, int d,
- __isl_keep isl_mat *src, int s, int *exp)
-{
- int i;
- unsigned c = src->n_col - src->n_row;
-
- isl_seq_cpy(dst->row[d], src->row[s], c);
- isl_seq_clr(dst->row[d] + c, dst->n_col - c);
-
- for (i = 0; i < s; ++i)
- isl_int_set(dst->row[d][c + exp[i]], src->row[s][c + i]);
-}
-
static int cmp_row(__isl_keep isl_mat *div, int i, int j)
{
int li, lj;
if (qp->div->n_row <= 1)
return qp;
- div_pos = isl_dim_total(qp->dim);
+ div_pos = isl_space_dim(qp->dim, isl_dim_all);
array = isl_alloc_array(qp->div->ctx, struct isl_div_sort_info,
qp->div->n_row);
return NULL;
}
-static __isl_give isl_mat *merge_divs(__isl_keep isl_mat *div1,
- __isl_keep isl_mat *div2, int *exp1, int *exp2)
-{
- int i, j, k;
- isl_mat *div = NULL;
- unsigned d = div1->n_col - div1->n_row;
-
- div = isl_mat_alloc(div1->ctx, 1 + div1->n_row + div2->n_row,
- d + div1->n_row + div2->n_row);
- if (!div)
- return NULL;
-
- for (i = 0, j = 0, k = 0; i < div1->n_row && j < div2->n_row; ++k) {
- int cmp;
-
- expand_row(div, k, div1, i, exp1);
- expand_row(div, k + 1, div2, j, exp2);
-
- cmp = cmp_row(div, k, k + 1);
- if (cmp == 0) {
- exp1[i++] = k;
- exp2[j++] = k;
- } else if (cmp < 0) {
- exp1[i++] = k;
- } else {
- exp2[j++] = k;
- isl_seq_cpy(div->row[k], div->row[k + 1], div->n_col);
- }
- }
- for (; i < div1->n_row; ++i, ++k) {
- expand_row(div, k, div1, i, exp1);
- exp1[i] = k;
- }
- for (; j < div2->n_row; ++j, ++k) {
- expand_row(div, k, div2, j, exp2);
- exp2[j] = k;
- }
-
- div->n_row = k;
- div->n_col = d + k;
-
- return div;
-}
-
static __isl_give struct isl_upoly *expand(__isl_take struct isl_upoly *up,
int *exp, int first)
{
if (!exp1 || !exp2)
goto error;
- div = merge_divs(qp1->div, qp2->div, exp1, exp2);
+ div = isl_merge_divs(qp1->div, qp2->div, exp1, exp2);
if (!div)
goto error;
if (qp1->div->n_row < qp2->div->n_row)
return isl_qpolynomial_add(qp2, qp1);
- isl_assert(qp1->dim->ctx, isl_dim_equal(qp1->dim, qp2->dim), goto error);
+ isl_assert(qp1->dim->ctx, isl_space_is_equal(qp1->dim, qp2->dim), goto error);
if (!compatible_divs(qp1->div, qp2->div))
return with_merged_divs(isl_qpolynomial_add, qp1, qp2);
if (qp && isl_int_is_zero(v)) {
isl_qpolynomial *zero;
- zero = isl_qpolynomial_zero(isl_dim_copy(qp->dim));
+ zero = isl_qpolynomial_zero_on_domain(isl_space_copy(qp->dim));
isl_qpolynomial_free(qp);
return zero;
}
return NULL;
}
+__isl_give isl_qpolynomial *isl_qpolynomial_scale(
+ __isl_take isl_qpolynomial *qp, isl_int v)
+{
+ return isl_qpolynomial_mul_isl_int(qp, v);
+}
+
__isl_give isl_qpolynomial *isl_qpolynomial_mul(__isl_take isl_qpolynomial *qp1,
__isl_take isl_qpolynomial *qp2)
{
if (qp1->div->n_row < qp2->div->n_row)
return isl_qpolynomial_mul(qp2, qp1);
- isl_assert(qp1->dim->ctx, isl_dim_equal(qp1->dim, qp2->dim), goto error);
+ isl_assert(qp1->dim->ctx, isl_space_is_equal(qp1->dim, qp2->dim), goto error);
if (!compatible_divs(qp1->div, qp2->div))
return with_merged_divs(isl_qpolynomial_mul, qp1, qp2);
return NULL;
}
-__isl_give isl_qpolynomial *isl_qpolynomial_zero(__isl_take isl_dim *dim)
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_pow(
+ __isl_take isl_pw_qpolynomial *pwqp, unsigned power)
{
+ int i;
+
+ if (power == 1)
+ return pwqp;
+
+ pwqp = isl_pw_qpolynomial_cow(pwqp);
+ if (!pwqp)
+ return NULL;
+
+ for (i = 0; i < pwqp->n; ++i) {
+ pwqp->p[i].qp = isl_qpolynomial_pow(pwqp->p[i].qp, power);
+ if (!pwqp->p[i].qp)
+ return isl_pw_qpolynomial_free(pwqp);
+ }
+
+ return pwqp;
+}
+
+__isl_give isl_qpolynomial *isl_qpolynomial_zero_on_domain(
+ __isl_take isl_space *dim)
+{
+ if (!dim)
+ return NULL;
return isl_qpolynomial_alloc(dim, 0, isl_upoly_zero(dim->ctx));
}
-__isl_give isl_qpolynomial *isl_qpolynomial_one(__isl_take isl_dim *dim)
+__isl_give isl_qpolynomial *isl_qpolynomial_one_on_domain(
+ __isl_take isl_space *dim)
{
+ if (!dim)
+ return NULL;
return isl_qpolynomial_alloc(dim, 0, isl_upoly_one(dim->ctx));
}
-__isl_give isl_qpolynomial *isl_qpolynomial_infty(__isl_take isl_dim *dim)
+__isl_give isl_qpolynomial *isl_qpolynomial_infty_on_domain(
+ __isl_take isl_space *dim)
{
+ if (!dim)
+ return NULL;
return isl_qpolynomial_alloc(dim, 0, isl_upoly_infty(dim->ctx));
}
-__isl_give isl_qpolynomial *isl_qpolynomial_neginfty(__isl_take isl_dim *dim)
+__isl_give isl_qpolynomial *isl_qpolynomial_neginfty_on_domain(
+ __isl_take isl_space *dim)
{
+ if (!dim)
+ return NULL;
return isl_qpolynomial_alloc(dim, 0, isl_upoly_neginfty(dim->ctx));
}
-__isl_give isl_qpolynomial *isl_qpolynomial_nan(__isl_take isl_dim *dim)
+__isl_give isl_qpolynomial *isl_qpolynomial_nan_on_domain(
+ __isl_take isl_space *dim)
{
+ if (!dim)
+ return NULL;
return isl_qpolynomial_alloc(dim, 0, isl_upoly_nan(dim->ctx));
}
-__isl_give isl_qpolynomial *isl_qpolynomial_cst(__isl_take isl_dim *dim,
+__isl_give isl_qpolynomial *isl_qpolynomial_cst_on_domain(
+ __isl_take isl_space *dim,
isl_int v)
{
struct isl_qpolynomial *qp;
struct isl_upoly_cst *cst;
+ if (!dim)
+ return NULL;
+
qp = isl_qpolynomial_alloc(dim, 0, isl_upoly_zero(dim->ctx));
if (!qp)
return NULL;
if (!qp)
return NULL;
- isl_assert(qp->div->ctx, qp->div->n_row == 0, return NULL);
- d = isl_dim_total(qp->dim);
- aff = isl_vec_alloc(qp->div->ctx, 2 + d);
+ d = isl_space_dim(qp->dim, isl_dim_all);
+ aff = isl_vec_alloc(qp->div->ctx, 2 + d + qp->div->n_row);
if (!aff)
return NULL;
- isl_seq_clr(aff->el + 1, 1 + d);
+ isl_seq_clr(aff->el + 1, 1 + d + qp->div->n_row);
isl_int_set_si(aff->el[0], 1);
if (isl_upoly_update_affine(qp->upoly, aff) < 0)
return NULL;
}
-int isl_qpolynomial_is_equal(__isl_keep isl_qpolynomial *qp1,
+int isl_qpolynomial_plain_is_equal(__isl_keep isl_qpolynomial *qp1,
__isl_keep isl_qpolynomial *qp2)
{
+ int equal;
+
if (!qp1 || !qp2)
return -1;
+ equal = isl_space_is_equal(qp1->dim, qp2->dim);
+ if (equal < 0 || !equal)
+ return equal;
+
+ equal = isl_mat_is_equal(qp1->div, qp2->div);
+ if (equal < 0 || !equal)
+ return equal;
+
return isl_upoly_is_equal(qp1->upoly, qp2->upoly);
}
upoly_update_den(qp->upoly, d);
}
-__isl_give isl_qpolynomial *isl_qpolynomial_var_pow(__isl_take isl_dim *dim,
- int pos, int power)
+__isl_give isl_qpolynomial *isl_qpolynomial_var_pow_on_domain(
+ __isl_take isl_space *dim, int pos, int power)
{
struct isl_ctx *ctx;
return isl_qpolynomial_alloc(dim, 0, isl_upoly_var_pow(ctx, pos, power));
}
-__isl_give isl_qpolynomial *isl_qpolynomial_var(__isl_take isl_dim *dim,
+__isl_give isl_qpolynomial *isl_qpolynomial_var_on_domain(__isl_take isl_space *dim,
enum isl_dim_type type, unsigned pos)
{
if (!dim)
return NULL;
- isl_assert(dim->ctx, isl_dim_size(dim, isl_dim_in) == 0, goto error);
- isl_assert(dim->ctx, pos < isl_dim_size(dim, type), goto error);
+ isl_assert(dim->ctx, isl_space_dim(dim, isl_dim_in) == 0, goto error);
+ isl_assert(dim->ctx, pos < isl_space_dim(dim, type), goto error);
if (type == isl_dim_set)
- pos += isl_dim_size(dim, isl_dim_param);
+ pos += isl_space_dim(dim, isl_dim_param);
- return isl_qpolynomial_var_pow(dim, pos, 1);
+ return isl_qpolynomial_var_pow_on_domain(dim, pos, 1);
error:
- isl_dim_free(dim);
+ isl_space_free(dim);
return NULL;
}
if (!qp)
goto error;
- total = isl_dim_total(qp->dim);
+ total = isl_space_dim(qp->dim, isl_dim_all);
qp->upoly = isl_upoly_subs(qp->upoly, total + div, 1, &s);
if (!qp->upoly)
goto error;
if (!qp)
return NULL;
- total = isl_dim_total(qp->dim);
+ total = isl_space_dim(qp->dim, isl_dim_all);
for (i = 0; qp && i < qp->div->n_row; ++i) {
if (!isl_int_is_one(qp->div->row[i][0]))
continue;
*
* After the reduction, some divs may have become redundant or identical,
* so we call substitute_non_divs and sort_divs. If these functions
- * eliminate divs of merge * two or more divs into one, the coefficients
+ * eliminate divs or merge two or more divs into one, the coefficients
* of the enclosing divs may have to be reduced again, so we call
* ourselves recursively if the number of divs decreases.
*/
static __isl_give isl_qpolynomial *reduce_divs(__isl_take isl_qpolynomial *qp)
{
- int i, j;
+ int i;
isl_vec *aff = NULL;
struct isl_upoly *s;
unsigned n_div;
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)
+__isl_give isl_qpolynomial *isl_qpolynomial_rat_cst_on_domain(
+ __isl_take isl_space *dim, const isl_int n, const isl_int d)
{
- struct isl_qpolynomial *qp = NULL;
- struct isl_upoly_rec *rec;
+ struct isl_qpolynomial *qp;
struct isl_upoly_cst *cst;
- int i, d;
- int pos;
- if (!div)
+ if (!dim)
return NULL;
- d = div->line - div->bmap->div;
-
- pos = isl_dim_total(div->bmap->dim) + d;
- rec = isl_upoly_alloc_rec(div->ctx, pos, 1 + power);
- qp = isl_qpolynomial_alloc(isl_basic_map_get_dim(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(__isl_take isl_dim *dim,
- const isl_int n, const isl_int d)
-{
- struct isl_qpolynomial *qp;
- struct isl_upoly_cst *cst;
-
qp = isl_qpolynomial_alloc(dim, 0, isl_upoly_zero(dim->ctx));
if (!qp)
return NULL;
static int set_active(__isl_keep isl_qpolynomial *qp, int *active)
{
int i, j;
- int d = isl_dim_total(qp->dim);
+ int d = isl_space_dim(qp->dim, isl_dim_all);
if (!qp || !active)
return -1;
if (n == 0)
return 0;
- isl_assert(qp->dim->ctx, first + n <= isl_dim_size(qp->dim, type),
- return -1);
+ isl_assert(qp->dim->ctx,
+ first + n <= isl_qpolynomial_dim(qp, type), return -1);
isl_assert(qp->dim->ctx, type == isl_dim_param ||
- type == isl_dim_set, return -1);
+ type == isl_dim_in, return -1);
- active = isl_calloc_array(set->ctx, int, isl_dim_total(qp->dim));
+ active = isl_calloc_array(qp->dim->ctx, int,
+ isl_space_dim(qp->dim, isl_dim_all));
if (set_active(qp, active) < 0)
goto error;
- if (type == isl_dim_set)
- first += isl_dim_size(qp->dim, isl_dim_param);
+ if (type == isl_dim_in)
+ first += isl_space_dim(qp->dim, isl_dim_param);
for (i = 0; i < n; ++i)
if (active[first + i]) {
involves = 1;
return -1;
}
+/* Remove divs that do not appear in the quasi-polynomial, nor in any
+ * of the divs that do appear in the quasi-polynomial.
+ */
+static __isl_give isl_qpolynomial *remove_redundant_divs(
+ __isl_take isl_qpolynomial *qp)
+{
+ int i, j;
+ int d;
+ int len;
+ int skip;
+ int *active = NULL;
+ int *reordering = NULL;
+ int redundant = 0;
+ int n_div;
+ isl_ctx *ctx;
+
+ if (!qp)
+ return NULL;
+ if (qp->div->n_row == 0)
+ return qp;
+
+ d = isl_space_dim(qp->dim, isl_dim_all);
+ len = qp->div->n_col - 2;
+ ctx = isl_qpolynomial_get_ctx(qp);
+ active = isl_calloc_array(ctx, int, len);
+ if (!active)
+ goto error;
+
+ if (up_set_active(qp->upoly, active, len) < 0)
+ goto error;
+
+ for (i = qp->div->n_row - 1; i >= 0; --i) {
+ if (!active[d + i]) {
+ redundant = 1;
+ continue;
+ }
+ for (j = 0; j < i; ++j) {
+ if (isl_int_is_zero(qp->div->row[i][2 + d + j]))
+ continue;
+ active[d + j] = 1;
+ break;
+ }
+ }
+
+ if (!redundant) {
+ free(active);
+ return qp;
+ }
+
+ reordering = isl_alloc_array(qp->div->ctx, int, len);
+ if (!reordering)
+ goto error;
+
+ for (i = 0; i < d; ++i)
+ reordering[i] = i;
+
+ skip = 0;
+ n_div = qp->div->n_row;
+ for (i = 0; i < n_div; ++i) {
+ if (!active[d + i]) {
+ qp->div = isl_mat_drop_rows(qp->div, i - skip, 1);
+ qp->div = isl_mat_drop_cols(qp->div,
+ 2 + d + i - skip, 1);
+ skip++;
+ }
+ reordering[d + i] = d + i - skip;
+ }
+
+ qp->upoly = reorder(qp->upoly, reordering);
+
+ if (!qp->upoly || !qp->div)
+ goto error;
+
+ free(active);
+ free(reordering);
+
+ return qp;
+error:
+ free(active);
+ free(reordering);
+ isl_qpolynomial_free(qp);
+ return NULL;
+}
+
__isl_give struct isl_upoly *isl_upoly_drop(__isl_take struct isl_upoly *up,
unsigned first, unsigned n)
{
qp = isl_qpolynomial_cow(qp);
if (!qp)
return NULL;
- qp->dim = isl_dim_set_name(qp->dim, type, pos, s);
+ qp->dim = isl_space_set_dim_name(qp->dim, type, pos, s);
if (!qp->dim)
goto error;
return qp;
{
if (!qp)
return NULL;
- if (n == 0 && !isl_dim_get_tuple_name(qp->dim, type))
+ if (type == isl_dim_out)
+ isl_die(qp->dim->ctx, isl_error_invalid,
+ "cannot drop output/set dimension",
+ goto error);
+ if (type == isl_dim_in)
+ type = isl_dim_set;
+ if (n == 0 && !isl_space_is_named_or_nested(qp->dim, type))
return qp;
qp = isl_qpolynomial_cow(qp);
if (!qp)
return NULL;
- isl_assert(qp->dim->ctx, first + n <= isl_dim_size(qp->dim, type),
+ isl_assert(qp->dim->ctx, first + n <= isl_space_dim(qp->dim, type),
goto error);
isl_assert(qp->dim->ctx, type == isl_dim_param ||
type == isl_dim_set, goto error);
- qp->dim = isl_dim_drop(qp->dim, type, first, n);
+ qp->dim = isl_space_drop_dims(qp->dim, type, first, n);
if (!qp->dim)
goto error;
if (type == isl_dim_set)
- first += isl_dim_size(qp->dim, isl_dim_param);
+ first += isl_space_dim(qp->dim, isl_dim_param);
qp->div = isl_mat_drop_cols(qp->div, 2 + first, n);
if (!qp->div)
return NULL;
}
-__isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities(
+/* Project the domain of the quasi-polynomial onto its parameter space.
+ * The quasi-polynomial may not involve any of the domain dimensions.
+ */
+__isl_give isl_qpolynomial *isl_qpolynomial_project_domain_on_params(
+ __isl_take isl_qpolynomial *qp)
+{
+ isl_space *space;
+ unsigned n;
+ int involves;
+
+ n = isl_qpolynomial_dim(qp, isl_dim_in);
+ involves = isl_qpolynomial_involves_dims(qp, isl_dim_in, 0, n);
+ if (involves < 0)
+ return isl_qpolynomial_free(qp);
+ if (involves)
+ isl_die(isl_qpolynomial_get_ctx(qp), isl_error_invalid,
+ "polynomial involves some of the domain dimensions",
+ return isl_qpolynomial_free(qp));
+ qp = isl_qpolynomial_drop_dims(qp, isl_dim_in, 0, n);
+ space = isl_qpolynomial_get_domain_space(qp);
+ space = isl_space_params(space);
+ qp = isl_qpolynomial_reset_domain_space(qp, space);
+ return qp;
+}
+
+static __isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities_lifted(
__isl_take isl_qpolynomial *qp, __isl_take isl_basic_set *eq)
{
int i, j, k;
if (!qp->div)
goto error;
- total = 1 + isl_dim_total(eq->dim);
+ total = 1 + isl_space_dim(eq->dim, isl_dim_all);
n_div = eq->n_div;
isl_int_init(denom);
for (i = 0; i < eq->n_eq; ++i) {
return NULL;
}
+/* Exploit the equalities in "eq" to simplify the quasi-polynomial.
+ */
+__isl_give isl_qpolynomial *isl_qpolynomial_substitute_equalities(
+ __isl_take isl_qpolynomial *qp, __isl_take isl_basic_set *eq)
+{
+ if (!qp || !eq)
+ goto error;
+ if (qp->div->n_row > 0)
+ 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);
+ isl_qpolynomial_free(qp);
+ return NULL;
+}
+
static __isl_give isl_basic_set *add_div_constraints(
__isl_take isl_basic_set *bset, __isl_take isl_mat *div)
{
isl_basic_set *bset;
context = isl_set_add_dims(context, isl_dim_set,
qp->div->n_row);
- bset = isl_basic_set_universe(isl_set_get_dim(context));
+ bset = isl_basic_set_universe(isl_set_get_space(context));
bset = add_div_constraints(bset, isl_mat_copy(qp->div));
context = isl_set_intersect(context,
isl_set_from_basic_set(bset));
}
aff = isl_set_affine_hull(context);
- return isl_qpolynomial_substitute_equalities(qp, aff);
+ return isl_qpolynomial_substitute_equalities_lifted(qp, aff);
error:
isl_qpolynomial_free(qp);
isl_set_free(context);
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)
+{
+ isl_set *dom;
+
+ if (!qp)
+ return NULL;
+ if (isl_qpolynomial_is_zero(qp)) {
+ isl_space *dim = isl_qpolynomial_get_space(qp);
+ isl_qpolynomial_free(qp);
+ return isl_pw_qpolynomial_zero(dim);
+ }
+
+ dom = isl_set_universe(isl_qpolynomial_get_domain_space(qp));
+ return isl_pw_qpolynomial_alloc(dom, qp);
+}
+
#undef PW
#define PW isl_pw_qpolynomial
#undef EL
#define EL isl_qpolynomial
+#undef EL_IS_ZERO
+#define EL_IS_ZERO is_zero
+#undef ZERO
+#define ZERO zero
#undef IS_ZERO
#define IS_ZERO is_zero
#undef FIELD
#define FIELD qp
+#undef DEFAULT_IS_ZERO
+#define DEFAULT_IS_ZERO 1
+
+#define NO_PULLBACK
#include <isl_pw_templ.c>
#define PART isl_pw_qpolynomial
#undef PARTS
#define PARTS pw_qpolynomial
+#define ALIGN_DOMAIN
#include <isl_union_templ.c>
if (pwqp->n != -1)
return 0;
- if (!isl_set_fast_is_universe(pwqp->p[0].set))
+ if (!isl_set_plain_is_universe(pwqp->p[0].set))
return 0;
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)
{
int i, j, n;
struct isl_pw_qpolynomial *res;
- isl_set *set;
if (!pwqp1 || !pwqp2)
goto error;
- isl_assert(pwqp1->dim->ctx, isl_dim_equal(pwqp1->dim, pwqp2->dim),
+ isl_assert(pwqp1->dim->ctx, isl_space_is_equal(pwqp1->dim, pwqp2->dim),
goto error);
if (isl_pw_qpolynomial_is_zero(pwqp1)) {
}
n = pwqp1->n * pwqp2->n;
- res = isl_pw_qpolynomial_alloc_(isl_dim_copy(pwqp1->dim), n);
+ res = isl_pw_qpolynomial_alloc_size(isl_space_copy(pwqp1->dim), n);
for (i = 0; i < pwqp1->n; ++i) {
for (j = 0; j < pwqp2->n; ++j) {
struct isl_qpolynomial *prod;
common = isl_set_intersect(isl_set_copy(pwqp1->p[i].set),
isl_set_copy(pwqp2->p[j].set));
- if (isl_set_fast_is_empty(common)) {
+ if (isl_set_plain_is_empty(common)) {
isl_set_free(common);
continue;
}
return NULL;
}
-__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_neg(
- __isl_take isl_pw_qpolynomial *pwqp)
-{
- int i;
-
- if (!pwqp)
- return NULL;
-
- if (isl_pw_qpolynomial_is_zero(pwqp))
- return pwqp;
-
- pwqp = isl_pw_qpolynomial_cow(pwqp);
- if (!pwqp)
- return NULL;
-
- for (i = 0; i < pwqp->n; ++i) {
- pwqp->p[i].qp = isl_qpolynomial_neg(pwqp->p[i].qp);
- if (!pwqp->p[i].qp)
- goto error;
- }
-
- return pwqp;
-error:
- isl_pw_qpolynomial_free(pwqp);
- return NULL;
-}
-
-__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_sub(
- __isl_take isl_pw_qpolynomial *pwqp1,
- __isl_take isl_pw_qpolynomial *pwqp2)
-{
- return isl_pw_qpolynomial_add(pwqp1, isl_pw_qpolynomial_neg(pwqp2));
-}
-
__isl_give struct isl_upoly *isl_upoly_eval(
__isl_take struct isl_upoly *up, __isl_take isl_vec *vec)
{
{
isl_vec *ext;
struct isl_upoly *up;
- isl_dim *dim;
+ isl_space *dim;
if (!qp || !pnt)
goto error;
- isl_assert(pnt->dim->ctx, isl_dim_equal(pnt->dim, qp->dim), goto error);
+ isl_assert(pnt->dim->ctx, isl_space_is_equal(pnt->dim, qp->dim), goto error);
if (qp->div->n_row == 0)
ext = isl_vec_copy(pnt->vec);
else {
int i;
- unsigned dim = isl_dim_total(qp->dim);
+ unsigned dim = isl_space_dim(qp->dim, isl_dim_all);
ext = isl_vec_alloc(qp->dim->ctx, 1 + dim + qp->div->n_row);
if (!ext)
goto error;
if (!up)
goto error;
- dim = isl_dim_copy(qp->dim);
+ dim = isl_space_copy(qp->dim);
isl_qpolynomial_free(qp);
isl_point_free(pnt);
unsigned g_pos;
int *exp;
- if (n == 0)
+ if (!qp)
+ return NULL;
+ if (type == isl_dim_out)
+ isl_die(qp->div->ctx, isl_error_invalid,
+ "cannot insert output/set dimensions",
+ goto error);
+ if (type == isl_dim_in)
+ type = isl_dim_set;
+ if (n == 0 && !isl_space_is_named_or_nested(qp->dim, type))
return qp;
qp = isl_qpolynomial_cow(qp);
if (!qp)
return NULL;
- isl_assert(qp->div->ctx, first <= isl_dim_size(qp->dim, type),
+ isl_assert(qp->div->ctx, first <= isl_space_dim(qp->dim, type),
goto error);
g_pos = pos(qp->dim, type) + first;
- qp->div = isl_mat_insert_cols(qp->div, 2 + g_pos, n);
+ qp->div = isl_mat_insert_zero_cols(qp->div, 2 + g_pos, n);
if (!qp->div)
goto error;
goto error;
}
- qp->dim = isl_dim_insert(qp->dim, type, first, n);
+ qp->dim = isl_space_insert_dims(qp->dim, type, first, n);
if (!qp->dim)
goto error;
if (!qp)
return NULL;
- isl_assert(qp->dim->ctx, src_pos + n <= isl_dim_size(qp->dim, src_type),
+ if (dst_type == isl_dim_out || src_type == isl_dim_out)
+ isl_die(qp->dim->ctx, isl_error_invalid,
+ "cannot move output/set dimension",
+ goto error);
+ if (dst_type == isl_dim_in)
+ dst_type = isl_dim_set;
+ if (src_type == isl_dim_in)
+ src_type = isl_dim_set;
+
+ isl_assert(qp->dim->ctx, src_pos + n <= isl_space_dim(qp->dim, src_type),
goto error);
g_dst_pos = pos(qp->dim, dst_type) + dst_pos;
if (!qp->upoly)
goto error;
- qp->dim = isl_dim_move(qp->dim, dst_type, dst_pos, src_type, src_pos, n);
+ qp->dim = isl_space_move_dims(qp->dim, dst_type, dst_pos, src_type, src_pos, n);
if (!qp->dim)
goto error;
return NULL;
}
-__isl_give isl_qpolynomial *isl_qpolynomial_from_affine(__isl_take isl_dim *dim,
+__isl_give isl_qpolynomial *isl_qpolynomial_from_affine(__isl_take isl_space *dim,
isl_int *f, isl_int denom)
{
struct isl_upoly *up;
+ dim = isl_space_domain(dim);
if (!dim)
return NULL;
- up = isl_upoly_from_affine(dim->ctx, f, denom, 1 + isl_dim_total(dim));
+ up = isl_upoly_from_affine(dim->ctx, f, denom,
+ 1 + isl_space_dim(dim, isl_dim_all));
return isl_qpolynomial_alloc(dim, 0, up);
}
-__isl_give isl_qpolynomial *isl_qpolynomial_from_constraint(
- __isl_take isl_constraint *c, enum isl_dim_type type, unsigned pos)
+__isl_give isl_qpolynomial *isl_qpolynomial_from_aff(__isl_take isl_aff *aff)
{
- isl_int denom;
- isl_dim *dim;
+ isl_ctx *ctx;
struct isl_upoly *up;
isl_qpolynomial *qp;
- int sgn;
- if (!c)
+ if (!aff)
return NULL;
- isl_int_init(denom);
-
- isl_constraint_get_coefficient(c, type, pos, &denom);
- isl_constraint_set_coefficient(c, type, pos, c->ctx->zero);
- sgn = isl_int_sgn(denom);
- isl_int_abs(denom, denom);
- up = isl_upoly_from_affine(c->ctx, c->line[0], denom,
- 1 + isl_constraint_dim(c, isl_dim_all));
- if (sgn < 0)
- isl_int_neg(denom, denom);
- isl_constraint_set_coefficient(c, type, pos, denom);
+ ctx = isl_aff_get_ctx(aff);
+ up = isl_upoly_from_affine(ctx, aff->v->el + 1, aff->v->el[0],
+ aff->v->size - 1);
- dim = isl_dim_copy(c->bmap->dim);
+ qp = isl_qpolynomial_alloc(isl_aff_get_domain_space(aff),
+ aff->ls->div->n_row, up);
+ if (!qp)
+ goto error;
- isl_int_clear(denom);
- isl_constraint_free(c);
+ isl_mat_free(qp->div);
+ qp->div = isl_mat_copy(aff->ls->div);
+ qp->div = isl_mat_cow(qp->div);
+ if (!qp->div)
+ goto error;
- qp = isl_qpolynomial_alloc(dim, 0, up);
- if (sgn > 0)
- qp = isl_qpolynomial_neg(qp);
+ isl_aff_free(aff);
+ qp = reduce_divs(qp);
+ qp = remove_redundant_divs(qp);
return qp;
+error:
+ isl_aff_free(aff);
+ return NULL;
+}
+
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_from_pw_aff(
+ __isl_take isl_pw_aff *pwaff)
+{
+ int i;
+ isl_pw_qpolynomial *pwqp;
+
+ if (!pwaff)
+ return NULL;
+
+ pwqp = isl_pw_qpolynomial_alloc_size(isl_pw_aff_get_space(pwaff),
+ pwaff->n);
+
+ for (i = 0; i < pwaff->n; ++i) {
+ isl_set *dom;
+ isl_qpolynomial *qp;
+
+ dom = isl_set_copy(pwaff->p[i].set);
+ qp = isl_qpolynomial_from_aff(isl_aff_copy(pwaff->p[i].aff));
+ pwqp = isl_pw_qpolynomial_add_piece(pwqp, dom, qp);
+ }
+
+ isl_pw_aff_free(pwaff);
+ return pwqp;
+}
+
+__isl_give isl_qpolynomial *isl_qpolynomial_from_constraint(
+ __isl_take isl_constraint *c, enum isl_dim_type type, unsigned pos)
+{
+ isl_aff *aff;
+
+ aff = isl_constraint_get_bound(c, type, pos);
+ isl_constraint_free(c);
+ return isl_qpolynomial_from_aff(aff);
}
/* For each 0 <= i < "n", replace variable "first" + i of type "type"
qp = isl_qpolynomial_cow(qp);
if (!qp)
return NULL;
+
+ if (type == isl_dim_out)
+ isl_die(qp->dim->ctx, isl_error_invalid,
+ "cannot substitute output/set dimension",
+ goto error);
+ if (type == isl_dim_in)
+ type = isl_dim_set;
+
for (i = 0; i < n; ++i)
if (!subs[i])
goto error;
- isl_assert(qp->dim->ctx, first + n <= isl_dim_size(qp->dim, type),
+ isl_assert(qp->dim->ctx, first + n <= isl_space_dim(qp->dim, type),
goto error);
for (i = 0; i < n; ++i)
- isl_assert(qp->dim->ctx, isl_dim_equal(qp->dim, subs[i]->dim),
+ isl_assert(qp->dim->ctx, isl_space_is_equal(qp->dim, subs[i]->dim),
goto error);
isl_assert(qp->dim->ctx, qp->div->n_row == 0, goto error);
int (*fn)(__isl_take isl_basic_set *bset,
__isl_take isl_qpolynomial *poly, void *user), void *user)
{
- isl_dim *dim;
+ isl_space *dim;
isl_mat *div;
isl_qpolynomial *poly;
user);
div = isl_mat_copy(qp->div);
- dim = isl_dim_copy(qp->dim);
- dim = isl_dim_add(dim, isl_dim_set, qp->div->n_row);
+ dim = isl_space_copy(qp->dim);
+ 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);
if (!poly)
return -2;
- ovar = isl_dim_offset(poly->dim, isl_dim_set);
- nvar = isl_dim_size(poly->dim, isl_dim_set);
+ ovar = isl_space_offset(poly->dim, isl_dim_set);
+ nvar = isl_space_dim(poly->dim, isl_dim_set);
return isl_upoly_degree(poly->upoly, ovar, ovar + nvar);
}
if (!qp)
return NULL;
- isl_assert(qp->div->ctx, t_pos < isl_dim_size(qp->dim, type),
+ if (type == isl_dim_out)
+ isl_die(qp->div->ctx, isl_error_invalid,
+ "output/set dimension does not have a coefficient",
+ return NULL);
+ if (type == isl_dim_in)
+ type = isl_dim_set;
+
+ isl_assert(qp->div->ctx, t_pos < isl_space_dim(qp->dim, type),
return NULL);
g_pos = pos(qp->dim, type) + t_pos;
up = isl_upoly_coeff(qp->upoly, g_pos, deg);
- c = isl_qpolynomial_alloc(isl_dim_copy(qp->dim), qp->div->n_row, up);
+ c = isl_qpolynomial_alloc(isl_space_copy(qp->dim), qp->div->n_row, up);
if (!c)
return NULL;
isl_mat_free(c->div);
if (deg < -1)
goto error;
- poly = isl_qpolynomial_insert_dims(poly, isl_dim_set, 0, 1);
+ poly = isl_qpolynomial_insert_dims(poly, isl_dim_in, 0, 1);
poly = isl_qpolynomial_cow(poly);
if (!poly)
goto error;
- ovar = isl_dim_offset(poly->dim, isl_dim_set);
- nvar = isl_dim_size(poly->dim, isl_dim_set);
+ ovar = isl_space_offset(poly->dim, isl_dim_set);
+ nvar = isl_space_dim(poly->dim, isl_dim_set);
poly->upoly = isl_upoly_homogenize(poly->upoly, 0, deg,
ovar, ovar + nvar);
if (!poly->upoly)
return NULL;
}
-__isl_give isl_term *isl_term_alloc(__isl_take isl_dim *dim,
+__isl_give isl_term *isl_term_alloc(__isl_take isl_space *dim,
__isl_take isl_mat *div)
{
isl_term *term;
if (!dim || !div)
goto error;
- n = isl_dim_total(dim) + div->n_row;
+ n = isl_space_dim(dim, isl_dim_all) + div->n_row;
term = isl_calloc(dim->ctx, struct isl_term,
sizeof(struct isl_term) + (n - 1) * sizeof(int));
return term;
error:
- isl_dim_free(dim);
+ isl_space_free(dim);
isl_mat_free(div);
return NULL;
}
isl_term *dup;
unsigned total;
- if (term)
+ if (!term)
return NULL;
- total = isl_dim_total(term->dim) + term->div->n_row;
+ total = isl_space_dim(term->dim, isl_dim_all) + term->div->n_row;
- dup = isl_term_alloc(isl_dim_copy(term->dim), isl_mat_copy(term->div));
+ dup = isl_term_alloc(isl_space_copy(term->dim), isl_mat_copy(term->div));
if (!dup)
return NULL;
if (--term->ref > 0)
return;
- isl_dim_free(term->dim);
+ isl_space_free(term->dim);
isl_mat_free(term->div);
isl_int_clear(term->n);
isl_int_clear(term->d);
switch (type) {
case isl_dim_param:
case isl_dim_in:
- case isl_dim_out: return isl_dim_size(term->dim, type);
+ case isl_dim_out: return isl_space_dim(term->dim, type);
case isl_dim_div: return term->div->n_row;
- case isl_dim_all: return isl_dim_total(term->dim) + term->div->n_row;
+ case isl_dim_all: return isl_space_dim(term->dim, isl_dim_all) +
+ term->div->n_row;
default: return 0;
}
}
isl_assert(term->dim->ctx, pos < isl_term_dim(term, type), return -1);
if (type >= isl_dim_set)
- pos += isl_dim_size(term->dim, isl_dim_param);
+ pos += isl_space_dim(term->dim, isl_dim_param);
if (type >= isl_dim_div)
- pos += isl_dim_size(term->dim, isl_dim_set);
+ pos += isl_space_dim(term->dim, isl_dim_set);
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;
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_dim(isl_dim_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,
if (!qp)
return -1;
- term = isl_term_alloc(isl_dim_copy(qp->dim), isl_mat_copy(qp->div));
+ term = isl_term_alloc(isl_space_copy(qp->dim), isl_mat_copy(qp->div));
if (!term)
return -1;
if (!term)
return NULL;
- n = isl_dim_total(term->dim) + term->div->n_row;
+ n = isl_space_dim(term->dim, isl_dim_all) + term->div->n_row;
up = isl_upoly_rat_cst(term->dim->ctx, term->n, term->d);
for (i = 0; i < n; ++i) {
isl_upoly_var_pow(term->dim->ctx, i, term->pow[i]));
}
- qp = isl_qpolynomial_alloc(isl_dim_copy(term->dim), term->div->n_row, up);
+ qp = isl_qpolynomial_alloc(isl_space_copy(term->dim), term->div->n_row, up);
if (!qp)
goto error;
isl_mat_free(qp->div);
}
__isl_give isl_qpolynomial *isl_qpolynomial_lift(__isl_take isl_qpolynomial *qp,
- __isl_take isl_dim *dim)
+ __isl_take isl_space *dim)
{
int i;
int extra;
if (!qp || !dim)
goto error;
- if (isl_dim_equal(qp->dim, dim)) {
- isl_dim_free(dim);
+ if (isl_space_is_equal(qp->dim, dim)) {
+ isl_space_free(dim);
return qp;
}
if (!qp)
goto error;
- extra = isl_dim_size(dim, isl_dim_set) -
- isl_dim_size(qp->dim, isl_dim_set);
- total = isl_dim_total(qp->dim);
+ extra = isl_space_dim(dim, isl_dim_set) -
+ isl_space_dim(qp->dim, isl_dim_set);
+ total = isl_space_dim(qp->dim, isl_dim_all);
if (qp->div->n_row) {
int *exp;
for (i = 0; i < qp->div->n_row; ++i)
isl_seq_clr(qp->div->row[i] + 2 + total, extra);
- isl_dim_free(qp->dim);
+ isl_space_free(qp->dim);
qp->dim = dim;
return qp;
error:
- isl_dim_free(dim);
+ isl_space_free(dim);
isl_qpolynomial_free(qp);
return NULL;
}
if (!set || !qp)
goto error;
- d = isl_dim_total(set->dim);
+ d = isl_space_dim(set->dim, isl_dim_all);
active = isl_calloc_array(set->ctx, int, d);
if (set_active(qp, active) < 0)
goto error;
return set;
}
- nparam = isl_dim_size(set->dim, isl_dim_param);
- nvar = isl_dim_size(set->dim, isl_dim_set);
+ nparam = isl_space_dim(set->dim, isl_dim_param);
+ nvar = isl_space_dim(set->dim, isl_dim_set);
for (i = 0; i < nparam; ++i) {
if (active[i])
continue;
if (isl_set_foreach_point(set, opt_fn, &data) < 0)
goto error;
- if (data.first)
- data.opt = isl_qpolynomial_zero(isl_qpolynomial_get_dim(qp));
+ if (data.first) {
+ isl_space *space = isl_qpolynomial_get_domain_space(qp);
+ data.opt = isl_qpolynomial_zero_on_domain(space);
+ }
isl_set_free(set);
isl_qpolynomial_free(qp);
return NULL;
}
-__isl_give isl_qpolynomial *isl_qpolynomial_morph(__isl_take isl_qpolynomial *qp,
- __isl_take isl_morph *morph)
+__isl_give isl_qpolynomial *isl_qpolynomial_morph_domain(
+ __isl_take isl_qpolynomial *qp, __isl_take isl_morph *morph)
{
int i;
int n_sub;
isl_ctx *ctx;
- struct isl_upoly *up;
- unsigned n_div;
struct isl_upoly **subs;
- isl_mat *mat;
+ isl_mat *mat, *diag;
qp = isl_qpolynomial_cow(qp);
if (!qp || !morph)
goto error;
ctx = qp->dim->ctx;
- isl_assert(ctx, isl_dim_equal(qp->dim, morph->dom->dim), goto error);
+ isl_assert(ctx, isl_space_is_equal(qp->dim, morph->dom->dim), goto error);
n_sub = morph->inv->n_row - 1;
if (morph->inv->n_row != morph->inv->n_col)
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_dim_free(qp->dim);
- qp->dim = isl_dim_copy(morph->ran->dim);
+ isl_space_free(qp->dim);
+ qp->dim = isl_space_copy(morph->ran->dim);
if (!qp->upoly || !qp->div || !qp->dim)
goto 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_dim_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
if (!div || !r)
goto error;
- extra = isl_dim_total(r->dim) + div->n_row - r->len;
+ extra = isl_space_dim(r->dim, isl_dim_all) + div->n_row - r->len;
mat = isl_mat_alloc(div->ctx, div->n_row, div->n_col + extra);
if (!mat)
goto error;
/* Reorder the dimension of "qp" according to the given reordering.
*/
-__isl_give isl_qpolynomial *isl_qpolynomial_realign(
+__isl_give isl_qpolynomial *isl_qpolynomial_realign_domain(
__isl_take isl_qpolynomial *qp, __isl_take isl_reordering *r)
{
qp = isl_qpolynomial_cow(qp);
if (!qp->upoly)
goto error;
- qp = isl_qpolynomial_reset_dim(qp, isl_dim_copy(r->dim));
+ qp = isl_qpolynomial_reset_domain_space(qp, isl_space_copy(r->dim));
isl_reordering_free(r);
return qp;
return NULL;
}
+__isl_give isl_qpolynomial *isl_qpolynomial_align_params(
+ __isl_take isl_qpolynomial *qp, __isl_take isl_space *model)
+{
+ if (!qp || !model)
+ goto error;
+
+ if (!isl_space_match(qp->dim, isl_dim_param, model, isl_dim_param)) {
+ isl_reordering *exp;
+
+ model = isl_space_drop_dims(model, isl_dim_in,
+ 0, isl_space_dim(model, isl_dim_in));
+ model = isl_space_drop_dims(model, isl_dim_out,
+ 0, isl_space_dim(model, isl_dim_out));
+ exp = isl_parameter_alignment_reordering(qp->dim, model);
+ exp = isl_reordering_extend_space(exp,
+ isl_qpolynomial_get_domain_space(qp));
+ qp = isl_qpolynomial_realign_domain(qp, exp);
+ }
+
+ isl_space_free(model);
+ return qp;
+error:
+ isl_space_free(model);
+ isl_qpolynomial_free(qp);
+ return NULL;
+}
+
struct isl_split_periods_data {
int max_periods;
isl_pw_qpolynomial *res;
* f - m v >= 0
* -f + m v + (m - 1) >= 0
*/
-static __isl_give isl_set *set_div_slice(__isl_take isl_dim *dim,
+static __isl_give isl_set *set_div_slice(__isl_take isl_space *dim,
__isl_keep isl_qpolynomial *qp, int div, isl_int v)
{
int total;
if (!dim || !qp)
goto error;
- total = isl_dim_total(dim);
- bset = isl_basic_set_alloc_dim(isl_dim_copy(dim), 0, 0, 2);
+ total = isl_space_dim(dim, isl_dim_all);
+ bset = isl_basic_set_alloc_space(isl_space_copy(dim), 0, 0, 2);
k = isl_basic_set_alloc_inequality(bset);
if (k < 0)
isl_int_add(bset->ineq[k][0], bset->ineq[k][0], qp->div->row[div][0]);
isl_int_sub_ui(bset->ineq[k][0], bset->ineq[k][0], 1);
- isl_dim_free(dim);
+ isl_space_free(dim);
return isl_set_from_basic_set(bset);
error:
isl_basic_set_free(bset);
- isl_dim_free(dim);
+ isl_space_free(dim);
return NULL;
}
isl_set *slice;
struct isl_upoly *cst;
- slice = set_div_slice(isl_set_get_dim(set), qp, div, v);
+ slice = set_div_slice(isl_set_get_space(set), qp, div, v);
set = isl_set_intersect(set, slice);
if (!qp)
goto error;
- total = isl_dim_total(qp->dim);
+ total = isl_space_dim(qp->dim, isl_dim_all);
for (i = div + 1; i < qp->div->n_row; ++i) {
if (isl_int_is_zero(qp->div->row[i][2 + total + div]))
isl_int_init(min);
isl_int_init(max);
- total = isl_dim_total(qp->dim);
+ total = isl_space_dim(qp->dim, isl_dim_all);
for (i = 0; i < qp->div->n_row; ++i) {
enum isl_lp_result lp_res;
struct isl_split_periods_data data;
data.max_periods = max_periods;
- data.res = isl_pw_qpolynomial_zero(isl_pw_qpolynomial_get_dim(pwqp));
+ data.res = isl_pw_qpolynomial_zero(isl_pw_qpolynomial_get_space(pwqp));
if (isl_pw_qpolynomial_foreach_piece(pwqp, &split_periods, &data) < 0)
goto error;
static __isl_give isl_pw_qpolynomial *constant_on_domain(
__isl_take isl_basic_set *bset, int cst)
{
- isl_dim *dim;
+ isl_space *dim;
isl_qpolynomial *qp;
if (!bset)
return NULL;
- bset = isl_basic_map_domain(isl_basic_map_from_range(bset));
- dim = isl_basic_set_get_dim(bset);
+ bset = isl_basic_set_params(bset);
+ dim = isl_basic_set_get_space(bset);
if (cst < 0)
- qp = isl_qpolynomial_infty(dim);
+ qp = isl_qpolynomial_infty_on_domain(dim);
else if (cst == 0)
- qp = isl_qpolynomial_zero(dim);
+ qp = isl_qpolynomial_zero_on_domain(dim);
else
- qp = isl_qpolynomial_one(dim);
+ qp = isl_qpolynomial_one_on_domain(dim);
return isl_pw_qpolynomial_alloc(isl_set_from_basic_set(bset), qp);
}
__isl_give isl_pw_qpolynomial *(*fn)(__isl_take isl_basic_set *bset))
{
int i, n;
- isl_dim *dim;
+ isl_space *dim;
isl_set *set;
isl_factorizer *f;
isl_qpolynomial *qp;
nparam = isl_basic_set_dim(bset, isl_dim_param);
nvar = isl_basic_set_dim(bset, isl_dim_set);
- dim = isl_basic_set_get_dim(bset);
- dim = isl_dim_domain(dim);
- set = isl_set_universe(isl_dim_copy(dim));
- qp = isl_qpolynomial_one(dim);
+ dim = isl_basic_set_get_space(bset);
+ dim = isl_space_domain(dim);
+ set = isl_set_universe(isl_space_copy(dim));
+ qp = isl_qpolynomial_one_on_domain(dim);
pwqp = isl_pw_qpolynomial_alloc(set, qp);
bset = isl_morph_basic_set(isl_morph_copy(f->morph), bset);
int bounded;
isl_morph *morph;
isl_pw_qpolynomial *pwqp;
- unsigned orig_nvar, final_nvar;
if (!bset)
return NULL;
- if (isl_basic_set_fast_is_empty(bset))
+ if (isl_basic_set_plain_is_empty(bset))
return constant_on_domain(bset, 0);
- orig_nvar = isl_basic_set_dim(bset, isl_dim_set);
-
- if (orig_nvar == 0)
+ if (isl_basic_set_dim(bset, isl_dim_set) == 0)
return constant_on_domain(bset, 1);
bounded = isl_basic_set_is_bounded(bset);
morph = isl_basic_set_full_compression(bset);
bset = isl_morph_basic_set(isl_morph_copy(morph), bset);
- final_nvar = isl_basic_set_dim(bset, isl_dim_set);
-
pwqp = compressed_multiplicative_call(bset, fn);
- morph = isl_morph_remove_dom_dims(morph, isl_dim_set, 0, orig_nvar);
- morph = isl_morph_remove_ran_dims(morph, isl_dim_set, 0, final_nvar);
+ morph = isl_morph_dom_params(morph);
+ morph = isl_morph_ran_params(morph);
morph = isl_morph_inverse(morph);
- pwqp = isl_pw_qpolynomial_morph(pwqp, morph);
+ pwqp = isl_pw_qpolynomial_morph_domain(pwqp, morph);
return pwqp;
error:
if (!qp->div)
goto error;
- total = isl_dim_total(qp->dim);
+ total = isl_space_dim(qp->dim, isl_dim_all);
v = isl_vec_alloc(qp->div->ctx, qp->div->n_col - 1);
for (i = 0; i < qp->div->n_row; ++i) {
return NULL;
data.sign = sign;
- data.res = isl_pw_qpolynomial_zero(isl_pw_qpolynomial_get_dim(pwqp));
+ data.res = isl_pw_qpolynomial_zero(isl_pw_qpolynomial_get_space(pwqp));
for (i = 0; i < pwqp->n; ++i) {
if (pwqp->p[i].qp->div->n_row == 0) {
isl_union_pw_qpolynomial_free(upwqp);
return NULL;
}
+
+__isl_give isl_basic_map *isl_basic_map_from_qpolynomial(
+ __isl_take isl_qpolynomial *qp)
+{
+ int i, k;
+ isl_space *dim;
+ isl_vec *aff = NULL;
+ isl_basic_map *bmap = NULL;
+ unsigned pos;
+ unsigned n_div;
+
+ if (!qp)
+ return NULL;
+ if (!isl_upoly_is_affine(qp->upoly))
+ isl_die(qp->dim->ctx, isl_error_invalid,
+ "input quasi-polynomial not affine", goto error);
+ aff = isl_qpolynomial_extract_affine(qp);
+ if (!aff)
+ goto error;
+ dim = isl_qpolynomial_get_space(qp);
+ pos = 1 + isl_space_offset(dim, isl_dim_out);
+ n_div = qp->div->n_row;
+ bmap = isl_basic_map_alloc_space(dim, n_div, 1, 2 * n_div);
+
+ for (i = 0; i < n_div; ++i) {
+ k = isl_basic_map_alloc_div(bmap);
+ if (k < 0)
+ goto error;
+ isl_seq_cpy(bmap->div[k], qp->div->row[i], qp->div->n_col);
+ isl_int_set_si(bmap->div[k][qp->div->n_col], 0);
+ if (isl_basic_map_add_div_constraints(bmap, k) < 0)
+ goto error;
+ }
+ k = isl_basic_map_alloc_equality(bmap);
+ if (k < 0)
+ goto error;
+ isl_int_neg(bmap->eq[k][pos], aff->el[0]);
+ isl_seq_cpy(bmap->eq[k], aff->el + 1, pos);
+ isl_seq_cpy(bmap->eq[k] + pos + 1, aff->el + 1 + pos, n_div);
+
+ isl_vec_free(aff);
+ isl_qpolynomial_free(qp);
+ bmap = isl_basic_map_finalize(bmap);
+ return bmap;
+error:
+ isl_vec_free(aff);
+ isl_qpolynomial_free(qp);
+ isl_basic_map_free(bmap);
+ return NULL;
+}
projects / platform / upstream / isl.git / blobdiff