fix isl_map_lex_ge and isl_map_lex_le in the zero-dimensional case

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

diff --git a/isl_map.c b/isl_map.c
index b91a4a3..5a38cd5 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -116,6 +116,8 @@ static void isl_dim_map_dump(struct isl_dim_map *dim_map)
 unsigned isl_basic_map_dim(const struct isl_basic_map *bmap,
                                enum isl_dim_type type)
 {
+       if (!bmap)
+               return 0;
        switch (type) {
        case isl_dim_param:
        case isl_dim_in:
@@ -162,12 +164,12 @@ unsigned isl_basic_set_dim(const struct isl_basic_set *bset,
 
 unsigned isl_basic_set_n_dim(const struct isl_basic_set *bset)
 {
-       return bset->dim->n_out;
+       return isl_basic_set_dim(bset, isl_dim_set);
 }
 
 unsigned isl_basic_set_n_param(const struct isl_basic_set *bset)
 {
-       return bset->dim->nparam;
+       return isl_basic_set_dim(bset, isl_dim_param);
 }
 
 unsigned isl_basic_set_total_dim(const struct isl_basic_set *bset)
@@ -177,12 +179,12 @@ unsigned isl_basic_set_total_dim(const struct isl_basic_set *bset)
 
 unsigned isl_set_n_dim(const struct isl_set *set)
 {
-       return set->dim->n_out;
+       return isl_set_dim(set, isl_dim_set);
 }
 
 unsigned isl_set_n_param(const struct isl_set *set)
 {
-       return set->dim->nparam;
+       return isl_set_dim(set, isl_dim_param);
 }
 
 unsigned isl_basic_map_n_in(const struct isl_basic_map *bmap)
@@ -1040,10 +1042,13 @@ struct isl_basic_map *isl_basic_map_extend(struct isl_basic_map *base,
                return NULL;
        dim = isl_dim_alloc(base->ctx, nparam, n_in, n_out);
        if (!dim)
-               return NULL;
+               goto error;
 
        bmap = isl_basic_map_extend_dim(base, dim, extra, n_eq, n_ineq);
        return bmap;
+error:
+       isl_basic_map_free(base);
+       return NULL;
 }
 
 struct isl_basic_set *isl_basic_set_extend(struct isl_basic_set *base,
@@ -1798,10 +1803,10 @@ struct isl_basic_map *isl_basic_map_intersect_range(
                    isl_basic_map_compatible_range(bmap, bset), goto error);
 
        bmap = isl_basic_map_cow(bmap);
-       bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim),
-                       bset->n_div, bset->n_eq, bset->n_ineq);
        if (!bmap)
                goto error;
+       bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim),
+                       bset->n_div, bset->n_eq, bset->n_ineq);
        bmap_range = isl_basic_map_from_basic_set(bset, isl_dim_copy(bset->dim));
        bmap = add_constraints(bmap, bmap_range, 0, 0);
 
@@ -2393,6 +2398,8 @@ __isl_give isl_basic_map *isl_basic_map_project_out(
 
        bmap = move_last(bmap, type, first, n);
        bmap = isl_basic_map_cow(bmap);
+       if (!bmap)
+               return NULL;
 
        row_size = 1 + isl_dim_total(bmap->dim) + bmap->extra;
        old = bmap->block2.data;
@@ -2469,7 +2476,7 @@ __isl_give isl_map *isl_map_project_out(__isl_take isl_map *map,
        return map;
 error:
        isl_map_free(map);
-       return map;
+       return NULL;
 }
 
 /* Turn the n dimensions of type type, starting at first
@@ -3009,6 +3016,9 @@ static __isl_give isl_map *map_lex_lte_first(__isl_take isl_dim *dims,
        struct isl_map *map;
        int i;
 
+       if (n == 0 && equal)
+               return isl_map_universe(dims);
+
        map = isl_map_alloc_dim(isl_dim_copy(dims), n, ISL_MAP_DISJOINT);
 
        for (i = 0; i + 1 < n; ++i)
@@ -3060,6 +3070,9 @@ static __isl_give isl_map *map_lex_gte_first(__isl_take isl_dim *dims,
        struct isl_map *map;
        int i;
 
+       if (n == 0 && equal)
+               return isl_map_universe(dims);
+
        map = isl_map_alloc_dim(isl_dim_copy(dims), n, ISL_MAP_DISJOINT);
 
        for (i = 0; i + 1 < n; ++i)
@@ -5293,7 +5306,7 @@ int isl_basic_map_is_empty(struct isl_basic_map *bmap)
 
        if (ISL_F_ISSET(bmap, ISL_BASIC_MAP_RATIONAL)) {
                struct isl_basic_map *copy = isl_basic_map_copy(bmap);
-               copy = isl_basic_map_convex_hull(copy);
+               copy = isl_basic_map_remove_redundancies(copy);
                empty = ISL_F_ISSET(copy, ISL_BASIC_MAP_EMPTY);
                isl_basic_map_free(copy);
                return empty;
@@ -6021,7 +6034,7 @@ struct isl_basic_map *isl_basic_map_normalize(struct isl_basic_map *bmap)
                return NULL;
        if (ISL_F_ISSET(bmap, ISL_BASIC_MAP_NORMALIZED))
                return bmap;
-       bmap = isl_basic_map_convex_hull(bmap);
+       bmap = isl_basic_map_remove_redundancies(bmap);
        bmap = isl_basic_map_sort_constraints(bmap);
        ISL_F_SET(bmap, ISL_BASIC_MAP_NORMALIZED);
        return bmap;
@@ -6033,8 +6046,8 @@ struct isl_basic_set *isl_basic_set_normalize(struct isl_basic_set *bset)
                                                (struct isl_basic_map *)bset);
 }
 
-static int isl_basic_map_fast_cmp(const struct isl_basic_map *bmap1,
-       const struct isl_basic_map *bmap2)
+int isl_basic_map_fast_cmp(const __isl_keep isl_basic_map *bmap1,
+       const __isl_keep isl_basic_map *bmap2)
 {
        int i, cmp;
        unsigned total;
@@ -6079,8 +6092,8 @@ static int isl_basic_map_fast_cmp(const struct isl_basic_map *bmap1,
        return 0;
 }
 
-static int isl_basic_map_fast_is_equal(struct isl_basic_map *bmap1,
-       struct isl_basic_map *bmap2)
+int isl_basic_map_fast_is_equal(__isl_keep isl_basic_map *bmap1,
+       __isl_keep isl_basic_map *bmap2)
 {
        return isl_basic_map_fast_cmp(bmap1, bmap2) == 0;
 }
@@ -6808,6 +6821,22 @@ int isl_map_is_single_valued(__isl_keep isl_map *map)
        return sv;
 }
 
+int isl_map_is_bijective(__isl_keep isl_map *map)
+{
+       int sv;
+
+       sv = isl_map_is_single_valued(map);
+       if (sv < 0 || !sv)
+               return sv;
+
+       map = isl_map_copy(map);
+       map = isl_map_reverse(map);
+       sv = isl_map_is_single_valued(map);
+       isl_map_free(map);
+
+       return sv;
+}
+
 int isl_set_is_singleton(__isl_keep isl_set *set)
 {
        return isl_map_is_single_valued((isl_map *)set);