extract isl_map_align_divs from isl_affine_hull.c

[platform/upstream/isl.git] / isl_map.c

diff --git a/isl_map.c b/isl_map.c
index 84b9b99..033a1d3 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -19,7 +19,7 @@ static struct isl_basic_map *basic_map_init(struct isl_ctx *ctx,
        size_t row_size = 1 + nparam + n_in + n_out + extra;
 
        bmap->block = isl_blk_alloc(ctx, (n_eq + n_ineq) * row_size);
-       if (!bmap->block.data) {
+       if (isl_blk_is_error(bmap->block)) {
                free(bmap);
                return NULL;
        }
@@ -32,12 +32,11 @@ static struct isl_basic_map *basic_map_init(struct isl_ctx *ctx,
        }
 
        if (extra == 0) {
-               bmap->block2.size = 0;
-               bmap->block2.data = NULL;
+               bmap->block2 = isl_blk_empty();
                bmap->div = NULL;
        } else {
                bmap->block2 = isl_blk_alloc(ctx, extra * (1 + row_size));
-               if (!bmap->block2.data) {
+               if (isl_blk_is_error(bmap->block2)) {
                        free(bmap->eq);
                        isl_blk_free(ctx, bmap->block);
                        free(bmap);
@@ -232,6 +231,12 @@ int isl_basic_map_alloc_equality(struct isl_ctx *ctx,
        return bmap->n_eq++;
 }
 
+int isl_basic_set_alloc_equality(struct isl_ctx *ctx,
+               struct isl_basic_set *bset)
+{
+       return isl_basic_map_alloc_equality(ctx, (struct isl_basic_map *)bset);
+}
+
 int isl_basic_map_free_equality(struct isl_ctx *ctx,
                struct isl_basic_map *bmap, unsigned n)
 {
@@ -274,9 +279,16 @@ int isl_basic_map_alloc_inequality(struct isl_ctx *ctx,
 {
        isl_assert(ctx, (bmap->ineq - bmap->eq) + bmap->n_ineq < bmap->c_size,
                        return -1);
+       F_CLR(bmap, ISL_BASIC_MAP_NO_IMPLICIT);
        return bmap->n_ineq++;
 }
 
+int isl_basic_set_alloc_inequality(struct isl_ctx *ctx,
+               struct isl_basic_set *bset)
+{
+       return isl_basic_map_alloc_inequality(ctx, (struct isl_basic_map *)bset);
+}
+
 int isl_basic_map_free_inequality(struct isl_ctx *ctx,
                struct isl_basic_map *bmap, unsigned n)
 {
@@ -526,7 +538,7 @@ struct isl_basic_set *isl_basic_set_swap_vars(struct isl_ctx *ctx,
                return NULL;
 
        blk = isl_blk_alloc(ctx, bset->dim);
-       if (!blk.data)
+       if (isl_blk_is_error(blk))
                goto error;
 
        for (i = 0; i < bset->n_eq; ++i)
@@ -957,7 +969,7 @@ static struct isl_basic_map *remove_duplicate_divs(struct isl_ctx *ctx,
        if (!index)
                return bmap;
        eq = isl_blk_alloc(ctx, 1+total);
-       if (!eq.data)
+       if (isl_blk_is_error(eq))
                goto out;
 
        isl_seq_clr(eq.data, 1+total);
@@ -2847,6 +2859,23 @@ error:
        return NULL;
 }
 
+struct isl_map *isl_map_align_divs(struct isl_ctx *ctx, struct isl_map *map)
+{
+       int i;
+
+       map = isl_map_compute_divs(ctx, map);
+       map = isl_map_cow(ctx, map);
+       if (!map)
+               return NULL;
+
+       for (i = 1; i < map->n; ++i)
+               map->p[0] = isl_basic_map_align_divs(ctx, map->p[0], map->p[i]);
+       for (i = 1; i < map->n; ++i)
+               map->p[i] = isl_basic_map_align_divs(ctx, map->p[i], map->p[0]);
+
+       return map;
+}
+
 static struct isl_map *add_cut_constraint(struct isl_ctx *ctx,
                struct isl_map *dst,
                struct isl_basic_map *src, isl_int *c,
@@ -3028,3 +3057,33 @@ error:
        isl_map_free(ctx, map);
        return NULL;
 }
+
+/* There is no need to cow as removing empty parts doesn't change
+ * the meaning of the set.
+ */
+struct isl_map *isl_map_remove_empty_parts(struct isl_ctx *ctx,
+       struct isl_map *map)
+{
+       int i;
+
+       if (!map)
+               return NULL;
+
+       for (i = map->n-1; i >= 0; --i) {
+               if (!F_ISSET(map->p[i], ISL_BASIC_MAP_EMPTY))
+                       continue;
+               isl_basic_map_free(ctx, map->p[i]);
+               if (i != map->n-1)
+                       map->p[i] = map->p[map->n-1];
+               map->n--;
+       }
+
+       return map;
+}
+
+struct isl_set *isl_set_remove_empty_parts(struct isl_ctx *ctx,
+       struct isl_set *set)
+{
+       return (struct isl_set *)
+               isl_map_remove_empty_parts(ctx, (struct isl_map *)set);
+}