add isl_basic_map_detect_equalities
[platform/upstream/isl.git] / isl_map.c
index 99d247d..2cc5855 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -94,9 +94,9 @@ unsigned isl_basic_map_dim(const struct isl_basic_map *bmap,
 {
        struct isl_dim *dim = bmap->dim;
        switch (type) {
-       case isl_dim_param:     return dim->nparam;
-       case isl_dim_in:        return dim->n_in;
-       case isl_dim_out:       return dim->n_out;
+       case isl_dim_param:
+       case isl_dim_in:
+       case isl_dim_out:       return isl_dim_size(bmap->dim, type);
        case isl_dim_div:       return bmap->n_div;
        case isl_dim_all:       return isl_basic_map_total_dim(bmap);
        }
@@ -107,7 +107,7 @@ unsigned isl_map_dim(const struct isl_map *map, enum isl_dim_type type)
        return n(map->dim, type);
 }
 
-static unsigned basic_map_offset(struct isl_basic_map *bmap,
+unsigned isl_basic_map_offset(struct isl_basic_map *bmap,
                                        enum isl_dim_type type)
 {
        struct isl_dim *dim = bmap->dim;
@@ -521,6 +521,7 @@ void isl_basic_map_inequality_to_equality(
        bmap->ineq++;
        F_CLR(bmap, ISL_BASIC_MAP_NORMALIZED);
        F_CLR(bmap, ISL_BASIC_MAP_NORMALIZED_DIVS);
+       F_CLR(bmap, ISL_BASIC_MAP_ALL_EQUALITIES);
 }
 
 int isl_basic_map_alloc_inequality(struct isl_basic_map *bmap)
@@ -534,6 +535,7 @@ int isl_basic_map_alloc_inequality(struct isl_basic_map *bmap)
        F_CLR(bmap, ISL_BASIC_MAP_NO_IMPLICIT);
        F_CLR(bmap, ISL_BASIC_MAP_NO_REDUNDANT);
        F_CLR(bmap, ISL_BASIC_MAP_NORMALIZED);
+       F_CLR(bmap, ISL_BASIC_MAP_ALL_EQUALITIES);
        isl_seq_clr(bmap->ineq[bmap->n_ineq] +
                      1 + isl_basic_map_total_dim(bmap),
                      bmap->extra - bmap->n_div);
@@ -1101,9 +1103,26 @@ error:
        return NULL;
 }
 
-/* Project out n inputs starting at first using Fourier-Motzkin */
-struct isl_map *isl_map_remove_inputs(struct isl_map *map,
-       unsigned first, unsigned n)
+struct isl_basic_map *isl_basic_map_remove(struct isl_basic_map *bmap,
+       enum isl_dim_type type, unsigned first, unsigned n)
+{
+       if (!bmap)
+               return NULL;
+       isl_assert(bmap->ctx, first + n <= isl_basic_map_dim(bmap, type),
+                       goto error);
+       if (n == 0)
+               return bmap;
+       bmap = isl_basic_map_eliminate_vars(bmap,
+                       isl_basic_map_offset(bmap, type) - 1 + first, n);
+       bmap = isl_basic_map_drop(bmap, type, first, n);
+       return bmap;
+error:
+       isl_basic_map_free(bmap);
+       return NULL;
+}
+
+struct isl_map *isl_map_remove(struct isl_map *map,
+       enum isl_dim_type type, unsigned first, unsigned n)
 {
        int i;
        unsigned nparam;
@@ -1114,22 +1133,28 @@ struct isl_map *isl_map_remove_inputs(struct isl_map *map,
        map = isl_map_cow(map);
        if (!map)
                return NULL;
-       nparam = isl_map_n_param(map);
-       isl_assert(map->ctx, first+n <= isl_map_n_in(map), goto error);
+       isl_assert(map->ctx, first + n <= isl_map_dim(map, type), goto error);
        
        for (i = 0; i < map->n; ++i) {
                map->p[i] = isl_basic_map_eliminate_vars(map->p[i],
-                                                           nparam + first, n);
+                       isl_basic_map_offset(map->p[i], type) - 1 + first, n);
                if (!map->p[i])
                        goto error;
        }
-       map = isl_map_drop_inputs(map, first, n);
+       map = isl_map_drop(map, type, first, n);
        return map;
 error:
        isl_map_free(map);
        return NULL;
 }
 
+/* Project out n inputs starting at first using Fourier-Motzkin */
+struct isl_map *isl_map_remove_inputs(struct isl_map *map,
+       unsigned first, unsigned n)
+{
+       return isl_map_remove(map, isl_dim_in, first, n);
+}
+
 /* Project out n dimensions starting at first using Fourier-Motzkin */
 struct isl_basic_set *isl_basic_set_remove_dims(struct isl_basic_set *bset,
        unsigned first, unsigned n)
@@ -1470,8 +1495,12 @@ struct isl_basic_map *isl_basic_map_intersect_domain(
        if (!bmap || !bset)
                goto error;
 
-       isl_assert(set->ctx, isl_basic_map_compatible_domain(bmap, bset),
-                   goto error);
+       isl_assert(bset->ctx, isl_dim_match(bmap->dim, isl_dim_param,
+                                       bset->dim, isl_dim_param), goto error);
+
+       if (isl_dim_size(bset->dim, isl_dim_set) != 0)
+               isl_assert(bset->ctx,
+                   isl_basic_map_compatible_domain(bmap, bset), goto error);
 
        bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim),
                        bset->n_div, bset->n_eq, bset->n_ineq);
@@ -1497,8 +1526,12 @@ struct isl_basic_map *isl_basic_map_intersect_range(
        if (!bmap || !bset)
                goto error;
 
-       isl_assert(bset->ctx, isl_basic_map_compatible_range(bmap, bset),
-                  goto error);
+       isl_assert(bset->ctx, isl_dim_match(bmap->dim, isl_dim_param,
+                                       bset->dim, isl_dim_param), goto error);
+
+       if (isl_dim_size(bset->dim, isl_dim_set) != 0)
+               isl_assert(bset->ctx,
+                   isl_basic_map_compatible_range(bmap, bset), goto error);
 
        bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim),
                        bset->n_div, bset->n_eq, bset->n_ineq);
@@ -1521,7 +1554,18 @@ struct isl_basic_map *isl_basic_map_intersect(
        if (!bmap1 || !bmap2)
                goto error;
 
-       isl_assert(map1->ctx, isl_dim_equal(bmap1->dim, bmap2->dim), goto error);
+       isl_assert(bmap1->ctx, isl_dim_match(bmap1->dim, isl_dim_param,
+                                    bmap2->dim, isl_dim_param), goto error);
+       if (isl_dim_total(bmap1->dim) ==
+                               isl_dim_size(bmap1->dim, isl_dim_param) &&
+           isl_dim_total(bmap2->dim) !=
+                               isl_dim_size(bmap2->dim, isl_dim_param))
+               return isl_basic_map_intersect(bmap2, bmap1);
+
+       if (isl_dim_total(bmap2->dim) !=
+                                       isl_dim_size(bmap2->dim, isl_dim_param))
+               isl_assert(bmap1->ctx,
+                           isl_dim_equal(bmap1->dim, bmap2->dim), goto error);
 
        bmap1 = isl_basic_map_extend_dim(bmap1, isl_dim_copy(bmap1->dim),
                        bmap2->n_div, bmap2->n_eq, bmap2->n_ineq);
@@ -1555,6 +1599,17 @@ struct isl_map *isl_map_intersect(struct isl_map *map1, struct isl_map *map2)
        if (!map1 || !map2)
                goto error;
 
+       isl_assert(map1->ctx, isl_dim_match(map1->dim, isl_dim_param,
+                                        map2->dim, isl_dim_param), goto error);
+       if (isl_dim_total(map1->dim) ==
+                               isl_dim_size(map1->dim, isl_dim_param) &&
+           isl_dim_total(map2->dim) != isl_dim_size(map2->dim, isl_dim_param))
+               return isl_map_intersect(map2, map1);
+
+       if (isl_dim_total(map2->dim) != isl_dim_size(map2->dim, isl_dim_param))
+               isl_assert(map1->ctx,
+                           isl_dim_equal(map1->dim, map2->dim), goto error);
+
        if (F_ISSET(map1, ISL_MAP_DISJOINT) &&
            F_ISSET(map2, ISL_MAP_DISJOINT))
                FL_SET(flags, ISL_MAP_DISJOINT);
@@ -1832,7 +1887,7 @@ struct isl_basic_map *isl_basic_map_neg(struct isl_basic_map *bmap)
                return NULL;
 
        n = isl_basic_map_dim(bmap, isl_dim_out);
-       off = basic_map_offset(bmap, isl_dim_out);
+       off = isl_basic_map_offset(bmap, isl_dim_out);
        for (i = 0; i < bmap->n_eq; ++i)
                for (j = 0; j < n; ++j)
                        isl_int_neg(bmap->eq[i][off+j], bmap->eq[i][off+j]);
@@ -1845,8 +1900,61 @@ struct isl_basic_map *isl_basic_map_neg(struct isl_basic_map *bmap)
        return isl_basic_map_finalize(bmap);
 }
 
-static struct isl_basic_map *var_equal(struct isl_ctx *ctx,
-               struct isl_basic_map *bmap, unsigned pos)
+/* Given a basic map A -> f(A) and an integer d, construct a basic map
+ * A -> floor(f(A)/d).
+ */
+struct isl_basic_map *isl_basic_map_floordiv(struct isl_basic_map *bmap,
+               isl_int d)
+{
+       unsigned n_in, n_out, nparam, total, pos;
+       struct isl_basic_map *result = NULL;
+       struct isl_dim_map *dim_map;
+       int i;
+
+       if (!bmap)
+               return NULL;
+
+       nparam = isl_basic_map_n_param(bmap);
+       n_in = isl_basic_map_n_in(bmap);
+       n_out = isl_basic_map_n_out(bmap);
+
+       total = nparam + n_in + n_out + bmap->n_div + n_out;
+       dim_map = isl_dim_map_alloc(bmap->ctx, total);
+       isl_dim_map_dim(dim_map, bmap->dim, isl_dim_param, pos = 0);
+       isl_dim_map_dim(dim_map, bmap->dim, isl_dim_in, pos += nparam);
+       isl_dim_map_div(dim_map, bmap, pos += n_in + n_out);
+       isl_dim_map_dim(dim_map, bmap->dim, isl_dim_out, pos += bmap->n_div);
+
+       result = isl_basic_map_alloc_dim(isl_dim_copy(bmap->dim),
+                       bmap->n_div + n_out,
+                       bmap->n_eq, bmap->n_ineq + 2 * n_out);
+       result = add_constraints_dim_map(result, bmap, dim_map);
+       result = add_divs(result, n_out);
+       for (i = 0; i < n_out; ++i) {
+               int j;
+               j = isl_basic_map_alloc_inequality(result);
+               if (j < 0)
+                       goto error;
+               isl_seq_clr(result->ineq[j], 1+total);
+               isl_int_neg(result->ineq[j][1+nparam+n_in+i], d);
+               isl_int_set_si(result->ineq[j][1+pos+i], 1);
+               j = isl_basic_map_alloc_inequality(result);
+               if (j < 0)
+                       goto error;
+               isl_seq_clr(result->ineq[j], 1+total);
+               isl_int_set(result->ineq[j][1+nparam+n_in+i], d);
+               isl_int_set_si(result->ineq[j][1+pos+i], -1);
+               isl_int_sub_ui(result->ineq[j][0], d, 1);
+       }
+
+       result = isl_basic_map_simplify(result);
+       return isl_basic_map_finalize(result);
+error:
+       isl_basic_map_free(result);
+       return NULL;
+}
+
+static struct isl_basic_map *var_equal(struct isl_basic_map *bmap, unsigned pos)
 {
        int i;
        unsigned nparam;
@@ -1866,8 +1974,7 @@ error:
        return NULL;
 }
 
-static struct isl_basic_map *var_more(struct isl_ctx *ctx,
-               struct isl_basic_map *bmap, unsigned pos)
+static struct isl_basic_map *var_more(struct isl_basic_map *bmap, unsigned pos)
 {
        int i;
        unsigned nparam;
@@ -1888,8 +1995,7 @@ error:
        return NULL;
 }
 
-static struct isl_basic_map *var_less(struct isl_ctx *ctx,
-               struct isl_basic_map *bmap, unsigned pos)
+static struct isl_basic_map *var_less(struct isl_basic_map *bmap, unsigned pos)
 {
        int i;
        unsigned nparam;
@@ -1910,46 +2016,43 @@ error:
        return NULL;
 }
 
-struct isl_basic_map *isl_basic_map_equal(struct isl_ctx *ctx,
-               unsigned nparam, unsigned in, unsigned out, unsigned n_equal)
+struct isl_basic_map *isl_basic_map_equal(struct isl_dim *dim, unsigned n_equal)
 {
        int i;
        struct isl_basic_map *bmap;
-       bmap = isl_basic_map_alloc(ctx, nparam, in, out, 0, n_equal, 0);
+       bmap = isl_basic_map_alloc_dim(dim, 0, n_equal, 0);
        if (!bmap)
                return NULL;
        for (i = 0; i < n_equal && bmap; ++i)
-               bmap = var_equal(ctx, bmap, i);
+               bmap = var_equal(bmap, i);
        return isl_basic_map_finalize(bmap);
 }
 
-struct isl_basic_map *isl_basic_map_less_at(struct isl_ctx *ctx,
-               unsigned nparam, unsigned in, unsigned out, unsigned pos)
+struct isl_basic_map *isl_basic_map_less_at(struct isl_dim *dim, unsigned pos)
 {
        int i;
        struct isl_basic_map *bmap;
-       bmap = isl_basic_map_alloc(ctx, nparam, in, out, 0, pos, 1);
+       bmap = isl_basic_map_alloc_dim(dim, 0, pos, 1);
        if (!bmap)
                return NULL;
        for (i = 0; i < pos && bmap; ++i)
-               bmap = var_equal(ctx, bmap, i);
+               bmap = var_equal(bmap, i);
        if (bmap)
-               bmap = var_less(ctx, bmap, pos);
+               bmap = var_less(bmap, pos);
        return isl_basic_map_finalize(bmap);
 }
 
-struct isl_basic_map *isl_basic_map_more_at(struct isl_ctx *ctx,
-               unsigned nparam, unsigned in, unsigned out, unsigned pos)
+struct isl_basic_map *isl_basic_map_more_at(struct isl_dim *dim, unsigned pos)
 {
        int i;
        struct isl_basic_map *bmap;
-       bmap = isl_basic_map_alloc(ctx, nparam, in, out, 0, pos, 1);
+       bmap = isl_basic_map_alloc_dim(dim, 0, pos, 1);
        if (!bmap)
                return NULL;
        for (i = 0; i < pos && bmap; ++i)
-               bmap = var_equal(ctx, bmap, i);
+               bmap = var_equal(bmap, i);
        if (bmap)
-               bmap = var_more(ctx, bmap, pos);
+               bmap = var_more(bmap, pos);
        return isl_basic_map_finalize(bmap);
 }
 
@@ -2096,9 +2199,12 @@ struct isl_basic_map *isl_basic_map_overlying_set(
                }
                bmap = isl_basic_map_extend_constraints(bmap, 
                                                        0, 2 * like->n_div);
-               for (i = 0; i < like->n_div; ++i)
+               for (i = 0; i < like->n_div; ++i) {
+                       if (isl_int_is_zero(bmap->div[i][0]))
+                               continue;
                        if (add_div_constraints(bmap, i) < 0)
                                goto error;
+               }
        }
        isl_basic_map_free(like);
        bmap = isl_basic_map_simplify(bmap);
@@ -2261,6 +2367,11 @@ error:
        return NULL;
 }
 
+struct isl_map *isl_map_from_range(struct isl_set *set)
+{
+       return (struct isl_map *)set;
+}
+
 struct isl_set *isl_set_from_map(struct isl_map *map)
 {
        int i;
@@ -2397,10 +2508,16 @@ struct isl_basic_set *isl_basic_set_universe_like(struct isl_basic_set *model)
        return isl_basic_set_alloc_dim(isl_dim_copy(model->dim), 0, 0, 0);
 }
 
-struct isl_map *isl_map_empty(struct isl_ctx *ctx,
-               unsigned nparam, unsigned in, unsigned out)
+struct isl_map *isl_map_empty(struct isl_dim *dim)
 {
-       return isl_map_alloc(ctx, nparam, in, out, 0, ISL_MAP_DISJOINT);
+       return isl_map_alloc_dim(dim, 0, ISL_MAP_DISJOINT);
+}
+
+struct isl_map *isl_map_empty_like(struct isl_map *model)
+{
+       if (!model)
+               return NULL;
+       return isl_map_alloc_dim(isl_dim_copy(model->dim), 0, ISL_MAP_DISJOINT);
 }
 
 struct isl_map *isl_map_empty_like_basic_map(struct isl_basic_map *model)
@@ -2537,13 +2654,21 @@ struct isl_basic_map *isl_basic_map_fix_si(struct isl_basic_map *bmap,
        if (!bmap)
                return NULL;
        isl_assert(bmap->ctx, pos < isl_basic_map_dim(bmap, type), goto error);
-       return isl_basic_map_fix_pos(bmap, basic_map_offset(bmap, type) + pos,
+       return isl_basic_map_fix_pos(bmap, isl_basic_map_offset(bmap, type) + pos,
                                        value);
 error:
        isl_basic_map_free(bmap);
        return NULL;
 }
 
+struct isl_basic_set *isl_basic_set_fix_si(struct isl_basic_set *bset,
+               enum isl_dim_type type, unsigned pos, int value)
+{
+       return (struct isl_basic_set *)
+               isl_basic_map_fix_si((struct isl_basic_map *)bset,
+                                       type, pos, value);
+}
+
 struct isl_basic_map *isl_basic_map_fix_input_si(struct isl_basic_map *bmap,
                unsigned input, int value)
 {
@@ -3150,6 +3275,11 @@ int isl_map_is_empty(struct isl_map *map)
        return 1;
 }
 
+int isl_map_fast_is_empty(struct isl_map *map)
+{
+       return map->n == 0;
+}
+
 int isl_set_is_empty(struct isl_set *set)
 {
        return isl_map_is_empty((struct isl_map *)set);
@@ -3634,45 +3764,57 @@ struct isl_set *isl_set_remove_empty_parts(struct isl_set *set)
                isl_map_remove_empty_parts((struct isl_map *)set);
 }
 
-struct isl_basic_set *isl_set_copy_basic_set(struct isl_set *set)
+struct isl_basic_map *isl_map_copy_basic_map(struct isl_map *map)
 {
-       struct isl_basic_set *bset;
-       if (!set || set->n == 0)
+       struct isl_basic_map *bmap;
+       if (!map || map->n == 0)
                return NULL;
-       bset = set->p[set->n-1];
-       isl_assert(set->ctx, F_ISSET(bset, ISL_BASIC_SET_FINAL), return NULL);
-       return isl_basic_set_copy(bset);
+       bmap = map->p[map->n-1];
+       isl_assert(map->ctx, F_ISSET(bmap, ISL_BASIC_SET_FINAL), return NULL);
+       return isl_basic_map_copy(bmap);
 }
 
-struct isl_set *isl_set_drop_basic_set(struct isl_set *set,
-                                               struct isl_basic_set *bset)
+struct isl_basic_set *isl_set_copy_basic_set(struct isl_set *set)
+{
+       (struct isl_basic_set *)isl_map_copy_basic_map((struct isl_map *)set);
+}
+
+struct isl_map *isl_map_drop_basic_map(struct isl_map *map,
+                                               struct isl_basic_map *bmap)
 {
        int i;
 
-       if (!set || !bset)
+       if (!map || !bmap)
                goto error;
-       for (i = set->n-1; i >= 0; --i) {
-               if (set->p[i] != bset)
+       for (i = map->n-1; i >= 0; --i) {
+               if (map->p[i] != bmap)
                        continue;
-               set = isl_set_cow(set);
-               if (!set)
+               map = isl_map_cow(map);
+               if (!map)
                        goto error;
-               isl_basic_set_free(set->p[i]);
-               if (i != set->n-1) {
-                       F_CLR(set, ISL_SET_NORMALIZED);
-                       set->p[i] = set->p[set->n-1];
+               isl_basic_map_free(map->p[i]);
+               if (i != map->n-1) {
+                       F_CLR(map, ISL_SET_NORMALIZED);
+                       map->p[i] = map->p[map->n-1];
                }
-               set->n--;
-               return set;
+               map->n--;
+               return map;
        }
-       isl_basic_set_free(bset);
-       return set;
+       isl_basic_map_free(bmap);
+       return map;
 error:
-       isl_set_free(set);
-       isl_basic_set_free(bset);
+       isl_map_free(map);
+       isl_basic_map_free(bmap);
        return NULL;
 }
 
+struct isl_set *isl_set_drop_basic_set(struct isl_set *set,
+                                               struct isl_basic_set *bset)
+{
+       (struct isl_set *)isl_map_drop_basic_map((struct isl_map *)set,
+                                               (struct isl_basic_map *)bset);
+}
+
 /* Given two _disjoint_ basic sets bset1 and bset2, check whether
  * for any common value of the parameters and dimensions preceding dim
  * in both basic sets, the values of dimension pos in bset1 are
@@ -3812,6 +3954,15 @@ static int isl_set_fast_has_fixed_var(struct isl_set *set, unsigned pos,
        return isl_map_fast_has_fixed_var((struct isl_map *)set, pos, val);
 }
 
+int isl_basic_map_fast_is_fixed(struct isl_basic_map *bmap,
+       enum isl_dim_type type, unsigned pos, isl_int *val)
+{
+       if (pos >= isl_basic_map_dim(bmap, type))
+               return -1;
+       return isl_basic_map_fast_has_fixed_var(bmap,
+               isl_basic_map_offset(bmap, type) - 1 + pos, val);
+}
+
 /* Check if dimension dim has fixed value and if so and if val is not NULL,
  * then return this fixed value in *val.
  */
@@ -4186,6 +4337,99 @@ error:
        return NULL;
 }
 
+struct isl_basic_map *isl_basic_map_product(
+               struct isl_basic_map *bmap1, struct isl_basic_map *bmap2)
+{
+       struct isl_dim *dim_result = NULL;
+       struct isl_basic_map *bmap;
+       unsigned in1, in2, out1, out2, nparam, total, pos;
+       struct isl_dim_map *dim_map1, *dim_map2;
+
+       if (!bmap1 || !bmap2)
+               goto error;
+
+       isl_assert(map1->ctx, isl_dim_match(bmap1->dim, isl_dim_param,
+                                    bmap2->dim, isl_dim_param), goto error);
+       dim_result = isl_dim_product(isl_dim_copy(bmap1->dim),
+                                                  isl_dim_copy(bmap2->dim));
+
+       in1 = isl_basic_map_n_in(bmap1);
+       in2 = isl_basic_map_n_in(bmap2);
+       out1 = isl_basic_map_n_out(bmap1);
+       out2 = isl_basic_map_n_out(bmap2);
+       nparam = isl_basic_map_n_param(bmap1);
+
+       total = nparam + in1 + in2 + out1 + out2 + bmap1->n_div + bmap2->n_div;
+       dim_map1 = isl_dim_map_alloc(bmap1->ctx, total);
+       dim_map2 = isl_dim_map_alloc(bmap1->ctx, total);
+       isl_dim_map_dim(dim_map1, bmap1->dim, isl_dim_param, pos = 0);
+       isl_dim_map_dim(dim_map2, bmap2->dim, isl_dim_param, pos = 0);
+       isl_dim_map_dim(dim_map1, bmap1->dim, isl_dim_in, pos += nparam);
+       isl_dim_map_dim(dim_map2, bmap2->dim, isl_dim_in, pos += in1);
+       isl_dim_map_dim(dim_map1, bmap1->dim, isl_dim_out, pos += in2);
+       isl_dim_map_dim(dim_map2, bmap2->dim, isl_dim_out, pos += out1);
+       isl_dim_map_div(dim_map1, bmap1, pos += out2);
+       isl_dim_map_div(dim_map2, bmap2, pos += bmap1->n_div);
+
+       bmap = isl_basic_map_alloc_dim(dim_result,
+                       bmap1->n_div + bmap2->n_div,
+                       bmap1->n_eq + bmap2->n_eq,
+                       bmap1->n_ineq + bmap2->n_ineq);
+       bmap = add_constraints_dim_map(bmap, bmap1, dim_map1);
+       bmap = add_constraints_dim_map(bmap, bmap2, dim_map2);
+       bmap = isl_basic_map_simplify(bmap);
+       return isl_basic_map_finalize(bmap);
+error:
+       isl_basic_map_free(bmap1);
+       isl_basic_map_free(bmap2);
+       return NULL;
+}
+
+/* Given two maps A -> B and C -> D, construct a map (A, C) -> (B, D)
+ */
+struct isl_map *isl_map_product(struct isl_map *map1, struct isl_map *map2)
+{
+       unsigned flags = 0;
+       struct isl_map *result;
+       int i, j;
+
+       if (!map1 || !map2)
+               goto error;
+
+       isl_assert(map1->ctx, isl_dim_match(map1->dim, isl_dim_param,
+                                        map2->dim, isl_dim_param), goto error);
+
+       if (F_ISSET(map1, ISL_MAP_DISJOINT) &&
+           F_ISSET(map2, ISL_MAP_DISJOINT))
+               FL_SET(flags, ISL_MAP_DISJOINT);
+
+       result = isl_map_alloc_dim(isl_dim_product(isl_dim_copy(map1->dim),
+                                                  isl_dim_copy(map2->dim)),
+                               map1->n * map2->n, flags);
+       if (!result)
+               goto error;
+       for (i = 0; i < map1->n; ++i)
+               for (j = 0; j < map2->n; ++j) {
+                       struct isl_basic_map *part;
+                       part = isl_basic_map_product(
+                                   isl_basic_map_copy(map1->p[i]),
+                                   isl_basic_map_copy(map2->p[j]));
+                       if (isl_basic_map_is_empty(part))
+                               isl_basic_map_free(part);
+                       else
+                               result = isl_map_add(result, part);
+                       if (!result)
+                               goto error;
+               }
+       isl_map_free(map1);
+       isl_map_free(map2);
+       return result;
+error:
+       isl_map_free(map1);
+       isl_map_free(map2);
+       return NULL;
+}
+
 uint32_t isl_basic_set_get_hash(struct isl_basic_set *bset)
 {
        int i;