isl_basic_set_sample: break early if sample found in basic_set_range

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

diff --git a/isl_map.c b/isl_map.c
index 818d462..f7efcb7 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -388,7 +388,7 @@ struct isl_basic_map *isl_basic_map_dup(struct isl_basic_map *bmap)
                return NULL;
        dup_constraints(dup, bmap);
        dup->flags = bmap->flags;
-       dup->sample = isl_vec_copy(bmap->ctx, bmap->sample);
+       dup->sample = isl_vec_copy(bmap->sample);
        return dup;
 }
 
@@ -455,7 +455,7 @@ void isl_basic_map_free(struct isl_basic_map *bmap)
        isl_blk_free(bmap->ctx, bmap->block2);
        free(bmap->ineq);
        isl_blk_free(bmap->ctx, bmap->block);
-       isl_vec_free(bmap->ctx, bmap->sample);
+       isl_vec_free(bmap->sample);
        isl_dim_free(bmap->dim);
        free(bmap);
 }
@@ -1618,7 +1618,7 @@ static int basic_map_contains(struct isl_basic_map *bmap, struct isl_vec *vec)
        isl_int_init(s);
 
        for (i = 0; i < bmap->n_eq; ++i) {
-               isl_seq_inner_product(vec->block.data, bmap->eq[i], total, &s);
+               isl_seq_inner_product(vec->el, bmap->eq[i], total, &s);
                if (!isl_int_is_zero(s)) {
                        isl_int_clear(s);
                        return 0;
@@ -1626,7 +1626,7 @@ static int basic_map_contains(struct isl_basic_map *bmap, struct isl_vec *vec)
        }
 
        for (i = 0; i < bmap->n_ineq; ++i) {
-               isl_seq_inner_product(vec->block.data, bmap->ineq[i], total, &s);
+               isl_seq_inner_product(vec->el, bmap->ineq[i], total, &s);
                if (isl_int_is_neg(s)) {
                        isl_int_clear(s);
                        return 0;
@@ -1667,11 +1667,11 @@ struct isl_basic_map *isl_basic_map_intersect(
        if (bmap1->sample &&
            basic_map_contains(bmap1, bmap1->sample) > 0 &&
            basic_map_contains(bmap2, bmap1->sample) > 0)
-               sample = isl_vec_copy(bmap1->ctx, bmap1->sample);
+               sample = isl_vec_copy(bmap1->sample);
        else if (bmap2->sample &&
            basic_map_contains(bmap1, bmap2->sample) > 0 &&
            basic_map_contains(bmap2, bmap2->sample) > 0)
-               sample = isl_vec_copy(bmap2->ctx, bmap2->sample);
+               sample = isl_vec_copy(bmap2->sample);
 
        bmap1 = isl_basic_map_cow(bmap1);
        bmap1 = isl_basic_map_extend_dim(bmap1, isl_dim_copy(bmap1->dim),
@@ -1681,7 +1681,7 @@ struct isl_basic_map *isl_basic_map_intersect(
        bmap1 = add_constraints(bmap1, bmap2, 0, 0);
 
        if (sample) {
-               isl_vec_free(bmap1->ctx, bmap1->sample);
+               isl_vec_free(bmap1->sample);
                bmap1->sample = sample;
        }
 
@@ -1689,7 +1689,7 @@ struct isl_basic_map *isl_basic_map_intersect(
        return isl_basic_map_finalize(bmap1);
 error:
        if (sample)
-               isl_vec_free(bmap1->ctx, sample);
+               isl_vec_free(sample);
        isl_basic_map_free(bmap1);
        isl_basic_map_free(bmap2);
        return NULL;
@@ -1830,7 +1830,7 @@ error:
        return NULL;
 }
 
-struct isl_basic_map *add_divs(struct isl_basic_map *bmap, unsigned n)
+static struct isl_basic_map *add_divs(struct isl_basic_map *bmap, unsigned n)
 {
        int i, j;
 
@@ -2944,6 +2944,11 @@ error:
        return NULL;
 }
 
+/* If bmap contains any unknown divs, then compute explicit
+ * expressions for them.  However, this computation may be
+ * quite expensive, so first try to remove divs that aren't
+ * strictly needed.
+ */
 struct isl_map *isl_basic_map_compute_divs(struct isl_basic_map *bmap)
 {
        int i;
@@ -2954,11 +2959,22 @@ struct isl_map *isl_basic_map_compute_divs(struct isl_basic_map *bmap)
        off = isl_dim_total(bmap->dim);
        for (i = 0; i < bmap->n_div; ++i) {
                if (isl_int_is_zero(bmap->div[i][0]))
-                       return isl_pip_basic_map_compute_divs(bmap);
+                       break;
                isl_assert(bmap->ctx, isl_int_is_zero(bmap->div[i][1+1+off+i]),
                                goto error);
        }
-       return isl_map_from_basic_map(bmap);
+       if (i == bmap->n_div)
+               return isl_map_from_basic_map(bmap);
+       bmap = isl_basic_map_drop_redundant_divs(bmap);
+       if (!bmap)
+               goto error;
+       for (i = 0; i < bmap->n_div; ++i)
+               if (isl_int_is_zero(bmap->div[i][0]))
+                       break;
+       if (i == bmap->n_div)
+               return isl_map_from_basic_map(bmap);
+       struct isl_map *map = isl_pip_basic_map_compute_divs(bmap);
+       return map;
 error:
        isl_basic_map_free(bmap);
        return NULL;
@@ -3507,6 +3523,8 @@ int isl_basic_map_is_empty(struct isl_basic_map *bmap)
                if (contains)
                        return 0;
        }
+       isl_vec_free(bmap->sample);
+       bmap->sample = NULL;
        bset = isl_basic_map_underlying_set(isl_basic_map_copy(bmap));
        if (!bset)
                return -1;
@@ -3514,9 +3532,10 @@ int isl_basic_map_is_empty(struct isl_basic_map *bmap)
        if (!sample)
                return -1;
        empty = sample->size == 0;
-       if (bmap->sample)
-               isl_vec_free(bmap->ctx, bmap->sample);
+       isl_vec_free(bmap->sample);
        bmap->sample = sample;
+       if (empty)
+               ISL_F_SET(bmap, ISL_BASIC_MAP_EMPTY);
 
        return empty;
 }
@@ -3581,7 +3600,7 @@ static struct isl_basic_map *order_divs(struct isl_basic_map *bmap)
                                                            bmap->n_div-i);
                if (pos == -1)
                        continue;
-               swap_div(bmap, i, pos);
+               swap_div(bmap, i, i + pos);
                --i;
        }
        return bmap;
@@ -4002,7 +4021,7 @@ int isl_basic_set_compare_at(struct isl_basic_set *bset1,
        isl_int_clear(num);
        isl_int_clear(den);
        isl_basic_map_free(bmap1);
-       isl_vec_free(ctx, obj);
+       isl_vec_free(obj);
        return cmp;
 error:
        isl_basic_map_free(bmap1);