isl_pip_basic_map_compute_divs: remove some equalities first

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

diff --git a/isl_test.c b/isl_test.c
index 9ec4a8a..1c108cb 100644 (file)
--- a/isl_test.c
+++ b/isl_test.c
@@ -295,6 +295,55 @@ void test_div(struct isl_ctx *ctx)
        assert(bset->n_div == 1);
        isl_basic_set_free(bset);
 
+       /* test 9 */
+       dim = isl_dim_set_alloc(ctx, 0, 2);
+       bset = isl_basic_set_universe(dim);
+
+       c = isl_equality_alloc(isl_dim_copy(bset->dim));
+       isl_int_set_si(v, 1);
+       isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
+       isl_int_set_si(v, -1);
+       isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
+       div = isl_div_alloc(isl_dim_copy(bset->dim));
+       c = isl_constraint_add_div(c, div, &pos);
+       isl_int_set_si(v, -2);
+       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       bset = isl_basic_set_add_constraint(bset, c);
+
+       c = isl_equality_alloc(isl_dim_copy(bset->dim));
+       isl_int_set_si(v, -1);
+       isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
+       div = isl_div_alloc(isl_dim_copy(bset->dim));
+       c = isl_constraint_add_div(c, div, &pos);
+       isl_int_set_si(v, 3);
+       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       isl_int_set_si(v, 2);
+       isl_constraint_set_constant(c, v);
+       bset = isl_basic_set_add_constraint(bset, c);
+
+       bset = isl_basic_set_fix_si(bset, isl_dim_set, 0, 2);
+
+       assert(!isl_basic_set_is_empty(bset));
+
+       isl_basic_set_free(bset);
+
+       /* test 10 */
+       dim = isl_dim_set_alloc(ctx, 0, 2);
+       bset = isl_basic_set_universe(dim);
+
+       c = isl_equality_alloc(isl_dim_copy(bset->dim));
+       isl_int_set_si(v, 1);
+       isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
+       div = isl_div_alloc(isl_dim_copy(bset->dim));
+       c = isl_constraint_add_div(c, div, &pos);
+       isl_int_set_si(v, -2);
+       isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+       bset = isl_basic_set_add_constraint(bset, c);
+
+       bset = isl_basic_set_fix_si(bset, isl_dim_set, 0, 2);
+
+       isl_basic_set_free(bset);
+
        isl_int_clear(v);
 }
 
@@ -363,6 +412,7 @@ void test_affine_hull(struct isl_ctx *ctx)
 {
        test_affine_hull_case(ctx, "affine2");
        test_affine_hull_case(ctx, "affine");
+       test_affine_hull_case(ctx, "affine3");
 }
 
 void test_convex_hull_case(struct isl_ctx *ctx, const char *name)
@@ -409,6 +459,9 @@ void test_convex_hull(struct isl_ctx *ctx)
        test_convex_hull_case(ctx, "convex9");
        test_convex_hull_case(ctx, "convex10");
        test_convex_hull_case(ctx, "convex11");
+       test_convex_hull_case(ctx, "convex12");
+       test_convex_hull_case(ctx, "convex13");
+       test_convex_hull_case(ctx, "convex14");
 }
 
 void test_gist_case(struct isl_ctx *ctx, const char *name)
@@ -445,6 +498,85 @@ void test_gist(struct isl_ctx *ctx)
        test_gist_case(ctx, "gist1");
 }
 
+static struct isl_set *s_union(struct isl_ctx *ctx,
+       const char *s1, const char *s2)
+{
+       struct isl_basic_set *bset1;
+       struct isl_basic_set *bset2;
+       struct isl_set *set1, *set2;
+
+       bset1 = isl_basic_set_read_from_str(ctx, s1, 0, ISL_FORMAT_OMEGA);
+       bset2 = isl_basic_set_read_from_str(ctx, s2, 0, ISL_FORMAT_OMEGA);
+       set1 = isl_set_from_basic_set(bset1);
+       set2 = isl_set_from_basic_set(bset2);
+       return isl_set_union(set1, set2);
+}
+
+void test_coalesce(struct isl_ctx *ctx)
+{
+       struct isl_set *set;
+
+       set = s_union(ctx, "{[x,y]: x >= 0 & x <= 10 & y >= 0 & y <= 10}",
+                          "{[x,y]: y >= x & x >= 2 & 5 >= y}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 1);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & 2x + y <= 30 & y <= 10 & x >= 0}",
+                      "{[x,y]: x + y >= 10 & y <= x & x + y <= 20 & y >= 0}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 1);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & 2x + y <= 30 & y <= 10 & x >= 0}",
+                      "{[x,y]: x + y >= 10 & y <= x & x + y <= 19 & y >= 0}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 2);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x >= 6 & x <= 10 & y <= x}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 1);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x >= 7 & x <= 10 & y <= x}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 2);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x >= 6 & x <= 10 & y + 1 <= x}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 2);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x = 6 & y <= 6}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 1);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x = 7 & y <= 6}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 2);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x = 6 & y <= 5}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 2);
+       isl_set_free(set);
+
+       set = s_union(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x}",
+                      "{[x,y]: y >= 0 & x = 6 & y <= 7}");
+       set = isl_set_coalesce(set);
+       assert(set->n == 2);
+       isl_set_free(set);
+}
+
 int main()
 {
        struct isl_ctx *ctx;
@@ -459,6 +591,7 @@ int main()
        test_affine_hull(ctx);
        test_convex_hull(ctx);
        test_gist(ctx);
+       test_coalesce(ctx);
        isl_ctx_free(ctx);
        return 0;
 }