return bmap;
tab = isl_tab_from_basic_map(bmap);
- tab = isl_tab_detect_equalities(bmap->ctx, tab);
+ tab = isl_tab_detect_implicit_equalities(tab);
bmap = isl_basic_map_update_from_tab(bmap, tab);
- isl_tab_free(bmap->ctx, tab);
+ isl_tab_free(tab);
bmap = isl_basic_map_gauss(bmap, NULL);
ISL_F_SET(bmap, ISL_BASIC_MAP_NO_IMPLICIT);
return bmap;
isl_basic_map_implicit_equalities((struct isl_basic_map*)bset);
}
+struct isl_map *isl_map_implicit_equalities(struct isl_map *map)
+{
+ int i;
+
+ if (!map)
+ return map;
+
+ for (i = 0; i < map->n; ++i) {
+ map->p[i] = isl_basic_map_implicit_equalities(map->p[i]);
+ if (!map->p[i])
+ goto error;
+ }
+
+ return map;
+error:
+ isl_map_free(map);
+ return NULL;
+}
+
/* Make eq[row][col] of both bmaps equal so we can add the row
* add the column to the common matrix.
* Note that because of the echelon form, the columns of row row
}
}
isl_basic_set_free(bset2);
- isl_assert(ctx, row == bset1->n_eq, goto error);
+ isl_assert(bset1->ctx, row == bset1->n_eq, goto error);
bset1 = isl_basic_set_normalize_constraints(bset1);
return bset1;
error:
return NULL;
}
-static struct isl_basic_set *isl_basic_set_from_vec(struct isl_ctx *ctx,
- struct isl_vec *vec)
-{
- int i;
- int k;
- struct isl_basic_set *bset = NULL;
- unsigned dim;
-
- if (!vec)
- return NULL;
- isl_assert(ctx, vec->size != 0, goto error);
-
- bset = isl_basic_set_alloc(ctx, 0, vec->size - 1, 0, vec->size - 1, 0);
- if (!bset)
- goto error;
- dim = isl_basic_set_n_dim(bset);
- for (i = dim - 1; i >= 0; --i) {
- k = isl_basic_set_alloc_equality(bset);
- if (k < 0)
- goto error;
- isl_seq_clr(bset->eq[k], 1 + dim);
- isl_int_neg(bset->eq[k][0], vec->block.data[1 + i]);
- isl_int_set(bset->eq[k][1 + i], vec->block.data[0]);
- }
- isl_vec_free(ctx, vec);
-
- return bset;
-error:
- isl_basic_set_free(bset);
- isl_vec_free(ctx, vec);
- return NULL;
-}
-
/* Find an integer point in "bset" that lies outside of the equality
* "eq" e(x) = 0.
* If "up" is true, look for a point satisfying e(x) - 1 >= 0.
* adding the normal of the constraint to one of the known
* integer points in the basic set yields another point
* inside the basic set.
+ *
+ * The caller of this function ensures that "bset" is bounded.
*/
static struct isl_basic_set *outside_point(struct isl_ctx *ctx,
struct isl_basic_set *bset, isl_int *eq, int up)
ctx->one, bset->sample->block.data + 1,
up ? ctx->one : ctx->negone, eq + 1, dim);
if (isl_basic_set_contains(bset, sample))
- return isl_basic_set_from_vec(ctx, sample);
- isl_vec_free(ctx, sample);
+ return isl_basic_set_from_vec(sample);
+ isl_vec_free(sample);
sample = NULL;
slice = isl_basic_set_copy(bset);
isl_seq_neg(slice->ineq[k], eq, 1 + dim);
isl_int_sub_ui(slice->ineq[k][0], slice->ineq[k][0], 1);
- sample = isl_basic_set_sample(slice);
+ sample = isl_basic_set_sample_bounded(slice);
if (!sample)
goto error;
if (sample->size == 0) {
- isl_vec_free(ctx, sample);
+ isl_vec_free(sample);
point = isl_basic_set_empty_like(bset);
} else
- point = isl_basic_set_from_vec(ctx, sample);
+ point = isl_basic_set_from_vec(sample);
return point;
error:
return NULL;
}
-static struct isl_basic_set *recession_cone(struct isl_basic_set *bset)
+struct isl_basic_set *isl_basic_set_recession_cone(struct isl_basic_set *bset)
{
int i;
bset = isl_basic_set_cow(bset);
if (!bset)
return NULL;
+ isl_assert(bset->ctx, bset->n_div == 0, goto error);
for (i = 0; i < bset->n_eq; ++i)
isl_int_set_si(bset->eq[i][0], 0);
ISL_F_CLR(bset, ISL_BASIC_SET_NO_IMPLICIT);
return isl_basic_set_implicit_equalities(bset);
+error:
+ isl_basic_set_free(bset);
+ return NULL;
}
-static struct isl_basic_set *shift(struct isl_basic_set *bset, isl_int *point)
+/* Extend an initial (under-)approximation of the affine hull of "bset"
+ * by looking for points that do not satisfy one of the equalities
+ * in the current approximation and adding them to that approximation
+ * until no such points can be found any more.
+ *
+ * The caller of this function ensures that "bset" is bounded.
+ */
+static struct isl_basic_set *extend_affine_hull(struct isl_basic_set *bset,
+ struct isl_basic_set *hull)
{
- int i;
+ int i, j, k;
+ struct isl_ctx *ctx;
unsigned dim;
- bset = isl_basic_set_cow(bset);
+ ctx = bset->ctx;
+ dim = isl_basic_set_n_dim(bset);
+ for (i = 0; i < dim; ++i) {
+ struct isl_basic_set *point;
+ for (j = 0; j < hull->n_eq; ++j) {
+ point = outside_point(ctx, bset, hull->eq[j], 1);
+ if (!point)
+ goto error;
+ if (!ISL_F_ISSET(point, ISL_BASIC_SET_EMPTY))
+ break;
+ isl_basic_set_free(point);
+ point = outside_point(ctx, bset, hull->eq[j], 0);
+ if (!point)
+ goto error;
+ if (!ISL_F_ISSET(point, ISL_BASIC_SET_EMPTY))
+ break;
+ isl_basic_set_free(point);
+
+ bset = isl_basic_set_extend_constraints(bset, 1, 0);
+ k = isl_basic_set_alloc_equality(bset);
+ if (k < 0)
+ goto error;
+ isl_seq_cpy(bset->eq[k], hull->eq[j],
+ 1 + isl_basic_set_total_dim(hull));
+ bset = isl_basic_set_gauss(bset, NULL);
+ if (!bset)
+ goto error;
+ }
+ if (j == hull->n_eq)
+ break;
+ hull = affine_hull(hull, point);
+ }
+ isl_basic_set_free(bset);
+
+ return hull;
+error:
+ isl_basic_set_free(bset);
+ isl_basic_set_free(hull);
+ return NULL;
+}
+
+/* Drop all constraints in bset that involve any of the dimensions
+ * first to first+n-1.
+ */
+static struct isl_basic_set *drop_constraints_involving
+ (struct isl_basic_set *bset, unsigned first, unsigned n)
+{
+ int i;
+
if (!bset)
return NULL;
- dim = isl_basic_set_n_dim(bset);
- for (i = 0; i < bset->n_eq; ++i) {
- isl_seq_inner_product(bset->eq[i]+1, point+1, dim,
- &bset->eq[i][0]);
- isl_int_neg(bset->eq[i][0], bset->eq[i][0]);
+ bset = isl_basic_set_cow(bset);
+
+ for (i = bset->n_eq - 1; i >= 0; --i) {
+ if (isl_seq_first_non_zero(bset->eq[i] + 1 + first, n) == -1)
+ continue;
+ isl_basic_set_drop_equality(bset, i);
}
- for (i = 0; i < bset->n_ineq; ++i) {
- isl_seq_inner_product(bset->ineq[i]+1, point+1, dim,
- &bset->ineq[i][0]);
- isl_int_neg(bset->ineq[i][0], bset->ineq[i][0]);
+ for (i = bset->n_ineq - 1; i >= 0; --i) {
+ if (isl_seq_first_non_zero(bset->ineq[i] + 1 + first, n) == -1)
+ continue;
+ isl_basic_set_drop_inequality(bset, i);
}
return bset;
}
+/* Compute the affine hull of "bset", where "hull" is an initial approximation
+ * with only a single point of "bset" and "cone" is the recession cone
+ * of "bset".
+ *
+ * We first compute a unimodular transformation that puts the unbounded
+ * directions in the last dimensions. In particular, we take a transformation
+ * that maps all equalities to equalities (in HNF) on the first dimensions.
+ * Let x be the original dimensions and y the transformed, with y_1 bounded
+ * and y_2 unbounded.
+ *
+ * [ y_1 ] [ y_1 ] [ Q_1 ]
+ * x = U [ y_2 ] [ y_2 ] = [ Q_2 ] x
+ *
+ * Let's call the input basic set S and the initial hull H.
+ * We compute S' = preimage(S, U) and H' = preimage(H, U)
+ * and drop the final dimensions including any constraints involving them.
+ * This results in sets S'' and H''.
+ * Then we extend H'' to the affine hull A'' of S''.
+ * Let F y_1 >= g be the constraint system of A''. In the transformed
+ * space the y_2 are unbounded, so we can add them back without any constraints,
+ * resulting in
+ *
+ * [ y_1 ]
+ * [ F 0 ] [ y_2 ] >= g
+ * or
+ * [ Q_1 ]
+ * [ F 0 ] [ Q_2 ] x >= g
+ * or
+ * F Q_1 x >= g
+ *
+ * The affine hull in the original space is then obtained as
+ * A = preimage(A'', Q_1).
+ */
+static struct isl_basic_set *affine_hull_with_cone(struct isl_basic_set *bset,
+ struct isl_basic_set *hull, struct isl_basic_set *cone)
+{
+ unsigned total;
+ unsigned cone_dim;
+ struct isl_mat *M, *U, *Q;
+
+ if (!bset || !hull || !cone)
+ goto error;
+
+ total = isl_basic_set_total_dim(cone);
+ cone_dim = total - cone->n_eq;
+
+ M = isl_mat_sub_alloc(bset->ctx, cone->eq, 0, cone->n_eq, 1, total);
+ M = isl_mat_left_hermite(M, 0, &U, &Q);
+ if (!M)
+ goto error;
+ isl_mat_free(M);
+
+ U = isl_mat_lin_to_aff(U);
+ bset = isl_basic_set_preimage(bset, isl_mat_copy(U));
+ hull = isl_basic_set_preimage(hull, U);
+
+ bset = drop_constraints_involving(bset, total - cone_dim, cone_dim);
+ bset = isl_basic_set_drop_dims(bset, total - cone_dim, cone_dim);
+ hull = drop_constraints_involving(hull, total - cone_dim, cone_dim);
+ hull = isl_basic_set_drop_dims(hull, total - cone_dim, cone_dim);
+
+ Q = isl_mat_lin_to_aff(Q);
+ Q = isl_mat_drop_rows(Q, 1 + total - cone_dim, cone_dim);
+
+ if (bset && bset->sample)
+ bset->sample = isl_mat_vec_product(isl_mat_copy(Q), bset->sample);
+
+ hull = extend_affine_hull(bset, hull);
+
+ hull = isl_basic_set_preimage(hull, Q);
+
+ isl_basic_set_free(cone);
+
+ return hull;
+error:
+ isl_basic_set_free(bset);
+ isl_basic_set_free(hull);
+ isl_basic_set_free(cone);
+ return NULL;
+}
+
/* Look for all equalities satisfied by the integer points in bset,
- * which is assume not to have any explicit equalities.
+ * which is assumed not to have any explicit equalities.
*
* The equalities are obtained by successively looking for
* a point that is affinely independent of the points found so far.
* we check if there is any point on a hyperplane parallel to the
* corresponding hyperplane shifted by at least one (in either direction).
*
- * Before looking for any outside points, we first remove the equalities
- * that correspond to the affine hull of the recession cone.
- * These equalities will never be equalities over the whols basic set.
+ * Before looking for any outside points, we first compute the recession
+ * cone. The directions of this recession cone will always be part
+ * of the affine hull, so there is no need for looking for any points
+ * in these directions.
+ * In particular, if the recession cone is full-dimensional, then
+ * the affine hull is simply the whole universe.
*/
static struct isl_basic_set *uset_affine_hull(struct isl_basic_set *bset)
{
- int i, j;
struct isl_basic_set *hull = NULL;
- struct isl_vec *sample;
- struct isl_ctx *ctx;
- unsigned dim;
+ struct isl_vec *sample = NULL;
+ struct isl_basic_set *cone;
if (isl_basic_set_is_empty(bset))
return bset;
- ctx = bset->ctx;
- sample = isl_basic_set_sample(isl_basic_set_copy(bset));
+ sample = isl_basic_set_sample_vec(isl_basic_set_copy(bset));
if (!sample)
goto error;
if (sample->size == 0) {
- isl_vec_free(ctx, sample);
+ isl_vec_free(sample);
hull = isl_basic_set_empty_like(bset);
isl_basic_set_free(bset);
return hull;
- } else
- hull = isl_basic_set_from_vec(ctx, sample);
-
- if (hull->n_eq > 0) {
- struct isl_basic_set *cone;
- cone = recession_cone(isl_basic_set_copy(bset));
- isl_basic_set_free_inequality(cone, cone->n_ineq);
- cone = isl_basic_set_normalize_constraints(cone);
- cone = shift(cone, bset->sample->block.data);
- hull = affine_hull(hull, cone);
+ }
+ if (sample->size == 1) {
+ isl_vec_free(sample);
+ return bset;
}
- dim = isl_basic_set_n_dim(bset);
- for (i = 0; i < dim; ++i) {
- struct isl_basic_set *point;
- for (j = 0; j < hull->n_eq; ++j) {
- point = outside_point(ctx, bset, hull->eq[j], 1);
- if (!point)
- goto error;
- if (!ISL_F_ISSET(point, ISL_BASIC_SET_EMPTY))
- break;
- isl_basic_set_free(point);
- point = outside_point(ctx, bset, hull->eq[j], 0);
- if (!point)
- goto error;
- if (!ISL_F_ISSET(point, ISL_BASIC_SET_EMPTY))
- break;
- isl_basic_set_free(point);
- }
- if (j == hull->n_eq)
- break;
- hull = affine_hull(hull, point);
+ cone = isl_basic_set_recession_cone(isl_basic_set_copy(bset));
+ if (!cone)
+ goto error;
+ if (cone->n_eq == 0) {
+ isl_basic_set_free(cone);
+ isl_vec_free(sample);
+ hull = isl_basic_set_universe_like(bset);
+ isl_basic_set_free(bset);
+ return hull;
}
- isl_basic_set_free(bset);
- return hull;
+ hull = isl_basic_set_from_vec(sample);
+ if (cone->n_eq < isl_basic_set_total_dim(cone))
+ return affine_hull_with_cone(bset, hull, cone);
+
+ isl_basic_set_free(cone);
+ return extend_affine_hull(bset, hull);
error:
+ isl_vec_free(sample);
isl_basic_set_free(bset);
isl_basic_set_free(hull);
return NULL;
struct isl_mat *T2 = NULL;
struct isl_basic_set *bset = NULL;
struct isl_basic_set *hull = NULL;
- struct isl_ctx *ctx;
- ctx = bmap->ctx;
bset = isl_basic_map_underlying_set(bmap);
bset = isl_basic_set_remove_equalities(bset, NULL, &T2);
if (!bset)
return hull;
error:
- isl_mat_free(ctx, T2);
+ isl_mat_free(T2);
isl_basic_set_free(bset);
isl_basic_set_free(hull);
return NULL;
hull = equalities_in_underlying_set(isl_basic_map_copy(bmap));
if (!hull)
goto error;
+ if (ISL_F_ISSET(hull, ISL_BASIC_SET_EMPTY)) {
+ isl_basic_set_free(hull);
+ return isl_basic_map_set_to_empty(bmap);
+ }
bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim), 0,
hull->n_eq, 0);
for (i = 0; i < hull->n_eq; ++i) {
return NULL;
}
+__isl_give isl_basic_set *isl_basic_set_detect_equalities(
+ __isl_take isl_basic_set *bset)
+{
+ return (isl_basic_set *)
+ isl_basic_map_detect_equalities((isl_basic_map *)bset);
+}
+
struct isl_map *isl_map_detect_equalities(struct isl_map *map)
{
struct isl_basic_map *bmap;
return NULL;
}
+__isl_give isl_set *isl_set_detect_equalities(__isl_take isl_set *set)
+{
+ return (isl_set *)isl_map_detect_equalities((isl_map *)set);
+}
+
/* After computing the rational affine hull (by detecting the implicit
* equalities), we compute the additional equalities satisfied by
* the integer points (if any) and add the original equalities back in.
*/
struct isl_basic_map *isl_basic_map_affine_hull(struct isl_basic_map *bmap)
{
- struct isl_basic_set *hull = NULL;
-
bmap = isl_basic_map_detect_equalities(bmap);
bmap = isl_basic_map_cow(bmap);
isl_basic_map_free_inequality(bmap, bmap->n_ineq);