void test_div(struct isl_ctx *ctx)
{
isl_int v;
- int pos;
struct isl_dim *dim;
- struct isl_div *div;
struct isl_basic_set *bset;
struct isl_constraint *c;
isl_int_init(v);
/* test 1 */
- dim = isl_dim_set_alloc(ctx, 0, 1);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, 1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 1, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
assert(bset && bset->n_div == 1);
isl_basic_set_free(bset);
/* test 2 */
- dim = isl_dim_set_alloc(ctx, 0, 1);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 1, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, 1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
assert(bset && bset->n_div == 1);
isl_basic_set_free(bset);
/* test 3 */
- dim = isl_dim_set_alloc(ctx, 0, 1);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 1, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, 1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, 4);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
assert(bset && bset->n_div == 1);
isl_basic_set_free(bset);
/* test 4 */
- dim = isl_dim_set_alloc(ctx, 0, 1);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 1, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
isl_int_set_si(v, 1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, 6);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2);
+
assert(isl_basic_set_is_empty(bset));
isl_basic_set_free(bset);
/* test 5 */
- dim = isl_dim_set_alloc(ctx, 0, 2);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 1);
+
assert(bset && bset->n_div == 0);
isl_basic_set_free(bset);
/* test 6 */
- dim = isl_dim_set_alloc(ctx, 0, 2);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, 6);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 1);
+
assert(bset && bset->n_div == 1);
isl_basic_set_free(bset);
* and we end up with the original equality and div again.
* Perhaps we can avoid the introduction of this temporary div.
*/
- dim = isl_dim_set_alloc(ctx, 0, 3);
+ dim = isl_dim_set_alloc(ctx, 0, 4);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
isl_int_set_si(v, -3);
isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, 6);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 3, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 3, 1);
+
/* Test disabled for now */
/*
assert(bset && bset->n_div == 1);
isl_basic_set_free(bset);
/* test 8 */
- dim = isl_dim_set_alloc(ctx, 0, 4);
+ dim = isl_dim_set_alloc(ctx, 0, 5);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_coefficient(c, isl_dim_set, 1, v);
isl_int_set_si(v, -3);
isl_constraint_set_coefficient(c, isl_dim_set, 3, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, 6);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 4, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_constraint_set_constant(c, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 4, 1);
+
/* Test disabled for now */
/*
assert(bset && bset->n_div == 1);
isl_basic_set_free(bset);
/* test 9 */
- dim = isl_dim_set_alloc(ctx, 0, 2);
+ dim = isl_dim_set_alloc(ctx, 0, 4);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
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_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, -2);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_int_set_si(v, -1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- 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_constraint_set_coefficient(c, isl_dim_set, 3, 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_project_out(bset, isl_dim_set, 2, 2);
+
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);
+ dim = isl_dim_set_alloc(ctx, 0, 3);
bset = isl_basic_set_universe(dim);
c = isl_equality_alloc(isl_basic_set_get_dim(bset));
isl_int_set_si(v, 1);
isl_constraint_set_coefficient(c, isl_dim_set, 0, v);
- div = isl_div_alloc(isl_basic_set_get_dim(bset));
- c = isl_constraint_add_div(c, div, &pos);
isl_int_set_si(v, -2);
- isl_constraint_set_coefficient(c, isl_dim_div, pos, v);
+ isl_constraint_set_coefficient(c, isl_dim_set, 2, v);
bset = isl_basic_set_add_constraint(bset, c);
+ bset = isl_basic_set_project_out(bset, isl_dim_set, 2, 1);
+
bset = isl_basic_set_fix_si(bset, isl_dim_set, 0, 2);
isl_basic_set_free(bset);
is_tilable = 1;
is_parallel = 1;
is_nonneg = 1;
+ isl_union_set_free(delta);
} else {
- delta_set = isl_union_set_copy_set(delta);
+ delta_set = isl_set_from_union_set(delta);
slice = isl_set_universe(isl_set_get_dim(delta_set));
for (i = 0; i < tilable; ++i)
isl_set_free(origin);
isl_set_free(delta_set);
}
- isl_union_set_free(delta);
if (is_nonneg < 0 || is_parallel < 0 || is_tilable < 0 ||
is_injection < 0 || is_complete < 0)
return 0;
}
+int test_product(isl_ctx *ctx)
+{
+ const char *str;
+ isl_set *set;
+ int ok;
+
+ str = "{ A[i] }";
+ set = isl_set_read_from_str(ctx, str, -1);
+ set = isl_set_product(set, isl_set_copy(set));
+ ok = isl_set_is_wrapping(set);
+ isl_set_free(set);
+ if (ok < 0)
+ return -1;
+ if (!ok)
+ isl_die(ctx, isl_error_unknown, "unexpected result", return -1);
+
+ return 0;
+}
+
+int test_equal(isl_ctx *ctx)
+{
+ const char *str;
+ isl_set *set, *set2;
+ int equal;
+
+ str = "{ S_6[i] }";
+ set = isl_set_read_from_str(ctx, str, -1);
+ str = "{ S_7[i] }";
+ set2 = isl_set_read_from_str(ctx, str, -1);
+ equal = isl_set_is_equal(set, set2);
+ isl_set_free(set);
+ isl_set_free(set2);
+ if (equal < 0)
+ return -1;
+ if (equal)
+ isl_die(ctx, isl_error_unknown, "unexpected result", return -1);
+
+ return 0;
+}
+
+static int test_plain_fixed(isl_ctx *ctx, __isl_take isl_map *map,
+ enum isl_dim_type type, unsigned pos, int fixed)
+{
+ int test;
+
+ test = isl_map_plain_is_fixed(map, type, pos, NULL);
+ isl_map_free(map);
+ if (test < 0)
+ return -1;
+ if (test == fixed)
+ return 0;
+ if (fixed)
+ isl_die(ctx, isl_error_unknown,
+ "map not detected as fixed", return -1);
+ else
+ isl_die(ctx, isl_error_unknown,
+ "map detected as fixed", return -1);
+}
+
+int test_fixed(isl_ctx *ctx)
+{
+ const char *str;
+ isl_map *map;
+
+ str = "{ [i] -> [i] }";
+ map = isl_map_read_from_str(ctx, str, -1);
+ if (test_plain_fixed(ctx, map, isl_dim_out, 0, 0))
+ return -1;
+ str = "{ [i] -> [1] }";
+ map = isl_map_read_from_str(ctx, str, -1);
+ if (test_plain_fixed(ctx, map, isl_dim_out, 0, 1))
+ return -1;
+ str = "{ S_1[p1] -> [o0] : o0 = -2 and p1 >= 1 and p1 <= 7 }";
+ map = isl_map_read_from_str(ctx, str, -1);
+ if (test_plain_fixed(ctx, map, isl_dim_out, 0, 1))
+ return -1;
+ map = isl_map_read_from_str(ctx, str, -1);
+ map = isl_map_neg(map);
+ if (test_plain_fixed(ctx, map, isl_dim_out, 0, 1))
+ return -1;
+
+ return 0;
+}
+
int main()
{
struct isl_ctx *ctx;
assert(srcdir);
ctx = isl_ctx_alloc();
+ if (test_fixed(ctx) < 0)
+ goto error;
+ if (test_equal(ctx) < 0)
+ goto error;
+ if (test_product(ctx) < 0)
+ goto error;
if (test_dim_max(ctx) < 0)
goto error;
if (test_aff(ctx) < 0)