X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_test.c;h=fb6a5f442c4355cd6242616074753aa0928344e7;hb=de51a9bc4da5dd3f1f9f57c2362da6f9752c44e0;hp=22e6aaed417151296cb498eed383bd568622ad6e;hpb=d07eed3bf4d0e290118588ca80997a8035eaeb21;p=platform%2Fupstream%2Fisl.git diff --git a/isl_test.c b/isl_test.c index 22e6aae..fb6a5f4 100644 --- a/isl_test.c +++ b/isl_test.c @@ -1,7 +1,7 @@ /* * Copyright 2008-2009 Katholieke Universiteit Leuven * - * Use of this software is governed by the GNU LGPLv2.1 license + * Use of this software is governed by the MIT license * * Written by Sven Verdoolaege, K.U.Leuven, Departement * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -20,6 +20,11 @@ #include #include #include +#include +#include +#include + +#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) static char *srcdir; @@ -44,20 +49,29 @@ void test_parse_map(isl_ctx *ctx, const char *str) { isl_map *map; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); assert(map); isl_map_free(map); } -void test_parse_map_equal(isl_ctx *ctx, const char *str, const char *str2) +int test_parse_map_equal(isl_ctx *ctx, const char *str, const char *str2) { isl_map *map, *map2; + int equal; - map = isl_map_read_from_str(ctx, str, -1); - map2 = isl_map_read_from_str(ctx, str2, -1); - assert(map && map2 && isl_map_is_equal(map, map2)); + map = isl_map_read_from_str(ctx, str); + map2 = isl_map_read_from_str(ctx, str2); + equal = isl_map_is_equal(map, map2); isl_map_free(map); isl_map_free(map2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "maps not equal", + return -1); + + return 0; } void test_parse_pwqp(isl_ctx *ctx, const char *str) @@ -69,18 +83,27 @@ void test_parse_pwqp(isl_ctx *ctx, const char *str) isl_pw_qpolynomial_free(pwqp); } -void test_parse(struct isl_ctx *ctx) +static void test_parse_pwaff(isl_ctx *ctx, const char *str) +{ + isl_pw_aff *pwaff; + + pwaff = isl_pw_aff_read_from_str(ctx, str); + assert(pwaff); + isl_pw_aff_free(pwaff); +} + +int test_parse(struct isl_ctx *ctx) { isl_map *map, *map2; const char *str, *str2; str = "{ [i] -> [-i] }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); assert(map); isl_map_free(map); str = "{ A[i] -> L[([i/3])] }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); assert(map); isl_map_free(map); @@ -90,58 +113,99 @@ void test_parse(struct isl_ctx *ctx) str = "{ [x,y] : [([x/2]+y)/3] >= 1 }"; str2 = "{ [x, y] : 2y >= 6 - x }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; - test_parse_map_equal(ctx, "{ [x,y] : x <= min(y, 2*y+3) }", - "{ [x,y] : x <= y, 2*y + 3 }"); + if (test_parse_map_equal(ctx, "{ [x,y] : x <= min(y, 2*y+3) }", + "{ [x,y] : x <= y, 2*y + 3 }") < 0) + return -1; str = "{ [x, y] : (y <= x and y >= -3) or (2y <= -3 + x and y <= -4) }"; - test_parse_map_equal(ctx, "{ [x,y] : x >= min(y, 2*y+3) }", str); + if (test_parse_map_equal(ctx, "{ [x,y] : x >= min(y, 2*y+3) }", + str) < 0) + return -1; str = "{[new,old] -> [new+1-2*[(new+1)/2],old+1-2*[(old+1)/2]]}"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); str = "{ [new, old] -> [o0, o1] : " "exists (e0 = [(-1 - new + o0)/2], e1 = [(-1 - old + o1)/2]: " "2e0 = -1 - new + o0 and 2e1 = -1 - old + o1 and o0 >= 0 and " "o0 <= 1 and o1 >= 0 and o1 <= 1) }"; - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); str = "{[new,old] -> [new+1-2*[(new+1)/2],old+1-2*[(old+1)/2]]}"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); str = "{[new,old] -> [(new+1)%2,(old+1)%2]}"; - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); str = "[n] -> { [c1] : c1>=0 and c1<=floord(n-4,3) }"; str2 = "[n] -> { [c1] : c1 >= 0 and 3c1 <= -4 + n }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; str = "{ [i,j] -> [i] : i < j; [i,j] -> [j] : j <= i }"; str2 = "{ [i,j] -> [min(i,j)] }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; str = "{ [i,j] : i != j }"; str2 = "{ [i,j] : i < j or i > j }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; str = "{ [i,j] : (i+1)*2 >= j }"; str2 = "{ [i, j] : j <= 2 + 2i }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; str = "{ [i] -> [i > 0 ? 4 : 5] }"; str2 = "{ [i] -> [5] : i <= 0; [i] -> [4] : i >= 1 }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; str = "[N=2,M] -> { [i=[(M+N)/4]] }"; str2 = "[N, M] -> { [i] : N = 2 and 4i <= 2 + M and 4i >= -1 + M }"; - test_parse_map_equal(ctx, str, str2); + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; + + str = "{ [x] : x >= 0 }"; + str2 = "{ [x] : x-0 >= 0 }"; + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; + + str = "{ [i] : ((i > 10)) }"; + str2 = "{ [i] : i >= 11 }"; + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; + + str = "{ [i] -> [0] }"; + str2 = "{ [i] -> [0 * i] }"; + if (test_parse_map_equal(ctx, str, str2) < 0) + return -1; test_parse_pwqp(ctx, "{ [i] -> i + [ (i + [i/3])/2 ] }"); test_parse_map(ctx, "{ S1[i] -> [([i/10]),i%10] : 0 <= i <= 45 }"); + test_parse_pwaff(ctx, "{ [i] -> [i + 1] : i > 0; [a] -> [a] : a < 0 }"); + test_parse_pwqp(ctx, "{ [x] -> ([(x)/2] * [(x)/3]) }"); + + if (test_parse_map_equal(ctx, "{ [a] -> [b] : (not false) }", + "{ [a] -> [b] : true }") < 0) + return -1; + + if (test_parse_map_equal(ctx, "{ [i] : i/2 <= 5 }", + "{ [i] : i <= 10 }") < 0) + return -1; + + if (test_parse_map_equal(ctx, "{Sym=[n] [i] : i <= n }", + "[n] -> { [i] : i <= n }") < 0) + return -1; + + return 0; } void test_read(struct isl_ctx *ctx) @@ -156,8 +220,8 @@ void test_read(struct isl_ctx *ctx) input = fopen(filename, "r"); assert(input); - bset1 = isl_basic_set_read_from_file(ctx, input, 0); - bset2 = isl_basic_set_read_from_str(ctx, str, 0); + bset1 = isl_basic_set_read_from_file(ctx, input); + bset2 = isl_basic_set_read_from_str(ctx, str); assert(isl_basic_set_is_equal(bset1, bset2) == 1); @@ -173,17 +237,17 @@ void test_bounded(struct isl_ctx *ctx) isl_set *set; int bounded; - set = isl_set_read_from_str(ctx, "[n] -> {[i] : 0 <= i <= n }", -1); + set = isl_set_read_from_str(ctx, "[n] -> {[i] : 0 <= i <= n }"); bounded = isl_set_is_bounded(set); assert(bounded); isl_set_free(set); - set = isl_set_read_from_str(ctx, "{[n, i] : 0 <= i <= n }", -1); + set = isl_set_read_from_str(ctx, "{[n, i] : 0 <= i <= n }"); bounded = isl_set_is_bounded(set); assert(!bounded); isl_set_free(set); - set = isl_set_read_from_str(ctx, "[n] -> {[i] : i <= n }", -1); + set = isl_set_read_from_str(ctx, "[n] -> {[i] : i <= n }"); bounded = isl_set_is_bounded(set); assert(!bounded); isl_set_free(set); @@ -194,28 +258,31 @@ void test_construction(struct isl_ctx *ctx) { isl_int v; isl_space *dim; + isl_local_space *ls; struct isl_basic_set *bset; struct isl_constraint *c; isl_int_init(v); dim = isl_space_set_alloc(ctx, 1, 1); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_inequality_alloc(isl_basic_set_get_space(bset)); + c = isl_inequality_alloc(isl_local_space_copy(ls)); 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_param, 0, v); bset = isl_basic_set_add_constraint(bset, c); - c = isl_inequality_alloc(isl_basic_set_get_space(bset)); + c = isl_inequality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -5); isl_constraint_set_constant(c, v); bset = isl_basic_set_add_constraint(bset, c); + isl_local_space_free(ls); isl_basic_set_free(bset); isl_int_clear(v); @@ -227,24 +294,24 @@ void test_dim(struct isl_ctx *ctx) isl_map *map1, *map2; map1 = isl_map_read_from_str(ctx, - "[n] -> { [i] -> [j] : exists (a = [i/10] : i - 10a <= n ) }", -1); + "[n] -> { [i] -> [j] : exists (a = [i/10] : i - 10a <= n ) }"); map1 = isl_map_add_dims(map1, isl_dim_in, 1); map2 = isl_map_read_from_str(ctx, - "[n] -> { [i,k] -> [j] : exists (a = [i/10] : i - 10a <= n ) }", -1); + "[n] -> { [i,k] -> [j] : exists (a = [i/10] : i - 10a <= n ) }"); assert(isl_map_is_equal(map1, map2)); isl_map_free(map2); map1 = isl_map_project_out(map1, isl_dim_in, 0, 1); - map2 = isl_map_read_from_str(ctx, "[n] -> { [i] -> [j] : n >= 0 }", -1); + map2 = isl_map_read_from_str(ctx, "[n] -> { [i] -> [j] : n >= 0 }"); assert(isl_map_is_equal(map1, map2)); isl_map_free(map1); isl_map_free(map2); str = "[n] -> { [i] -> [] : exists a : 0 <= i <= n and i = 2 a }"; - map1 = isl_map_read_from_str(ctx, str, -1); + map1 = isl_map_read_from_str(ctx, str); str = "{ [i] -> [j] : exists a : 0 <= i <= j and i = 2 a }"; - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); map1 = isl_map_move_dims(map1, isl_dim_out, 0, isl_dim_param, 0, 1); assert(isl_map_is_equal(map1, map2)); @@ -252,10 +319,15 @@ void test_dim(struct isl_ctx *ctx) isl_map_free(map2); } -void test_div(struct isl_ctx *ctx) +static int test_div(isl_ctx *ctx) { + unsigned n; + const char *str; + int empty; isl_int v; isl_space *dim; + isl_set *set; + isl_local_space *ls; struct isl_basic_set *bset; struct isl_constraint *c; @@ -263,9 +335,10 @@ void test_div(struct isl_ctx *ctx) /* test 1 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_constant(c, v); isl_int_set_si(v, 1); @@ -274,7 +347,7 @@ void test_div(struct isl_ctx *ctx) 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_constant(c, v); isl_int_set_si(v, -1); @@ -286,13 +359,15 @@ void test_div(struct isl_ctx *ctx) bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2); assert(bset && bset->n_div == 1); + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 2 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_constant(c, v); isl_int_set_si(v, -1); @@ -301,7 +376,7 @@ void test_div(struct isl_ctx *ctx) 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_constant(c, v); isl_int_set_si(v, 1); @@ -313,13 +388,15 @@ void test_div(struct isl_ctx *ctx) bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2); assert(bset && bset->n_div == 1); + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 3 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_constant(c, v); isl_int_set_si(v, -1); @@ -328,7 +405,7 @@ void test_div(struct isl_ctx *ctx) 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -3); isl_constraint_set_constant(c, v); isl_int_set_si(v, 1); @@ -340,13 +417,15 @@ void test_div(struct isl_ctx *ctx) bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2); assert(bset && bset->n_div == 1); + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 4 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 2); isl_constraint_set_constant(c, v); isl_int_set_si(v, -1); @@ -355,7 +434,7 @@ void test_div(struct isl_ctx *ctx) 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_constant(c, v); isl_int_set_si(v, 1); @@ -367,20 +446,22 @@ void test_div(struct isl_ctx *ctx) bset = isl_basic_set_project_out(bset, isl_dim_set, 1, 2); assert(isl_basic_set_is_empty(bset)); + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 5 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, 3); 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -3); @@ -391,19 +472,21 @@ void test_div(struct isl_ctx *ctx) assert(bset && bset->n_div == 0); isl_basic_set_free(bset); + isl_local_space_free(ls); /* test 6 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, 6); 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -3); @@ -414,6 +497,7 @@ void test_div(struct isl_ctx *ctx) assert(bset && bset->n_div == 1); isl_basic_set_free(bset); + isl_local_space_free(ls); /* test 7 */ /* This test is a bit tricky. We set up an equality @@ -426,9 +510,10 @@ void test_div(struct isl_ctx *ctx) * Perhaps we can avoid the introduction of this temporary div. */ dim = isl_space_set_alloc(ctx, 0, 4); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -3); @@ -445,13 +530,15 @@ void test_div(struct isl_ctx *ctx) /* assert(bset && bset->n_div == 1); */ + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 8 */ dim = isl_space_set_alloc(ctx, 0, 5); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -3); @@ -462,7 +549,7 @@ void test_div(struct isl_ctx *ctx) 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, 1); @@ -477,13 +564,15 @@ void test_div(struct isl_ctx *ctx) /* assert(bset && bset->n_div == 1); */ + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 9 */ dim = isl_space_set_alloc(ctx, 0, 4); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -1); @@ -492,7 +581,7 @@ void test_div(struct isl_ctx *ctx) 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_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, -1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, 3); @@ -507,13 +596,15 @@ void test_div(struct isl_ctx *ctx) assert(!isl_basic_set_is_empty(bset)); + isl_local_space_free(ls); isl_basic_set_free(bset); /* test 10 */ dim = isl_space_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_space(bset)); + c = isl_equality_alloc(isl_local_space_copy(ls)); isl_int_set_si(v, 1); isl_constraint_set_coefficient(c, isl_dim_set, 0, v); isl_int_set_si(v, -2); @@ -524,9 +615,42 @@ void test_div(struct isl_ctx *ctx) bset = isl_basic_set_fix_si(bset, isl_dim_set, 0, 2); + isl_local_space_free(ls); isl_basic_set_free(bset); isl_int_clear(v); + + str = "{ [i] : exists (e0, e1: 3e1 >= 1 + 2e0 and " + "8e1 <= -1 + 5i - 5e0 and 2e1 >= 1 + 2i - 5e0) }"; + set = isl_set_read_from_str(ctx, str); + set = isl_set_compute_divs(set); + isl_set_free(set); + if (!set) + return -1; + + str = "{ [i,j] : 2*[i/2] + 3 * [j/4] <= 10 and 2 i = j }"; + bset = isl_basic_set_read_from_str(ctx, str); + n = isl_basic_set_dim(bset, isl_dim_div); + isl_basic_set_free(bset); + if (!bset) + return -1; + if (n != 0) + isl_die(ctx, isl_error_unknown, + "expecting no existentials", return -1); + + str = "{ [i,j,k] : 3 + i + 2j >= 0 and 2 * [(i+2j)/4] <= k }"; + set = isl_set_read_from_str(ctx, str); + set = isl_set_remove_divs_involving_dims(set, isl_dim_set, 0, 2); + set = isl_set_fix_si(set, isl_dim_set, 2, -3); + empty = isl_set_is_empty(set); + isl_set_free(set); + if (empty < 0) + return -1; + if (!empty) + isl_die(ctx, isl_error_unknown, + "result not as accurate as expected", return -1); + + return 0; } void test_application_case(struct isl_ctx *ctx, const char *name) @@ -541,12 +665,12 @@ void test_application_case(struct isl_ctx *ctx, const char *name) input = fopen(filename, "r"); assert(input); - bset1 = isl_basic_set_read_from_file(ctx, input, 0); - bmap = isl_basic_map_read_from_file(ctx, input, 0); + bset1 = isl_basic_set_read_from_file(ctx, input); + bmap = isl_basic_map_read_from_file(ctx, input); bset1 = isl_basic_set_apply(bset1, bmap); - bset2 = isl_basic_set_read_from_file(ctx, input, 0); + bset2 = isl_basic_set_read_from_file(ctx, input); assert(isl_basic_set_is_equal(bset1, bset2) == 1); @@ -574,8 +698,8 @@ void test_affine_hull_case(struct isl_ctx *ctx, const char *name) input = fopen(filename, "r"); assert(input); - bset1 = isl_basic_set_read_from_file(ctx, input, 0); - bset2 = isl_basic_set_read_from_file(ctx, input, 0); + bset1 = isl_basic_set_read_from_file(ctx, input); + bset2 = isl_basic_set_read_from_file(ctx, input); bset1 = isl_basic_set_affine_hull(bset1); @@ -588,11 +712,30 @@ void test_affine_hull_case(struct isl_ctx *ctx, const char *name) fclose(input); } -void test_affine_hull(struct isl_ctx *ctx) +int test_affine_hull(struct isl_ctx *ctx) { + const char *str; + isl_set *set; + isl_basic_set *bset; + int n; + test_affine_hull_case(ctx, "affine2"); test_affine_hull_case(ctx, "affine"); test_affine_hull_case(ctx, "affine3"); + + str = "[m] -> { [i0] : exists (e0, e1: e1 <= 1 + i0 and " + "m >= 3 and 4i0 <= 2 + m and e1 >= i0 and " + "e1 >= 0 and e1 <= 2 and e1 >= 1 + 2e0 and " + "2e1 <= 1 + m + 4e0 and 2e1 >= 2 - m + 4i0 - 4e0) }"; + set = isl_set_read_from_str(ctx, str); + bset = isl_set_affine_hull(set); + n = isl_basic_set_dim(bset, isl_dim_div); + isl_basic_set_free(bset); + if (n != 0) + isl_die(ctx, isl_error_unknown, "not expecting any divs", + return -1); + + return 0; } void test_convex_hull_case(struct isl_ctx *ctx, const char *name) @@ -607,13 +750,13 @@ void test_convex_hull_case(struct isl_ctx *ctx, const char *name) input = fopen(filename, "r"); assert(input); - bset1 = isl_basic_set_read_from_file(ctx, input, 0); - bset2 = isl_basic_set_read_from_file(ctx, input, 0); + bset1 = isl_basic_set_read_from_file(ctx, input); + bset2 = isl_basic_set_read_from_file(ctx, input); set = isl_basic_set_union(bset1, bset2); bset1 = isl_set_convex_hull(set); - bset2 = isl_basic_set_read_from_file(ctx, input, 0); + bset2 = isl_basic_set_read_from_file(ctx, input); assert(isl_basic_set_is_equal(bset1, bset2) == 1); @@ -652,8 +795,8 @@ void test_convex_hull_algo(struct isl_ctx *ctx, int convex) "(i0 = 1 and i1 = 0 and i2 = 1) or " "(i0 = 0 and i1 = 0 and i2 = 0) }"; str2 = "{ [i0, i1, i2] : i0 >= 0 and i2 >= i0 and i2 <= 1 and i1 >= 0 }"; - set1 = isl_set_read_from_str(ctx, str1, -1); - set2 = isl_set_read_from_str(ctx, str2, -1); + set1 = isl_set_read_from_str(ctx, str1); + set2 = isl_set_read_from_str(ctx, str2); set1 = isl_set_from_basic_set(isl_set_convex_hull(set1)); assert(isl_set_is_equal(set1, set2)); isl_set_free(set1); @@ -679,12 +822,12 @@ void test_gist_case(struct isl_ctx *ctx, const char *name) input = fopen(filename, "r"); assert(input); - bset1 = isl_basic_set_read_from_file(ctx, input, 0); - bset2 = isl_basic_set_read_from_file(ctx, input, 0); + bset1 = isl_basic_set_read_from_file(ctx, input); + bset2 = isl_basic_set_read_from_file(ctx, input); bset1 = isl_basic_set_gist(bset1, bset2); - bset2 = isl_basic_set_read_from_file(ctx, input, 0); + bset2 = isl_basic_set_read_from_file(ctx, input); assert(isl_basic_set_is_equal(bset1, bset2) == 1); @@ -711,7 +854,7 @@ void test_gist(struct isl_ctx *ctx) "p3 <= 31 and p6 >= 128p3 and p5 >= 8p2 and p10 >= 0 and " "16e0 <= 15 + p0 + 15p6 + 15p10 and 16e0 >= p0 + 15p6 + 15p10 and " "p10 <= 15 and p10 <= -1 + p0 - p6) }"; - bset1 = isl_basic_set_read_from_str(ctx, str, -1); + bset1 = isl_basic_set_read_from_str(ctx, str); str = "[p0, p2, p3, p5, p6, p10] -> { [] : exists (e0 = [(p5)/8], " "e1 = [(p6)/128], e2 = [(8p2 - p5)/128], " "e3 = [(128p3 - p6)/4096]: 8e0 = p5 and 128e1 = p6 and " @@ -720,27 +863,71 @@ void test_gist(struct isl_ctx *ctx) "p3 <= 31 and 128p3 <= -1 + p0 and p6 >= -127 and " "p5 <= -1 + p0 and p6 <= -1 + p0 and p6 >= 128p3 and " "p0 >= 1 and p5 >= 8p2 and p10 >= 0 and p10 <= 15 ) }"; - bset2 = isl_basic_set_read_from_str(ctx, str, -1); + bset2 = isl_basic_set_read_from_str(ctx, str); bset1 = isl_basic_set_gist(bset1, bset2); assert(bset1 && bset1->n_div == 0); isl_basic_set_free(bset1); } -void test_coalesce_set(isl_ctx *ctx, const char *str, int check_one) +int test_coalesce_set(isl_ctx *ctx, const char *str, int check_one) { isl_set *set, *set2; + int equal; + int one; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); set = isl_set_coalesce(set); - set2 = isl_set_read_from_str(ctx, str, -1); - assert(isl_set_is_equal(set, set2)); - if (check_one) - assert(set && set->n == 1); + set2 = isl_set_read_from_str(ctx, str); + equal = isl_set_is_equal(set, set2); + one = set && set->n == 1; isl_set_free(set); isl_set_free(set2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, + "coalesced set not equal to input", return -1); + if (check_one && !one) + isl_die(ctx, isl_error_unknown, + "coalesced set should not be a union", return -1); + + return 0; +} + +int test_coalesce_unbounded_wrapping(isl_ctx *ctx) +{ + int r = 0; + int bounded; + + bounded = isl_options_get_coalesce_bounded_wrapping(ctx); + isl_options_set_coalesce_bounded_wrapping(ctx, 0); + + if (test_coalesce_set(ctx, + "{[x,y,z] : y + 2 >= 0 and x - y + 1 >= 0 and " + "-x - y + 1 >= 0 and -3 <= z <= 3;" + "[x,y,z] : -x+z + 20 >= 0 and -x-z + 20 >= 0 and " + "x-z + 20 >= 0 and x+z + 20 >= 0 and " + "-10 <= y <= 0}", 1) < 0) + goto error; + if (test_coalesce_set(ctx, + "{[x,y] : 0 <= x,y <= 10; [5,y]: 4 <=y <= 11}", 1) < 0) + goto error; + if (test_coalesce_set(ctx, + "{[x,0,0] : -5 <= x <= 5; [0,y,1] : -5 <= y <= 5 }", 1) < 0) + goto error; + + if (0) { +error: + r = -1; + } + + isl_options_set_coalesce_bounded_wrapping(ctx, bounded); + + return r; } -void test_coalesce(struct isl_ctx *ctx) +int test_coalesce(struct isl_ctx *ctx) { const char *str; struct isl_set *set, *set2; @@ -748,106 +935,106 @@ void test_coalesce(struct isl_ctx *ctx) set = isl_set_read_from_str(ctx, "{[x,y]: x >= 0 & x <= 10 & y >= 0 & y <= 10 or " - "y >= x & x >= 2 & 5 >= y }", -1); + "y >= x & x >= 2 & 5 >= y }"); set = isl_set_coalesce(set); assert(set && set->n == 1); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & 2x + y <= 30 & y <= 10 & x >= 0 or " - "x + y >= 10 & y <= x & x + y <= 20 & y >= 0}", -1); + "x + y >= 10 & y <= x & x + y <= 20 & y >= 0}"); set = isl_set_coalesce(set); assert(set && set->n == 1); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & 2x + y <= 30 & y <= 10 & x >= 0 or " - "x + y >= 10 & y <= x & x + y <= 19 & y >= 0}", -1); + "x + y >= 10 & y <= x & x + y <= 19 & y >= 0}"); set = isl_set_coalesce(set); assert(set && set->n == 2); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x >= 6 & x <= 10 & y <= x}", -1); + "y >= 0 & x >= 6 & x <= 10 & y <= x}"); set = isl_set_coalesce(set); assert(set && set->n == 1); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x >= 7 & x <= 10 & y <= x}", -1); + "y >= 0 & x >= 7 & x <= 10 & y <= x}"); set = isl_set_coalesce(set); assert(set && set->n == 2); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x >= 6 & x <= 10 & y + 1 <= x}", -1); + "y >= 0 & x >= 6 & x <= 10 & y + 1 <= x}"); set = isl_set_coalesce(set); assert(set && set->n == 2); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x = 6 & y <= 6}", -1); + "y >= 0 & x = 6 & y <= 6}"); set = isl_set_coalesce(set); assert(set && set->n == 1); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x = 7 & y <= 6}", -1); + "y >= 0 & x = 7 & y <= 6}"); set = isl_set_coalesce(set); assert(set && set->n == 2); isl_set_free(set); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x = 6 & y <= 5}", -1); + "y >= 0 & x = 6 & y <= 5}"); set = isl_set_coalesce(set); assert(set && set->n == 1); set2 = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x = 6 & y <= 5}", -1); + "y >= 0 & x = 6 & y <= 5}"); assert(isl_set_is_equal(set, set2)); isl_set_free(set); isl_set_free(set2); set = isl_set_read_from_str(ctx, "{[x,y]: y >= 0 & x <= 5 & y <= x or " - "y >= 0 & x = 6 & y <= 7}", -1); + "y >= 0 & x = 6 & y <= 7}"); set = isl_set_coalesce(set); assert(set && set->n == 2); isl_set_free(set); set = isl_set_read_from_str(ctx, - "[n] -> { [i] : i = 1 and n >= 2 or 2 <= i and i <= n }", -1); + "[n] -> { [i] : i = 1 and n >= 2 or 2 <= i and i <= n }"); set = isl_set_coalesce(set); assert(set && set->n == 1); set2 = isl_set_read_from_str(ctx, - "[n] -> { [i] : i = 1 and n >= 2 or 2 <= i and i <= n }", -1); + "[n] -> { [i] : i = 1 and n >= 2 or 2 <= i and i <= n }"); assert(isl_set_is_equal(set, set2)); isl_set_free(set); isl_set_free(set2); set = isl_set_read_from_str(ctx, - "{[x,y] : x >= 0 and y >= 0 or 0 <= y and y <= 5 and x = -1}", -1); + "{[x,y] : x >= 0 and y >= 0 or 0 <= y and y <= 5 and x = -1}"); set = isl_set_coalesce(set); set2 = isl_set_read_from_str(ctx, - "{[x,y] : x >= 0 and y >= 0 or 0 <= y and y <= 5 and x = -1}", -1); + "{[x,y] : x >= 0 and y >= 0 or 0 <= y and y <= 5 and x = -1}"); assert(isl_set_is_equal(set, set2)); isl_set_free(set); isl_set_free(set2); set = isl_set_read_from_str(ctx, "[n] -> { [i] : 1 <= i and i <= n - 1 or " - "2 <= i and i <= n }", -1); + "2 <= i and i <= n }"); set = isl_set_coalesce(set); assert(set && set->n == 1); set2 = isl_set_read_from_str(ctx, "[n] -> { [i] : 1 <= i and i <= n - 1 or " - "2 <= i and i <= n }", -1); + "2 <= i and i <= n }"); assert(isl_set_is_equal(set, set2)); isl_set_free(set); isl_set_free(set2); @@ -870,7 +1057,7 @@ void test_coalesce(struct isl_ctx *ctx) "i0 <= -11 + 4n and i0 <= 57 + 2n and 4e0 <= -2 + i0 and " "4e0 >= -3 + i0 and o0 >= 6 + 2n and o0 <= -11 + 4n and " "o0 <= 57 + 2n and 4e1 <= -2 + o0 and 4e1 >= -3 + o0 and " - "4e5 <= -2n + i0 and 4e5 >= -3 - 2n + i0 ) }", -1); + "4e5 <= -2n + i0 and 4e5 >= -3 - 2n + i0 ) }"); map = isl_map_coalesce(map); map2 = isl_map_read_from_str(ctx, "[n] -> { [i0] -> [o0] : exists (e0 = [(i0)/4], e1 = [(o0)/4], " @@ -890,7 +1077,7 @@ void test_coalesce(struct isl_ctx *ctx) "i0 <= -11 + 4n and i0 <= 57 + 2n and 4e0 <= -2 + i0 and " "4e0 >= -3 + i0 and o0 >= 6 + 2n and o0 <= -11 + 4n and " "o0 <= 57 + 2n and 4e1 <= -2 + o0 and 4e1 >= -3 + o0 and " - "4e5 <= -2n + i0 and 4e5 >= -3 - 2n + i0 ) }", -1); + "4e5 <= -2n + i0 and 4e5 >= -3 - 2n + i0 ) }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -899,9 +1086,9 @@ void test_coalesce(struct isl_ctx *ctx) "o0 <= n + m and o2 <= m and o0 >= 2 + n and o2 >= 3) or " "(o0 >= 2 + n and o0 >= 1 + m and o0 <= n + m and n >= 1 and " "o3 <= -1 + o2 and o3 >= 1 - m + o2 and o3 >= 2 and o3 <= n) }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_coalesce(map); - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -921,9 +1108,9 @@ void test_coalesce(struct isl_ctx *ctx) "o6 >= i3 + i6 - o3 and M >= 0 and " "2o6 >= 1 + i0 + i3 + 2i6 - o0 - o3 and " "o6 >= 1 - M + i0 + i6 - o0 and N >= 2M and o6 >= i0 + i6 - o0) }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_coalesce(map); - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -932,9 +1119,9 @@ void test_coalesce(struct isl_ctx *ctx) "(o0 = 0 and M >= 1 and N >= 2M and N >= 2 + M) or " "(o0 = 0 and M >= 2 and N >= 3) or " "(M = 0 and o0 = 0 and N >= 3) }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_coalesce(map); - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -943,9 +1130,9 @@ void test_coalesce(struct isl_ctx *ctx) "i3 <= 9 + 10 i2 and i3 >= 1 + 10i2 and i3 >= 0) or " "(i1 <= 9 + 10i0 and i1 >= 1 + 10i0 and i2 >= 0 and " "i0 >= 0 and i1 <= 100 and i3 <= 9 + 10i2 and i3 >= 1 + 10i2) }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_coalesce(map); - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -968,23 +1155,50 @@ void test_coalesce(struct isl_ctx *ctx) test_coalesce_set(ctx, "{ [x, y] : (x >= 0 and y >= 0 and x <= 10 and y <= 10) or " "(x >= 1 and y >= 1 and x <= 11 and y <= 11) }", 1); - test_coalesce_set(ctx, - "{[x,y,z] : y + 2 >= 0 and x - y + 1 >= 0 and " - "-x - y + 1 >= 0 and -3 <= z <= 3;" - "[x,y,z] : -x+z + 20 >= 0 and -x-z + 20 >= 0 and " - "x-z + 20 >= 0 and x+z + 20 >= 0 and -10 <= y <= 0}", 1); - test_coalesce_set(ctx, - "{[x,y] : 0 <= x,y <= 10; [5,y]: 4 <=y <= 11}", 1); - test_coalesce_set(ctx, "{[x,0] : x >= 0; [x,1] : x <= 20}", 0); - test_coalesce_set(ctx, - "{[x,0,0] : -5 <= x <= 5; [0,y,1] : -5 <= y <= 5 }", 1); - test_coalesce_set(ctx, "{ [x, 1 - x] : 0 <= x <= 1; [0,0] }", 1); - test_coalesce_set(ctx, "{ [0,0]; [i,i] : 1 <= i <= 10 }", 1); - test_coalesce_set(ctx, "{ [0,0]; [i,j] : 1 <= i,j <= 10 }", 0); - test_coalesce_set(ctx, "{ [0,0]; [i,2i] : 1 <= i <= 10 }", 1); - test_coalesce_set(ctx, "{ [0,0]; [i,2i] : 2 <= i <= 10 }", 0); - test_coalesce_set(ctx, "{ [1,0]; [i,2i] : 1 <= i <= 10 }", 0); - test_coalesce_set(ctx, "{ [0,1]; [i,2i] : 1 <= i <= 10 }", 0); + if (test_coalesce_unbounded_wrapping(ctx) < 0) + return -1; + if (test_coalesce_set(ctx, "{[x,0] : x >= 0; [x,1] : x <= 20}", 0) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [x, 1 - x] : 0 <= x <= 1; [0,0] }", 1) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [0,0]; [i,i] : 1 <= i <= 10 }", 1) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [0,0]; [i,j] : 1 <= i,j <= 10 }", 0) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [0,0]; [i,2i] : 1 <= i <= 10 }", 1) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [0,0]; [i,2i] : 2 <= i <= 10 }", 0) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [1,0]; [i,2i] : 1 <= i <= 10 }", 0) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [0,1]; [i,2i] : 1 <= i <= 10 }", 0) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [a, b] : exists e : 2e = a and " + "a >= 0 and (a <= 3 or (b <= 0 and b >= -4 + a)) }", 0) < 0) + return -1; + if (test_coalesce_set(ctx, + "{ [i, j, i', j'] : i <= 2 and j <= 2 and " + "j' >= -1 + 2i + j - 2i' and i' <= -1 + i and " + "j >= 1 and j' <= i + j - i' and i >= 1; " + "[1, 1, 1, 1] }", 0) < 0) + return -1; + if (test_coalesce_set(ctx, "{ [i,j] : exists a,b : i = 2a and j = 3b; " + "[i,j] : exists a : j = 3a }", 1) < 0) + return -1; + if (test_coalesce_set(ctx, + "{ [a, b, c] : (c <= 7 - b and b <= 1 and b >= 0 and " + "c >= 3 + b and b <= 3 + 8a and b >= -26 + 8a and " + "a >= 3) or " + "(b <= 1 and c <= 7 and b >= 0 and c >= 4 + b and " + "b <= 3 + 8a and b >= -26 + 8a and a >= 3) }", 1) < 0) + return -1; + if (test_coalesce_set(ctx, + "{ [a, 0, c] : c >= 1 and c <= 29 and c >= -1 + 8a and " + "c <= 6 + 8a and a >= 3; " + "[a, -1, c] : c >= 1 and c <= 30 and c >= 8a and " + "c <= 7 + 8a and a >= 3 and a <= 4 }", 1) < 0) + return -1; + return 0; } void test_closure(struct isl_ctx *ctx) @@ -1000,7 +1214,7 @@ void test_closure(struct isl_ctx *ctx) "[n] -> { [i,j] -> [i2,j2] : i2 = i + 1 and j2 = j + 1 and " "1 <= i and i < n and 1 <= j and j < n or " "i2 = i + 1 and j2 = j - 1 and " - "1 <= i and i < n and 2 <= j and j <= n }", -1); + "1 <= i and i < n and 2 <= j and j <= n }"); map = isl_map_power(map, &exact); assert(exact); isl_map_free(map); @@ -1010,7 +1224,7 @@ void test_closure(struct isl_ctx *ctx) "[n] -> { [i,j] -> [i2,j2] : i2 = i + 1 and j2 = j + 1 and " "1 <= i and i < n and 1 <= j and j < n or " "i2 = i + 1 and j2 = j - 1 and " - "1 <= i and i < n and 2 <= j and j <= n }", -1); + "1 <= i and i < n and 2 <= j and j <= n }"); map = isl_map_transitive_closure(map, &exact); assert(exact); map2 = isl_map_read_from_str(ctx, @@ -1018,18 +1232,18 @@ void test_closure(struct isl_ctx *ctx) "1 <= i and i < n and 1 <= j and j <= n and " "2 <= i2 and i2 <= n and 1 <= j2 and j2 <= n and " "i2 = i + k1 + k2 and j2 = j + k1 - k2 and " - "k1 >= 0 and k2 >= 0 and k1 + k2 = k and k >= 1 )}", -1); + "k1 >= 0 and k2 >= 0 and k1 + k2 = k and k >= 1 )}"); assert(isl_map_is_equal(map, map2)); isl_map_free(map2); isl_map_free(map); map = isl_map_read_from_str(ctx, "[n] -> { [x] -> [y] : y = x + 1 and 0 <= x and x <= n and " - " 0 <= y and y <= n }", -1); + " 0 <= y and y <= n }"); map = isl_map_transitive_closure(map, &exact); map2 = isl_map_read_from_str(ctx, "[n] -> { [x] -> [y] : y > x and 0 <= x and x <= n and " - " 0 <= y and y <= n }", -1); + " 0 <= y and y <= n }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map2); isl_map_free(map); @@ -1039,7 +1253,7 @@ void test_closure(struct isl_ctx *ctx) "[n] -> { [i,j] -> [i2,j2] : i2 = i + 2 and j2 = j + 2 and " "1 <= i and i < n - 1 and 1 <= j and j < n - 1 or " "i2 = i + 2 and j2 = j - 2 and " - "1 <= i and i < n - 1 and 3 <= j and j <= n }", -1); + "1 <= i and i < n - 1 and 3 <= j and j <= n }"); map = isl_map_transitive_closure(map, &exact); assert(exact); map2 = isl_map_read_from_str(ctx, @@ -1047,7 +1261,7 @@ void test_closure(struct isl_ctx *ctx) "1 <= i and i < n - 1 and 1 <= j and j <= n and " "3 <= i2 and i2 <= n and 1 <= j2 and j2 <= n and " "i2 = i + 2 k1 + 2 k2 and j2 = j + 2 k1 - 2 k2 and " - "k1 >= 0 and k2 >= 0 and k1 + k2 = k and k >= 1) }", -1); + "k1 >= 0 and k2 >= 0 and k1 + k2 = k and k >= 1) }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -1060,7 +1274,7 @@ void test_closure(struct isl_ctx *ctx) "i2 = i and j2 = j + 2 and i <= 2 j - 1 and i <= n and " "j <= 2 i - 3 and j <= n - 2 or " "i2 = i + 1 and j2 = j + 1 and i <= 2 j - 1 and " - "i <= n - 1 and j <= 2 i - 1 and j <= n - 1 }", -1); + "i <= n - 1 and j <= 2 i - 1 and j <= n - 1 }"); map = isl_map_transitive_closure(map, &exact); assert(exact); isl_map_free(map); @@ -1073,7 +1287,7 @@ void test_closure(struct isl_ctx *ctx) "i2 = i and j2 = j + 3 and i <= 2 j - 1 and i <= n and " "j <= 2 i - 4 and j <= n - 3 or " "i2 = i + 1 and j2 = j + 1 and i <= 2 j - 1 and " - "i <= n - 1 and j <= 2 i - 1 and j <= n - 1 }", -1); + "i <= n - 1 and j <= 2 i - 1 and j <= n - 1 }"); map = isl_map_power(map, &exact); assert(exact); isl_map_free(map); @@ -1086,7 +1300,7 @@ void test_closure(struct isl_ctx *ctx) "i2 = i and j2 = j + 3 and i <= 2 j - 1 and i <= n and " "j <= 2 i - 4 and j <= n - 3 or " "i2 = i + 1 and j2 = j + 1 and i <= 2 j - 1 and " - "i <= n - 1 and j <= 2 i - 1 and j <= n - 1 }", -1); + "i <= n - 1 and j <= 2 i - 1 and j <= n - 1 }"); map = isl_map_transitive_closure(map, &exact); assert(exact); map2 = isl_map_read_from_str(ctx, @@ -1097,7 +1311,7 @@ void test_closure(struct isl_ctx *ctx) "i2 <= 3 j2 - 4 and j2 <= 2 i2 -1 and j2 <= n and " "13 + 4 j2 <= 11 i2 and i2 = i + 3 k1 + k3 and " "j2 = j + 3 k2 + k3 and k1 >= 0 and k2 >= 0 and " - "k3 >= 0 and k1 + k2 + k3 = k and k > 0) }", -1); + "k3 >= 0 and k1 + k2 + k3 = k and k > 0) }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map2); isl_map_free(map); @@ -1105,11 +1319,11 @@ void test_closure(struct isl_ctx *ctx) /* COCOA Fig.1 right */ dom = isl_set_read_from_str(ctx, "{ [x,y] : x >= 0 and -2 x + 3 y >= 0 and x <= 3 and " - "2 x - 3 y + 3 >= 0 }", -1); + "2 x - 3 y + 3 >= 0 }"); right = isl_map_read_from_str(ctx, - "{ [x,y] -> [x2,y2] : x2 = x + 1 and y2 = y }", -1); + "{ [x,y] -> [x2,y2] : x2 = x + 1 and y2 = y }"); up = isl_map_read_from_str(ctx, - "{ [x,y] -> [x2,y2] : x2 = x and y2 = y + 1 }", -1); + "{ [x,y] -> [x2,y2] : x2 = x and y2 = y + 1 }"); right = isl_map_intersect_domain(right, isl_set_copy(dom)); right = isl_map_intersect_range(right, isl_set_copy(dom)); up = isl_map_intersect_domain(up, isl_set_copy(dom)); @@ -1119,7 +1333,7 @@ void test_closure(struct isl_ctx *ctx) assert(exact); map2 = isl_map_read_from_str(ctx, "{ [0,0] -> [0,1]; [0,0] -> [1,1]; [0,1] -> [1,1]; " - " [2,2] -> [3,2]; [2,2] -> [3,3]; [3,2] -> [3,3] }", -1); + " [2,2] -> [3,2]; [2,2] -> [3,3]; [3,2] -> [3,3] }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map2); isl_map_free(map); @@ -1128,7 +1342,7 @@ void test_closure(struct isl_ctx *ctx) map = isl_map_read_from_str(ctx, "{ [i,j] -> [i2,j2] : i = 0 and 0 <= j and j <= 1 and " "i2 = 1 and j2 = j or " - "i = 0 and j = 0 and i2 = 0 and j2 = 1 }", -1); + "i = 0 and j = 0 and i2 = 0 and j2 = 1 }"); map = isl_map_transitive_closure(map, &exact); assert(exact); isl_map_free(map); @@ -1137,7 +1351,7 @@ void test_closure(struct isl_ctx *ctx) "[m,n] -> { [i,j] -> [i2,j2] : i2 = i and j2 = j + 2 and " "1 <= i,i2 <= n and 1 <= j,j2 <= m or " "i2 = i + 1 and 3 <= j2 - j <= 4 and " - "1 <= i,i2 <= n and 1 <= j,j2 <= m }", -1); + "1 <= i,i2 <= n and 1 <= j,j2 <= m }"); map = isl_map_transitive_closure(map, &exact); assert(exact); isl_map_free(map); @@ -1147,14 +1361,14 @@ void test_closure(struct isl_ctx *ctx) "[n] -> { [i,j] -> [i2,j2] : i2 = i and j2 = j + 1 and " "1 <= i,j,j+1 <= n or " "j = n and j2 = 1 and i2 = i + 1 and " - "1 <= i,i+1 <= n }", -1); + "1 <= i,i+1 <= n }"); map = isl_map_transitive_closure(map, &exact); assert(exact); map2 = isl_map_read_from_str(ctx, "[n] -> { [i,j] -> [i2,j2] : 1 <= j < j2 <= n and " "1 <= i <= n and i = i2 or " "1 <= i < i2 <= n and 1 <= j <= n and " - "1 <= j2 <= n }", -1); + "1 <= j2 <= n }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map2); isl_map_free(map); @@ -1164,17 +1378,17 @@ void test_closure(struct isl_ctx *ctx) "[m,n] -> { [x,y] -> [x2,y2] : x2 = x and y2 = y + 1 and " "1 <= x,y <= 10 or " "x2 = x + 1 and y2 = y and " - "1 <= x <= 20 && 5 <= y <= 15 }", -1); + "1 <= x <= 20 && 5 <= y <= 15 }"); map = isl_map_transitive_closure(map, &exact); assert(exact); isl_map_free(map); map = isl_map_read_from_str(ctx, - "[n] -> { [x] -> [y]: 1 <= n <= y - x <= 10 }", -1); + "[n] -> { [x] -> [y]: 1 <= n <= y - x <= 10 }"); map = isl_map_transitive_closure(map, &exact); assert(!exact); map2 = isl_map_read_from_str(ctx, - "[n] -> { [x] -> [y] : 1 <= n <= 10 and y >= n + x }", -1); + "[n] -> { [x] -> [y] : 1 <= n <= 10 and y >= n + x }"); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -1183,19 +1397,19 @@ void test_closure(struct isl_ctx *ctx) "i3 = 1 and o0 = i0 and o1 = -1 + i1 and o2 = -1 + i2 and " "o3 = -2 + i2 and i1 <= -1 + i0 and i1 >= 1 - m + i0 and " "i1 >= 2 and i1 <= n and i2 >= 3 and i2 <= 1 + n and i2 <= m }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_transitive_closure(map, &exact); assert(exact); - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); str = "{[0] -> [1]; [2] -> [3]}"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_transitive_closure(map, &exact); assert(exact); - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -1220,7 +1434,7 @@ void test_closure(struct isl_ctx *ctx) "exists (e0 = [(3 - n)/3]: i5 >= 1 and i1 >= 1 and " "3i0 <= -1 + n and i1 <= -1 + n and i5 <= -1 + n and " "3e0 >= 1 - n and 3e0 <= 2 - n and 3i0 >= -2 + n) }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_transitive_closure(map, NULL); assert(map); isl_map_free(map); @@ -1231,28 +1445,12 @@ void test_lex(struct isl_ctx *ctx) isl_space *dim; isl_map *map; - dim = isl_space_alloc(ctx, 0, 0, 0); + dim = isl_space_set_alloc(ctx, 0, 0); map = isl_map_lex_le(dim); assert(!isl_map_is_empty(map)); isl_map_free(map); } -static int consume_lexmin(__isl_take isl_basic_set *dom, - __isl_take isl_aff_list *list, void *user) -{ - isl_space *dim; - isl_basic_map *bmap; - isl_map **map = user; - - dim = isl_basic_set_get_space(dom); - bmap = isl_basic_map_from_aff_list(dim, list); - bmap = isl_basic_map_intersect_domain(bmap, dom); - - *map = isl_map_union(*map, isl_map_from_basic_map(bmap)); - - return 0; -} - void test_lexmin(struct isl_ctx *ctx) { const char *str; @@ -1260,6 +1458,7 @@ void test_lexmin(struct isl_ctx *ctx) isl_map *map, *map2; isl_set *set; isl_set *set2; + isl_pw_multi_aff *pma; str = "[p0, p1] -> { [] -> [] : " "exists (e0 = [(2p1)/3], e1, e2, e3 = [(3 - p1 + 3e0)/3], " @@ -1273,32 +1472,32 @@ void test_lexmin(struct isl_ctx *ctx) "e5 >= 1 + e1 and 3e4 >= 6 - 2p1 + 3e1 and " "p0 >= 2 and p1 >= p0 and 3e2 >= p1 and 3e4 >= 6 - p1 + 3e2 and " "e2 <= e1 and e3 >= 1 and e4 <= e2) }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_lexmin(map); isl_map_free(map); str = "[C] -> { [obj,a,b,c] : obj <= 38 a + 7 b + 10 c and " "a + b <= 1 and c <= 10 b and c <= C and a,b,c,C >= 0 }"; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); set = isl_set_lexmax(set); str = "[C] -> { [obj,a,b,c] : C = 8 }"; - set2 = isl_set_read_from_str(ctx, str, -1); + set2 = isl_set_read_from_str(ctx, str); set = isl_set_intersect(set, set2); assert(!isl_set_is_empty(set)); isl_set_free(set); str = "{ [x] -> [y] : x <= y <= 10; [x] -> [5] : -8 <= x <= 8 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_lexmin(map); str = "{ [x] -> [5] : 6 <= x <= 8; " "[x] -> [x] : x <= 5 or (9 <= x <= 10) }"; - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); str = "{ [x] -> [y] : 4y = x or 4y = -1 + x or 4y = -2 + x }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map2 = isl_map_copy(map); map = isl_map_lexmin(map); assert(isl_map_is_equal(map, map2)); @@ -1306,26 +1505,49 @@ void test_lexmin(struct isl_ctx *ctx) isl_map_free(map2); str = "{ [x] -> [y] : x = 4y; [x] -> [y] : x = 2y }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); map = isl_map_lexmin(map); str = "{ [x] -> [y] : (4y = x and x >= 0) or " "(exists (e0 = [(x)/4], e1 = [(-2 + x)/4]: 2y = x and " "4e1 = -2 + x and 4e0 <= -1 + x and 4e0 >= -3 + x)) or " "(exists (e0 = [(x)/4]: 2y = x and 4e0 = x and x <= -4)) }"; - map2 = isl_map_read_from_str(ctx, str, -1); + map2 = isl_map_read_from_str(ctx, str); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); str = "{ [i] -> [i', j] : j = i - 8i' and i' >= 0 and i' <= 7 and " " 8i' <= i and 8i' >= -7 + i }"; - bmap = isl_basic_map_read_from_str(ctx, str, -1); - map2 = isl_map_empty(isl_basic_map_get_space(bmap)); - isl_basic_map_foreach_lexmin(bmap, &consume_lexmin, &map2); + bmap = isl_basic_map_read_from_str(ctx, str); + pma = isl_basic_map_lexmin_pw_multi_aff(isl_basic_map_copy(bmap)); + map2 = isl_map_from_pw_multi_aff(pma); map = isl_map_from_basic_map(bmap); assert(isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); + + str = "{ T[a] -> S[b, c] : a = 4b-2c and c >= b }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_lexmin(map); + str = "{ T[a] -> S[b, c] : 2b = a and 2c = a }"; + map2 = isl_map_read_from_str(ctx, str); + assert(isl_map_is_equal(map, map2)); + isl_map_free(map); + isl_map_free(map2); + + /* Check that empty pieces are properly combined. */ + str = "[K, N] -> { [x, y] -> [a, b] : K+2<=N<=K+4 and x>=4 and " + "2N-6<=x=N and a>=x+1 }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_lexmin(map); + str = "[K, N] -> { [x, y] -> [1 + x, N] : x >= -6 + 2N and " + "x <= -5 + 2N and x >= -1 + 3K - N and x <= -2 + K + N and " + "x >= 4 }"; + map2 = isl_map_read_from_str(ctx, str); + assert(isl_map_is_equal(map, map2)); + isl_map_free(map); + isl_map_free(map2); } struct must_may { @@ -1360,13 +1582,26 @@ static int map_is_equal(__isl_keep isl_map *map, const char *str) if (!map) return -1; - map2 = isl_map_read_from_str(map->ctx, str, -1); + map2 = isl_map_read_from_str(map->ctx, str); equal = isl_map_is_equal(map, map2); isl_map_free(map2); return equal; } +static int map_check_equal(__isl_keep isl_map *map, const char *str) +{ + int equal; + + equal = map_is_equal(map, str); + if (equal < 0) + return -1; + if (!equal) + isl_die(isl_map_get_ctx(map), isl_error_unknown, + "result not as expected", return -1); + return 0; +} + void test_dep(struct isl_ctx *ctx) { const char *str; @@ -1380,15 +1615,15 @@ void test_dep(struct isl_ctx *ctx) depth = 3; str = "{ [2,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_alloc(map, &depth, &common_space, 2); str = "{ [0,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 1, &depth); str = "{ [1,i,0] -> [5] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 1, &depth); flow = isl_access_info_compute_flow(ai); @@ -1410,15 +1645,15 @@ void test_dep(struct isl_ctx *ctx) str = "{ [2,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_alloc(map, &depth, &common_space, 2); str = "{ [0,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 1, &depth); str = "{ [1,i,0] -> [5] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); flow = isl_access_info_compute_flow(ai); @@ -1439,15 +1674,15 @@ void test_dep(struct isl_ctx *ctx) str = "{ [2,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_alloc(map, &depth, &common_space, 2); str = "{ [0,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); str = "{ [1,i,0] -> [5] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); flow = isl_access_info_compute_flow(ai); @@ -1469,15 +1704,15 @@ void test_dep(struct isl_ctx *ctx) str = "{ [0,i,2] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_alloc(map, &depth, &common_space, 2); str = "{ [0,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); str = "{ [0,i,1] -> [5] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); flow = isl_access_info_compute_flow(ai); @@ -1499,15 +1734,15 @@ void test_dep(struct isl_ctx *ctx) str = "{ [0,i,1] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_alloc(map, &depth, &common_space, 2); str = "{ [0,i,0] -> [i] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); str = "{ [0,i,2] -> [5] : 0 <= i <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 0, &depth); flow = isl_access_info_compute_flow(ai); @@ -1531,11 +1766,11 @@ void test_dep(struct isl_ctx *ctx) depth = 5; str = "{ [1,i,0,0,0] -> [i,j] : 0 <= i <= 10 and 0 <= j <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_alloc(map, &depth, &common_space, 1); str = "{ [0,i,0,j,0] -> [i,j] : 0 <= i <= 10 and 0 <= j <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); ai = isl_access_info_add_source(ai, map, 1, &depth); flow = isl_access_info_compute_flow(ai); @@ -1563,7 +1798,7 @@ int test_sv(isl_ctx *ctx) int sv; str = "[N] -> { [i] -> [f] : 0 <= i <= N and 0 <= i - 10 f <= 9 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); sv = isl_map_is_single_valued(map); isl_map_free(map); if (sv < 0) @@ -1573,7 +1808,7 @@ int test_sv(isl_ctx *ctx) "map not detected as single valued", return -1); str = "[N] -> { [i] -> [f] : 0 <= i <= N and 0 <= i - 10 f <= 10 }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); sv = isl_map_is_single_valued(map); isl_map_free(map); if (sv < 0) @@ -1609,7 +1844,7 @@ void test_bijective_case(struct isl_ctx *ctx, const char *str, int bijective) { isl_map *map; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); if (bijective) assert(isl_map_is_bijective(map)); else @@ -1644,7 +1879,7 @@ void test_pwqp(struct isl_ctx *ctx) pwqp1 = isl_pw_qpolynomial_read_from_str(ctx, str); pwqp1 = isl_pw_qpolynomial_move_dims(pwqp1, isl_dim_param, 0, - isl_dim_set, 1, 1); + isl_dim_in, 1, 1); str = "[j] -> { [i,k] -> 1 + 9 * [i/5] + 7 * [j/11] + 4 * [k/13] }"; pwqp2 = isl_pw_qpolynomial_read_from_str(ctx, str); @@ -1658,7 +1893,7 @@ void test_pwqp(struct isl_ctx *ctx) str = "{ [i] -> i }"; pwqp1 = isl_pw_qpolynomial_read_from_str(ctx, str); str = "{ [k] : exists a : k = 2a }"; - set = isl_set_read_from_str(ctx, str, 0); + set = isl_set_read_from_str(ctx, str); pwqp1 = isl_pw_qpolynomial_gist(pwqp1, set); str = "{ [i] -> i }"; pwqp2 = isl_pw_qpolynomial_read_from_str(ctx, str); @@ -1672,7 +1907,7 @@ void test_pwqp(struct isl_ctx *ctx) str = "{ [i] -> i + [ (i + [i/3])/2 ] }"; pwqp1 = isl_pw_qpolynomial_read_from_str(ctx, str); str = "{ [10] }"; - set = isl_set_read_from_str(ctx, str, 0); + set = isl_set_read_from_str(ctx, str); pwqp1 = isl_pw_qpolynomial_gist(pwqp1, set); str = "{ [i] -> 16 }"; pwqp2 = isl_pw_qpolynomial_read_from_str(ctx, str); @@ -1686,7 +1921,7 @@ void test_pwqp(struct isl_ctx *ctx) str = "{ [i] -> ([(i)/2]) }"; pwqp1 = isl_pw_qpolynomial_read_from_str(ctx, str); str = "{ [k] : exists a : k = 2a+1 }"; - set = isl_set_read_from_str(ctx, str, 0); + set = isl_set_read_from_str(ctx, str); pwqp1 = isl_pw_qpolynomial_gist(pwqp1, set); str = "{ [i] -> -1/2 + 1/2 * i }"; pwqp2 = isl_pw_qpolynomial_read_from_str(ctx, str); @@ -1783,13 +2018,13 @@ void test_bound(isl_ctx *ctx) str = "{ [[a, b, c, d] -> [e]] -> 0 }"; pwqp = isl_pw_qpolynomial_read_from_str(ctx, str); pwf = isl_pw_qpolynomial_bound(pwqp, isl_fold_max, NULL); - assert(isl_pw_qpolynomial_fold_dim(pwf, isl_dim_set) == 4); + assert(isl_pw_qpolynomial_fold_dim(pwf, isl_dim_in) == 4); isl_pw_qpolynomial_fold_free(pwf); str = "{ [[x]->[x]] -> 1 : exists a : x = 2 a }"; pwqp = isl_pw_qpolynomial_read_from_str(ctx, str); pwf = isl_pw_qpolynomial_bound(pwqp, isl_fold_max, NULL); - assert(isl_pw_qpolynomial_fold_dim(pwf, isl_dim_set) == 1); + assert(isl_pw_qpolynomial_fold_dim(pwf, isl_dim_in) == 1); isl_pw_qpolynomial_fold_free(pwf); } @@ -1800,30 +2035,99 @@ void test_lift(isl_ctx *ctx) isl_basic_set *bset; str = "{ [i0] : exists e0 : i0 = 4e0 }"; - bset = isl_basic_set_read_from_str(ctx, str, 0); + bset = isl_basic_set_read_from_str(ctx, str); bset = isl_basic_set_lift(bset); bmap = isl_basic_map_from_range(bset); bset = isl_basic_map_domain(bmap); isl_basic_set_free(bset); } -void test_subset(isl_ctx *ctx) +struct { + const char *set1; + const char *set2; + int subset; +} subset_tests[] = { + { "{ [112, 0] }", + "{ [i0, i1] : exists (e0 = [(i0 - i1)/16], e1: " + "16e0 <= i0 - i1 and 16e0 >= -15 + i0 - i1 and " + "16e1 <= i1 and 16e0 >= -i1 and 16e1 >= -i0 + i1) }", 1 }, + { "{ [65] }", + "{ [i] : exists (e0 = [(255i)/256], e1 = [(127i + 65e0)/191], " + "e2 = [(3i + 61e1)/65], e3 = [(52i + 12e2)/61], " + "e4 = [(2i + e3)/3], e5 = [(4i + e3)/4], e6 = [(8i + e3)/12]: " + "3e4 = 2i + e3 and 4e5 = 4i + e3 and 12e6 = 8i + e3 and " + "i <= 255 and 64e3 >= -45 + 67i and i >= 0 and " + "256e0 <= 255i and 256e0 >= -255 + 255i and " + "191e1 <= 127i + 65e0 and 191e1 >= -190 + 127i + 65e0 and " + "65e2 <= 3i + 61e1 and 65e2 >= -64 + 3i + 61e1 and " + "61e3 <= 52i + 12e2 and 61e3 >= -60 + 52i + 12e2) }", 1 }, + { "{ [i] : 0 <= i <= 10 }", "{ rat: [i] : 0 <= i <= 10 }", 1 }, + { "{ rat: [i] : 0 <= i <= 10 }", "{ [i] : 0 <= i <= 10 }", 0 }, + { "{ rat: [0] }", "{ [i] : 0 <= i <= 10 }", 1 }, + { "{ rat: [(1)/2] }", "{ [i] : 0 <= i <= 10 }", 0 }, +}; + +static int test_subset(isl_ctx *ctx) { - const char *str; + int i; isl_set *set1, *set2; + int subset; + + for (i = 0; i < ARRAY_SIZE(subset_tests); ++i) { + set1 = isl_set_read_from_str(ctx, subset_tests[i].set1); + set2 = isl_set_read_from_str(ctx, subset_tests[i].set2); + subset = isl_set_is_subset(set1, set2); + isl_set_free(set1); + isl_set_free(set2); + if (subset < 0) + return -1; + if (subset != subset_tests[i].subset) + isl_die(ctx, isl_error_unknown, + "incorrect subset result", return -1); + } - str = "{ [112, 0] }"; - set1 = isl_set_read_from_str(ctx, str, 0); - str = "{ [i0, i1] : exists (e0 = [(i0 - i1)/16], e1: " - "16e0 <= i0 - i1 and 16e0 >= -15 + i0 - i1 and " - "16e1 <= i1 and 16e0 >= -i1 and 16e1 >= -i0 + i1) }"; - set2 = isl_set_read_from_str(ctx, str, 0); - assert(isl_set_is_subset(set1, set2)); - isl_set_free(set1); - isl_set_free(set2); + return 0; +} + +struct { + const char *minuend; + const char *subtrahend; + const char *difference; +} subtract_domain_tests[] = { + { "{ A[i] -> B[i] }", "{ A[i] }", "{ }" }, + { "{ A[i] -> B[i] }", "{ B[i] }", "{ A[i] -> B[i] }" }, + { "{ A[i] -> B[i] }", "{ A[i] : i > 0 }", "{ A[i] -> B[i] : i <= 0 }" }, +}; + +static int test_subtract(isl_ctx *ctx) +{ + int i; + isl_union_map *umap1, *umap2; + isl_union_set *uset; + int equal; + + for (i = 0; i < ARRAY_SIZE(subtract_domain_tests); ++i) { + umap1 = isl_union_map_read_from_str(ctx, + subtract_domain_tests[i].minuend); + uset = isl_union_set_read_from_str(ctx, + subtract_domain_tests[i].subtrahend); + umap2 = isl_union_map_read_from_str(ctx, + subtract_domain_tests[i].difference); + umap1 = isl_union_map_subtract_domain(umap1, uset); + equal = isl_union_map_is_equal(umap1, umap2); + isl_union_map_free(umap1); + isl_union_map_free(umap2); + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, + "incorrect subtract domain result", return -1); + } + + return 0; } -void test_factorize(isl_ctx *ctx) +int test_factorize(isl_ctx *ctx) { const char *str; isl_basic_set *bset; @@ -1836,11 +2140,13 @@ void test_factorize(isl_ctx *ctx) "3i5 <= 2 - 2i0 - i2 + 3i4 and i6 <= 2 + 2i0 + 3i1 and " "i0 <= -1 and i7 <= i2 + i3 - 3i4 - i6 and " "3i5 >= -2i0 - i2 + 3i4 }"; - bset = isl_basic_set_read_from_str(ctx, str, 0); + bset = isl_basic_set_read_from_str(ctx, str); f = isl_basic_set_factorizer(bset); - assert(f); isl_basic_set_free(bset); isl_factorizer_free(f); + if (!f) + isl_die(ctx, isl_error_unknown, + "failed to construct factorizer", return -1); str = "{ [i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12] : " "i12 <= 2 + i0 - i11 and 2i8 >= -i4 and i11 >= i1 and " @@ -1852,11 +2158,15 @@ void test_factorize(isl_ctx *ctx) "3i5 >= -2 - i2 and i12 >= -1 + i4 + i11 and 3i3 <= 3 - i2 and " "9i6 <= 11 - i2 + 6i5 and 3i3 >= 1 - i2 and " "9i6 <= 5 - i2 + 6i3 and i12 <= -1 and i2 <= 0 }"; - bset = isl_basic_set_read_from_str(ctx, str, 0); + bset = isl_basic_set_read_from_str(ctx, str); f = isl_basic_set_factorizer(bset); - assert(f); isl_basic_set_free(bset); isl_factorizer_free(f); + if (!f) + isl_die(ctx, isl_error_unknown, + "failed to construct factorizer", return -1); + + return 0; } static int check_injective(__isl_take isl_map *map, void *user) @@ -1995,27 +2305,49 @@ int test_one_schedule(isl_ctx *ctx, const char *d, const char *w, return 0; } -int test_special_schedule(isl_ctx *ctx) +static __isl_give isl_union_map *compute_schedule(isl_ctx *ctx, + const char *domain, const char *validity, const char *proximity) { - const char *str; isl_union_set *dom; - isl_union_map *empty; isl_union_map *dep; - isl_union_map *sched1, *sched2; + isl_union_map *prox; isl_schedule *schedule; - int equal; + isl_union_map *sched; - str = "{ S[i,j] : 0 <= i <= 10 }"; - dom = isl_union_set_read_from_str(ctx, str); - str = "{ S[i,j] -> S[i+1,j] : 0 <= i,j <= 10 }"; - dep = isl_union_map_read_from_str(ctx, str); - empty = isl_union_map_read_from_str(ctx, "{}"); - schedule = isl_union_set_compute_schedule(dom, empty, dep); - sched1 = isl_schedule_get_map(schedule); + dom = isl_union_set_read_from_str(ctx, domain); + dep = isl_union_map_read_from_str(ctx, validity); + prox = isl_union_map_read_from_str(ctx, proximity); + schedule = isl_union_set_compute_schedule(dom, dep, prox); + sched = isl_schedule_get_map(schedule); isl_schedule_free(schedule); - str = "{ S[i, j] -> [j, i] }"; - sched2 = isl_union_map_read_from_str(ctx, str); + return sched; +} + +/* Check that a schedule can be constructed on the given domain + * with the given validity and proximity constraints. + */ +static int test_has_schedule(isl_ctx *ctx, const char *domain, + const char *validity, const char *proximity) +{ + isl_union_map *sched; + + sched = compute_schedule(ctx, domain, validity, proximity); + if (!sched) + return -1; + + isl_union_map_free(sched); + return 0; +} + +int test_special_schedule(isl_ctx *ctx, const char *domain, + const char *validity, const char *proximity, const char *expected_sched) +{ + isl_union_map *sched1, *sched2; + int equal; + + sched1 = compute_schedule(ctx, domain, validity, proximity); + sched2 = isl_union_map_read_from_str(ctx, expected_sched); equal = isl_union_map_is_equal(sched1, sched2); isl_union_map_free(sched1); @@ -2030,9 +2362,50 @@ int test_special_schedule(isl_ctx *ctx) return 0; } +/* Check that the schedule map is properly padded, even after being + * reconstructed from the band forest. + */ +static int test_padded_schedule(isl_ctx *ctx) +{ + const char *str; + isl_union_set *D; + isl_union_map *validity, *proximity; + isl_schedule *sched; + isl_union_map *map1, *map2; + isl_band_list *list; + int equal; + + str = "[N] -> { S0[i] : 0 <= i <= N; S1[i, j] : 0 <= i, j <= N }"; + D = isl_union_set_read_from_str(ctx, str); + validity = isl_union_map_empty(isl_union_set_get_space(D)); + proximity = isl_union_map_copy(validity); + sched = isl_union_set_compute_schedule(D, validity, proximity); + map1 = isl_schedule_get_map(sched); + list = isl_schedule_get_band_forest(sched); + isl_band_list_free(list); + map2 = isl_schedule_get_map(sched); + isl_schedule_free(sched); + equal = isl_union_map_is_equal(map1, map2); + isl_union_map_free(map1); + isl_union_map_free(map2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, + "reconstructed schedule map not the same as original", + return -1); + + return 0; +} + int test_schedule(isl_ctx *ctx) { - const char *D, *W, *R, *S; + const char *D, *W, *R, *V, *P, *S; + + /* Handle resulting schedule with zero bands. */ + if (test_one_schedule(ctx, "{[]}", "{}", "{}", "{[] -> []}", 0, 0) < 0) + return -1; /* Jacobi */ D = "[T,N] -> { S1[t,i] : 1 <= t <= T and 2 <= i <= N - 1 }"; @@ -2199,7 +2572,111 @@ int test_schedule(isl_ctx *ctx) return -1; ctx->opt->schedule_outer_zero_distance = 0; - return test_special_schedule(ctx); + D = "{Stmt_for_body24[i0, i1, i2, i3]:" + "i0 >= 0 and i0 <= 1 and i1 >= 0 and i1 <= 6 and i2 >= 2 and " + "i2 <= 6 - i1 and i3 >= 0 and i3 <= -1 + i2;" + "Stmt_for_body24[i0, i1, 1, 0]:" + "i0 >= 0 and i0 <= 1 and i1 >= 0 and i1 <= 5;" + "Stmt_for_body7[i0, i1, i2]:" + "i0 >= 0 and i0 <= 1 and i1 >= 0 and i1 <= 7 and i2 >= 0 and " + "i2 <= 7 }"; + + V = "{Stmt_for_body24[0, i1, i2, i3] -> " + "Stmt_for_body24[1, i1, i2, i3]:" + "i3 >= 0 and i3 <= -1 + i2 and i1 >= 0 and i2 <= 6 - i1 and " + "i2 >= 1;" + "Stmt_for_body24[0, i1, i2, i3] -> " + "Stmt_for_body7[1, 1 + i1 + i3, 1 + i1 + i2]:" + "i3 <= -1 + i2 and i2 <= 6 - i1 and i2 >= 1 and i1 >= 0 and " + "i3 >= 0;" + "Stmt_for_body24[0, i1, i2, i3] ->" + "Stmt_for_body7[1, i1, 1 + i1 + i3]:" + "i3 >= 0 and i2 <= 6 - i1 and i1 >= 0 and i3 <= -1 + i2;" + "Stmt_for_body7[0, i1, i2] -> Stmt_for_body7[1, i1, i2]:" + "(i2 >= 1 + i1 and i2 <= 6 and i1 >= 0 and i1 <= 4) or " + "(i2 >= 3 and i2 <= 7 and i1 >= 1 and i2 >= 1 + i1) or " + "(i2 >= 0 and i2 <= i1 and i2 >= -7 + i1 and i1 <= 7);" + "Stmt_for_body7[0, i1, 1 + i1] -> Stmt_for_body7[1, i1, 1 + i1]:" + "i1 <= 6 and i1 >= 0;" + "Stmt_for_body7[0, 0, 7] -> Stmt_for_body7[1, 0, 7];" + "Stmt_for_body7[i0, i1, i2] -> " + "Stmt_for_body24[i0, o1, -1 + i2 - o1, -1 + i1 - o1]:" + "i0 >= 0 and i0 <= 1 and o1 >= 0 and i2 >= 1 + i1 and " + "o1 <= -2 + i2 and i2 <= 7 and o1 <= -1 + i1;" + "Stmt_for_body7[i0, i1, i2] -> " + "Stmt_for_body24[i0, i1, o2, -1 - i1 + i2]:" + "i0 >= 0 and i0 <= 1 and i1 >= 0 and o2 >= -i1 + i2 and " + "o2 >= 1 and o2 <= 6 - i1 and i2 >= 1 + i1 }"; + P = V; + S = "{ Stmt_for_body24[i0, i1, i2, i3] -> " + "[i0, 5i0 + i1, 6i0 + i1 + i2, 1 + 6i0 + i1 + i2 + i3, 1];" + "Stmt_for_body7[i0, i1, i2] -> [0, 5i0, 6i0 + i1, 6i0 + i2, 0] }"; + + if (test_special_schedule(ctx, D, V, P, S) < 0) + return -1; + + D = "{ S_0[i, j] : i >= 1 and i <= 10 and j >= 1 and j <= 8 }"; + V = "{ S_0[i, j] -> S_0[i, 1 + j] : i >= 1 and i <= 10 and " + "j >= 1 and j <= 7;" + "S_0[i, j] -> S_0[1 + i, j] : i >= 1 and i <= 9 and " + "j >= 1 and j <= 8 }"; + P = "{ }"; + S = "{ S_0[i, j] -> [i + j, j] }"; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_FEAUTRIER; + if (test_special_schedule(ctx, D, V, P, S) < 0) + return -1; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_ISL; + + /* Fig. 1 from Feautrier's "Some Efficient Solutions..." pt. 2, 1992 */ + D = "[N] -> { S_0[i, j] : i >= 0 and i <= -1 + N and " + "j >= 0 and j <= -1 + i }"; + V = "[N] -> { S_0[i, j] -> S_0[i, 1 + j] : j <= -2 + i and " + "i <= -1 + N and j >= 0;" + "S_0[i, -1 + i] -> S_0[1 + i, 0] : i >= 1 and " + "i <= -2 + N }"; + P = "{ }"; + S = "{ S_0[i, j] -> [i, j] }"; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_FEAUTRIER; + if (test_special_schedule(ctx, D, V, P, S) < 0) + return -1; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_ISL; + + /* Test both algorithms on a case with only proximity dependences. */ + D = "{ S[i,j] : 0 <= i <= 10 }"; + V = "{ }"; + P = "{ S[i,j] -> S[i+1,j] : 0 <= i,j <= 10 }"; + S = "{ S[i, j] -> [j, i] }"; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_FEAUTRIER; + if (test_special_schedule(ctx, D, V, P, S) < 0) + return -1; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_ISL; + if (test_special_schedule(ctx, D, V, P, S) < 0) + return -1; + + D = "{ A[a]; B[] }"; + V = "{}"; + P = "{ A[a] -> B[] }"; + if (test_has_schedule(ctx, D, V, P) < 0) + return -1; + + if (test_padded_schedule(ctx) < 0) + return -1; + + /* Check that check for progress is not confused by rational + * solution. + */ + D = "[N] -> { S0[i, j] : i >= 0 and i <= N and j >= 0 and j <= N }"; + V = "[N] -> { S0[i0, -1 + N] -> S0[2 + i0, 0] : i0 >= 0 and " + "i0 <= -2 + N; " + "S0[i0, i1] -> S0[i0, 1 + i1] : i0 >= 0 and " + "i0 <= N and i1 >= 0 and i1 <= -1 + N }"; + P = "{}"; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_FEAUTRIER; + if (test_has_schedule(ctx, D, V, P) < 0) + return -1; + ctx->opt->schedule_algorithm = ISL_SCHEDULE_ALGORITHM_ISL; + + return 0; } int test_plain_injective(isl_ctx *ctx, const char *str, int injective) @@ -2253,29 +2730,57 @@ int test_injective(isl_ctx *ctx) return 0; } +static int aff_plain_is_equal(__isl_keep isl_aff *aff, const char *str) +{ + isl_aff *aff2; + int equal; + + if (!aff) + return -1; + + aff2 = isl_aff_read_from_str(isl_aff_get_ctx(aff), str); + equal = isl_aff_plain_is_equal(aff, aff2); + isl_aff_free(aff2); + + return equal; +} + +static int aff_check_plain_equal(__isl_keep isl_aff *aff, const char *str) +{ + int equal; + + equal = aff_plain_is_equal(aff, str); + if (equal < 0) + return -1; + if (!equal) + isl_die(isl_aff_get_ctx(aff), isl_error_unknown, + "result not as expected", return -1); + return 0; +} + int test_aff(isl_ctx *ctx) { const char *str; isl_set *set; - isl_space *dim; + isl_space *space; isl_local_space *ls; isl_aff *aff; - int zero; + int zero, equal; - dim = isl_space_set_alloc(ctx, 0, 1); - ls = isl_local_space_from_space(dim); - aff = isl_aff_zero(ls); + space = isl_space_set_alloc(ctx, 0, 1); + ls = isl_local_space_from_space(space); + aff = isl_aff_zero_on_domain(ls); - aff = isl_aff_add_coefficient_si(aff, isl_dim_set, 0, 1); + aff = isl_aff_add_coefficient_si(aff, isl_dim_in, 0, 1); aff = isl_aff_scale_down_ui(aff, 3); aff = isl_aff_floor(aff); - aff = isl_aff_add_coefficient_si(aff, isl_dim_set, 0, 1); + aff = isl_aff_add_coefficient_si(aff, isl_dim_in, 0, 1); aff = isl_aff_scale_down_ui(aff, 2); aff = isl_aff_floor(aff); - aff = isl_aff_add_coefficient_si(aff, isl_dim_set, 0, 1); + aff = isl_aff_add_coefficient_si(aff, isl_dim_in, 0, 1); str = "{ [10] }"; - set = isl_set_read_from_str(ctx, str, 0); + set = isl_set_read_from_str(ctx, str); aff = isl_aff_gist(aff, set); aff = isl_aff_add_constant_si(aff, -16); @@ -2287,54 +2792,63 @@ int test_aff(isl_ctx *ctx) if (!zero) isl_die(ctx, isl_error_unknown, "unexpected result", return -1); - return 0; -} - -int test_dim_max(isl_ctx *ctx) + aff = isl_aff_read_from_str(ctx, "{ [-1] }"); + aff = isl_aff_scale_down_ui(aff, 64); + aff = isl_aff_floor(aff); + equal = aff_check_plain_equal(aff, "{ [-1] }"); + isl_aff_free(aff); + if (equal < 0) + return -1; + + return 0; +} + +int test_dim_max(isl_ctx *ctx) { int equal; const char *str; - isl_map *map, *map2; + isl_set *set1, *set2; isl_set *set; + isl_map *map; isl_pw_aff *pwaff; str = "[N] -> { [i] : 0 <= i <= min(N,10) }"; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); pwaff = isl_set_dim_max(set, 0); - map = isl_map_from_pw_aff(pwaff); - str = "[N] -> { [] -> [10] : N >= 10; [] -> [N] : N <= 9 and N >= 0 }"; - map2 = isl_map_read_from_str(ctx, str, -1); - equal = isl_map_is_equal(map, map2); - isl_map_free(map); - isl_map_free(map2); + set1 = isl_set_from_pw_aff(pwaff); + str = "[N] -> { [10] : N >= 10; [N] : N <= 9 and N >= 0 }"; + set2 = isl_set_read_from_str(ctx, str); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); if (equal < 0) return -1; if (!equal) isl_die(ctx, isl_error_unknown, "unexpected result", return -1); str = "[N] -> { [i] : 0 <= i <= max(2N,N+6) }"; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); pwaff = isl_set_dim_max(set, 0); - map = isl_map_from_pw_aff(pwaff); - str = "[N] -> { [] -> [6 + N] : -6 <= N <= 5; [] -> [2N] : N >= 6 }"; - map2 = isl_map_read_from_str(ctx, str, -1); - equal = isl_map_is_equal(map, map2); - isl_map_free(map); - isl_map_free(map2); + set1 = isl_set_from_pw_aff(pwaff); + str = "[N] -> { [6 + N] : -6 <= N <= 5; [2N] : N >= 6 }"; + set2 = isl_set_read_from_str(ctx, str); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); if (equal < 0) return -1; if (!equal) isl_die(ctx, isl_error_unknown, "unexpected result", return -1); str = "[N] -> { [i] : 0 <= i <= 2N or 0 <= i <= N+6 }"; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); pwaff = isl_set_dim_max(set, 0); - map = isl_map_from_pw_aff(pwaff); - str = "[N] -> { [] -> [6 + N] : -6 <= N <= 5; [] -> [2N] : N >= 6 }"; - map2 = isl_map_read_from_str(ctx, str, -1); - equal = isl_map_is_equal(map, map2); - isl_map_free(map); - isl_map_free(map2); + set1 = isl_set_from_pw_aff(pwaff); + str = "[N] -> { [6 + N] : -6 <= N <= 5; [2N] : N >= 6 }"; + set2 = isl_set_read_from_str(ctx, str); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); if (equal < 0) return -1; if (!equal) @@ -2342,25 +2856,25 @@ int test_dim_max(isl_ctx *ctx) str = "[N,M] -> { [i,j] -> [([i/16]), i%16, ([j/16]), j%16] : " "0 <= i < N and 0 <= j < M }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); set = isl_map_range(map); pwaff = isl_set_dim_max(isl_set_copy(set), 0); - map = isl_map_from_pw_aff(pwaff); - str = "[N,M] -> { [] -> [([(N-1)/16])] : M,N > 0 }"; - map2 = isl_map_read_from_str(ctx, str, -1); - equal = isl_map_is_equal(map, map2); - isl_map_free(map); - isl_map_free(map2); + set1 = isl_set_from_pw_aff(pwaff); + str = "[N,M] -> { [([(N-1)/16])] : M,N > 0 }"; + set2 = isl_set_read_from_str(ctx, str); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); pwaff = isl_set_dim_max(isl_set_copy(set), 3); - map = isl_map_from_pw_aff(pwaff); - str = "[N,M] -> { [] -> [t] : t = min(M-1,15) and M,N > 0 }"; - map2 = isl_map_read_from_str(ctx, str, -1); + set1 = isl_set_from_pw_aff(pwaff); + str = "[N,M] -> { [t] : t = min(M-1,15) and M,N > 0 }"; + set2 = isl_set_read_from_str(ctx, str); if (equal >= 0 && equal) - equal = isl_map_is_equal(map, map2); - isl_map_free(map); - isl_map_free(map2); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); isl_set_free(set); @@ -2369,6 +2883,24 @@ int test_dim_max(isl_ctx *ctx) if (!equal) isl_die(ctx, isl_error_unknown, "unexpected result", return -1); + /* Check that solutions are properly merged. */ + str = "[n] -> { [a, b, c] : c >= -4a - 2b and " + "c <= -1 + n - 4a - 2b and c >= -2b and " + "4a >= -4 + n and c >= 0 }"; + set = isl_set_read_from_str(ctx, str); + pwaff = isl_set_dim_min(set, 2); + set1 = isl_set_from_pw_aff(pwaff); + str = "[n] -> { [(0)] : n >= 1 }"; + set2 = isl_set_read_from_str(ctx, str); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "unexpected result", return -1); + return 0; } @@ -2376,10 +2908,11 @@ int test_product(isl_ctx *ctx) { const char *str; isl_set *set; + isl_union_set *uset1, *uset2; int ok; str = "{ A[i] }"; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); set = isl_set_product(set, isl_set_copy(set)); ok = isl_set_is_wrapping(set); isl_set_free(set); @@ -2388,6 +2921,19 @@ int test_product(isl_ctx *ctx) if (!ok) isl_die(ctx, isl_error_unknown, "unexpected result", return -1); + str = "{ [] }"; + uset1 = isl_union_set_read_from_str(ctx, str); + uset1 = isl_union_set_product(uset1, isl_union_set_copy(uset1)); + str = "{ [[] -> []] }"; + uset2 = isl_union_set_read_from_str(ctx, str); + ok = isl_union_set_is_equal(uset1, uset2); + isl_union_set_free(uset1); + isl_union_set_free(uset2); + if (ok < 0) + return -1; + if (!ok) + isl_die(ctx, isl_error_unknown, "unexpected result", return -1); + return 0; } @@ -2398,9 +2944,9 @@ int test_equal(isl_ctx *ctx) int equal; str = "{ S_6[i] }"; - set = isl_set_read_from_str(ctx, str, -1); + set = isl_set_read_from_str(ctx, str); str = "{ S_7[i] }"; - set2 = isl_set_read_from_str(ctx, str, -1); + set2 = isl_set_read_from_str(ctx, str); equal = isl_set_is_equal(set, set2); isl_set_free(set); isl_set_free(set2); @@ -2437,18 +2983,18 @@ int test_fixed(isl_ctx *ctx) isl_map *map; str = "{ [i] -> [i] }"; - map = isl_map_read_from_str(ctx, str, -1); + map = isl_map_read_from_str(ctx, str); 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); + map = isl_map_read_from_str(ctx, str); 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); + map = isl_map_read_from_str(ctx, str); 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_read_from_str(ctx, str); map = isl_map_neg(map); if (test_plain_fixed(ctx, map, isl_dim_out, 0, 1)) return -1; @@ -2456,51 +3002,1033 @@ int test_fixed(isl_ctx *ctx) return 0; } +int test_vertices(isl_ctx *ctx) +{ + const char *str; + isl_basic_set *bset; + isl_vertices *vertices; + + str = "{ A[t, i] : t = 12 and i >= 4 and i <= 12 }"; + bset = isl_basic_set_read_from_str(ctx, str); + vertices = isl_basic_set_compute_vertices(bset); + isl_basic_set_free(bset); + isl_vertices_free(vertices); + if (!vertices) + return -1; + + str = "{ A[t, i] : t = 14 and i = 1 }"; + bset = isl_basic_set_read_from_str(ctx, str); + vertices = isl_basic_set_compute_vertices(bset); + isl_basic_set_free(bset); + isl_vertices_free(vertices); + if (!vertices) + return -1; + + return 0; +} + +int test_union_pw(isl_ctx *ctx) +{ + int equal; + const char *str; + isl_union_set *uset; + isl_union_pw_qpolynomial *upwqp1, *upwqp2; + + str = "{ [x] -> x^2 }"; + upwqp1 = isl_union_pw_qpolynomial_read_from_str(ctx, str); + upwqp2 = isl_union_pw_qpolynomial_copy(upwqp1); + uset = isl_union_pw_qpolynomial_domain(upwqp1); + upwqp1 = isl_union_pw_qpolynomial_copy(upwqp2); + upwqp1 = isl_union_pw_qpolynomial_intersect_domain(upwqp1, uset); + equal = isl_union_pw_qpolynomial_plain_is_equal(upwqp1, upwqp2); + isl_union_pw_qpolynomial_free(upwqp1); + isl_union_pw_qpolynomial_free(upwqp2); + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "unexpected result", return -1); + + return 0; +} + +int test_output(isl_ctx *ctx) +{ + char *s; + const char *str; + isl_pw_aff *pa; + isl_printer *p; + int equal; + + str = "[x] -> { [1] : x % 4 <= 2; [2] : x = 3 }"; + pa = isl_pw_aff_read_from_str(ctx, str); + + p = isl_printer_to_str(ctx); + p = isl_printer_set_output_format(p, ISL_FORMAT_C); + p = isl_printer_print_pw_aff(p, pa); + s = isl_printer_get_str(p); + isl_printer_free(p); + isl_pw_aff_free(pa); + if (!s) + equal = -1; + else + equal = !strcmp(s, "(2 - x + 4*floord(x, 4) >= 0) ? (1) : 2"); + free(s); + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "unexpected result", return -1); + + return 0; +} + +int test_sample(isl_ctx *ctx) +{ + const char *str; + isl_basic_set *bset1, *bset2; + int empty, subset; + + str = "{ [a, b, c, d, e, f, g, h, i, j, k] : " + "3i >= 1073741823b - c - 1073741823e + f and c >= 0 and " + "3i >= -1 + 3221225466b + c + d - 3221225466e - f and " + "2e >= a - b and 3e <= 2a and 3k <= -a and f <= -1 + a and " + "3i <= 4 - a + 4b + 2c - e - 2f and 3k <= -a + c - f and " + "3h >= -2 + a and 3g >= -3 - a and 3k >= -2 - a and " + "3i >= -2 - a - 2c + 3e + 2f and 3h <= a + c - f and " + "3h >= a + 2147483646b + 2c - 2147483646e - 2f and " + "3g <= -1 - a and 3i <= 1 + c + d - f and a <= 1073741823 and " + "f >= 1 - a + 1073741822b + c + d - 1073741822e and " + "3i >= 1 + 2b - 2c + e + 2f + 3g and " + "1073741822f <= 1073741822 - a + 1073741821b + 1073741822c +" + "d - 1073741821e and " + "3j <= 3 - a + 3b and 3g <= -2 - 2b + c + d - e - f and " + "3j >= 1 - a + b + 2e and " + "3f >= -3 + a + 3221225462b + 3c + d - 3221225465e and " + "3i <= 4 - a + 4b - e and " + "f <= 1073741822 + 1073741822b - 1073741822e and 3h <= a and " + "f >= 0 and 2e <= 4 - a + 5b - d and 2e <= a - b + d and " + "c <= -1 + a and 3i >= -2 - a + 3e and " + "1073741822e <= 1073741823 - a + 1073741822b + c and " + "3g >= -4 + 3221225464b + 3c + d - 3221225467e - 3f and " + "3i >= -1 + 3221225466b + 3c + d - 3221225466e - 3f and " + "1073741823e >= 1 + 1073741823b - d and " + "3i >= 1073741823b + c - 1073741823e - f and " + "3i >= 1 + 2b + e + 3g }"; + bset1 = isl_basic_set_read_from_str(ctx, str); + bset2 = isl_basic_set_sample(isl_basic_set_copy(bset1)); + empty = isl_basic_set_is_empty(bset2); + subset = isl_basic_set_is_subset(bset2, bset1); + isl_basic_set_free(bset1); + isl_basic_set_free(bset2); + if (empty < 0 || subset < 0) + return -1; + if (empty) + isl_die(ctx, isl_error_unknown, "point not found", return -1); + if (!subset) + isl_die(ctx, isl_error_unknown, "bad point found", return -1); + + return 0; +} + +int test_fixed_power(isl_ctx *ctx) +{ + const char *str; + isl_map *map; + isl_int exp; + int equal; + + isl_int_init(exp); + str = "{ [i] -> [i + 1] }"; + map = isl_map_read_from_str(ctx, str); + isl_int_set_si(exp, 23); + map = isl_map_fixed_power(map, exp); + equal = map_check_equal(map, "{ [i] -> [i + 23] }"); + isl_int_clear(exp); + isl_map_free(map); + if (equal < 0) + return -1; + + return 0; +} + +int test_slice(isl_ctx *ctx) +{ + const char *str; + isl_map *map; + int equal; + + str = "{ [i] -> [j] }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_equate(map, isl_dim_in, 0, isl_dim_out, 0); + equal = map_check_equal(map, "{ [i] -> [i] }"); + isl_map_free(map); + if (equal < 0) + return -1; + + str = "{ [i] -> [j] }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_equate(map, isl_dim_in, 0, isl_dim_in, 0); + equal = map_check_equal(map, "{ [i] -> [j] }"); + isl_map_free(map); + if (equal < 0) + return -1; + + str = "{ [i] -> [j] }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_oppose(map, isl_dim_in, 0, isl_dim_out, 0); + equal = map_check_equal(map, "{ [i] -> [-i] }"); + isl_map_free(map); + if (equal < 0) + return -1; + + str = "{ [i] -> [j] }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_oppose(map, isl_dim_in, 0, isl_dim_in, 0); + equal = map_check_equal(map, "{ [0] -> [j] }"); + isl_map_free(map); + if (equal < 0) + return -1; + + str = "{ [i] -> [j] }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_order_gt(map, isl_dim_in, 0, isl_dim_out, 0); + equal = map_check_equal(map, "{ [i] -> [j] : i > j }"); + isl_map_free(map); + if (equal < 0) + return -1; + + str = "{ [i] -> [j] }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_order_gt(map, isl_dim_in, 0, isl_dim_in, 0); + equal = map_check_equal(map, "{ [i] -> [j] : false }"); + isl_map_free(map); + if (equal < 0) + return -1; + + return 0; +} + +int test_eliminate(isl_ctx *ctx) +{ + const char *str; + isl_map *map; + int equal; + + str = "{ [i] -> [j] : i = 2j }"; + map = isl_map_read_from_str(ctx, str); + map = isl_map_eliminate(map, isl_dim_out, 0, 1); + equal = map_check_equal(map, "{ [i] -> [j] : exists a : i = 2a }"); + isl_map_free(map); + if (equal < 0) + return -1; + + return 0; +} + +/* Check that isl_set_dim_residue_class detects that the values of j + * in the set below are all odd and that it does not detect any spurious + * strides. + */ +static int test_residue_class(isl_ctx *ctx) +{ + const char *str; + isl_set *set; + isl_int m, r; + int res; + + str = "{ [i,j] : j = 4 i + 1 and 0 <= i <= 100; " + "[i,j] : j = 4 i + 3 and 500 <= i <= 600 }"; + set = isl_set_read_from_str(ctx, str); + isl_int_init(m); + isl_int_init(r); + res = isl_set_dim_residue_class(set, 1, &m, &r); + if (res >= 0 && + (isl_int_cmp_si(m, 2) != 0 || isl_int_cmp_si(r, 1) != 0)) + isl_die(ctx, isl_error_unknown, "incorrect residue class", + res = -1); + isl_int_clear(r); + isl_int_clear(m); + isl_set_free(set); + + return res; +} + +int test_align_parameters(isl_ctx *ctx) +{ + const char *str; + isl_space *space; + isl_multi_aff *ma1, *ma2; + int equal; + + str = "{ A[B[] -> C[]] -> D[E[] -> F[]] }"; + ma1 = isl_multi_aff_read_from_str(ctx, str); + + space = isl_space_params_alloc(ctx, 1); + space = isl_space_set_dim_name(space, isl_dim_param, 0, "N"); + ma1 = isl_multi_aff_align_params(ma1, space); + + str = "[N] -> { A[B[] -> C[]] -> D[E[] -> F[]] }"; + ma2 = isl_multi_aff_read_from_str(ctx, str); + + equal = isl_multi_aff_plain_is_equal(ma1, ma2); + + isl_multi_aff_free(ma1); + isl_multi_aff_free(ma2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, + "result not as expected", return -1); + + return 0; +} + +static int test_list(isl_ctx *ctx) +{ + isl_id *a, *b, *c, *d, *id; + isl_id_list *list; + int ok; + + a = isl_id_alloc(ctx, "a", NULL); + b = isl_id_alloc(ctx, "b", NULL); + c = isl_id_alloc(ctx, "c", NULL); + d = isl_id_alloc(ctx, "d", NULL); + + list = isl_id_list_alloc(ctx, 4); + list = isl_id_list_add(list, a); + list = isl_id_list_add(list, b); + list = isl_id_list_add(list, c); + list = isl_id_list_add(list, d); + list = isl_id_list_drop(list, 1, 1); + + if (isl_id_list_n_id(list) != 3) { + isl_id_list_free(list); + isl_die(ctx, isl_error_unknown, + "unexpected number of elements in list", return -1); + } + + id = isl_id_list_get_id(list, 0); + ok = id == a; + isl_id_free(id); + id = isl_id_list_get_id(list, 1); + ok = ok && id == c; + isl_id_free(id); + id = isl_id_list_get_id(list, 2); + ok = ok && id == d; + isl_id_free(id); + + isl_id_list_free(list); + + if (!ok) + isl_die(ctx, isl_error_unknown, + "unexpected elements in list", return -1); + + return 0; +} + +const char *set_conversion_tests[] = { + "[N] -> { [i] : N - 1 <= 2 i <= N }", + "[N] -> { [i] : exists a : i = 4 a and N - 1 <= i <= N }", + "[N] -> { [i,j] : exists a : i = 4 a and N - 1 <= i, 2j <= N }", + "[N] -> { [[i]->[j]] : exists a : i = 4 a and N - 1 <= i, 2j <= N }", +}; + +/* Check that converting from isl_set to isl_pw_multi_aff and back + * to isl_set produces the original isl_set. + */ +static int test_set_conversion(isl_ctx *ctx) +{ + int i; + const char *str; + isl_set *set1, *set2; + isl_pw_multi_aff *pma; + int equal; + + for (i = 0; i < ARRAY_SIZE(set_conversion_tests); ++i) { + str = set_conversion_tests[i]; + set1 = isl_set_read_from_str(ctx, str); + pma = isl_pw_multi_aff_from_set(isl_set_copy(set1)); + set2 = isl_set_from_pw_multi_aff(pma); + equal = isl_set_is_equal(set1, set2); + isl_set_free(set1); + isl_set_free(set2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "bad conversion", + return -1); + } + + return 0; +} + +/* Check that converting from isl_map to isl_pw_multi_aff and back + * to isl_map produces the original isl_map. + */ +static int test_map_conversion(isl_ctx *ctx) +{ + const char *str; + isl_map *map1, *map2; + isl_pw_multi_aff *pma; + int equal; + + str = "{ [a, b, c, d] -> s0[a, b, e, f] : " + "exists (e0 = [(a - 2c)/3], e1 = [(-4 + b - 5d)/9], " + "e2 = [(-d + f)/9]: 3e0 = a - 2c and 9e1 = -4 + b - 5d and " + "9e2 = -d + f and f >= 0 and f <= 8 and 9e >= -5 - 2a and " + "9e <= -2 - 2a) }"; + map1 = isl_map_read_from_str(ctx, str); + pma = isl_pw_multi_aff_from_map(isl_map_copy(map1)); + map2 = isl_map_from_pw_multi_aff(pma); + equal = isl_map_is_equal(map1, map2); + isl_map_free(map1); + isl_map_free(map2); + + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "bad conversion", return -1); + + return 0; +} + +static int test_conversion(isl_ctx *ctx) +{ + if (test_set_conversion(ctx) < 0) + return -1; + if (test_map_conversion(ctx) < 0) + return -1; + return 0; +} + +/* Check that isl_basic_map_curry does not modify input. + */ +static int test_curry(isl_ctx *ctx) +{ + const char *str; + isl_basic_map *bmap1, *bmap2; + int equal; + + str = "{ [A[] -> B[]] -> C[] }"; + bmap1 = isl_basic_map_read_from_str(ctx, str); + bmap2 = isl_basic_map_curry(isl_basic_map_copy(bmap1)); + equal = isl_basic_map_is_equal(bmap1, bmap2); + isl_basic_map_free(bmap1); + isl_basic_map_free(bmap2); + + if (equal < 0) + return -1; + if (equal) + isl_die(ctx, isl_error_unknown, + "curried map should not be equal to original", + return -1); + + return 0; +} + +struct { + const char *set; + const char *ma; + const char *res; +} preimage_tests[] = { + { "{ B[i,j] : 0 <= i < 10 and 0 <= j < 100 }", + "{ A[j,i] -> B[i,j] }", + "{ A[j,i] : 0 <= i < 10 and 0 <= j < 100 }" }, + { "{ rat: B[i,j] : 0 <= i, j and 3 i + 5 j <= 100 }", + "{ A[a,b] -> B[a/2,b/6] }", + "{ rat: A[a,b] : 0 <= a, b and 9 a + 5 b <= 600 }" }, + { "{ B[i,j] : 0 <= i, j and 3 i + 5 j <= 100 }", + "{ A[a,b] -> B[a/2,b/6] }", + "{ A[a,b] : 0 <= a, b and 9 a + 5 b <= 600 and " + "exists i,j : a = 2 i and b = 6 j }" }, + { "[n] -> { S[i] : 0 <= i <= 100 }", "[n] -> { S[n] }", + "[n] -> { : 0 <= n <= 100 }" }, + { "{ B[i] : 0 <= i < 100 and exists a : i = 4 a }", + "{ A[a] -> B[2a] }", + "{ A[a] : 0 <= a < 50 and exists b : a = 2 b }" }, + { "{ B[i] : 0 <= i < 100 and exists a : i = 4 a }", + "{ A[a] -> B[([a/2])] }", + "{ A[a] : 0 <= a < 200 and exists b : [a/2] = 4 b }" }, + { "{ B[i,j,k] : 0 <= i,j,k <= 100 }", + "{ A[a] -> B[a,a,a/3] }", + "{ A[a] : 0 <= a <= 100 and exists b : a = 3 b }" }, + { "{ B[i,j] : j = [(i)/2] } ", "{ A[i,j] -> B[i/3,j] }", + "{ A[i,j] : j = [(i)/6] and exists a : i = 3 a }" }, +}; + +int test_preimage(isl_ctx *ctx) +{ + int i; + isl_basic_set *bset1, *bset2; + isl_multi_aff *ma; + int equal; + + for (i = 0; i < ARRAY_SIZE(preimage_tests); ++i) { + bset1 = isl_basic_set_read_from_str(ctx, preimage_tests[i].set); + ma = isl_multi_aff_read_from_str(ctx, preimage_tests[i].ma); + bset2 = isl_basic_set_read_from_str(ctx, preimage_tests[i].res); + bset1 = isl_basic_set_preimage_multi_aff(bset1, ma); + equal = isl_basic_set_is_equal(bset1, bset2); + isl_basic_set_free(bset1); + isl_basic_set_free(bset2); + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "bad preimage", + return -1); + } + + return 0; +} + +struct { + const char *ma1; + const char *ma; + const char *res; +} pullback_tests[] = { + { "{ B[i,j] -> C[i + 2j] }" , "{ A[a,b] -> B[b,a] }", + "{ A[a,b] -> C[b + 2a] }" }, + { "{ B[i] -> C[2i] }", "{ A[a] -> B[(a)/2] }", "{ A[a] -> C[a] }" }, + { "{ B[i] -> C[(i)/2] }", "{ A[a] -> B[2a] }", "{ A[a] -> C[a] }" }, + { "{ B[i] -> C[(i)/2] }", "{ A[a] -> B[(a)/3] }", + "{ A[a] -> C[(a)/6] }" }, + { "{ B[i] -> C[2i] }", "{ A[a] -> B[5a] }", "{ A[a] -> C[10a] }" }, + { "{ B[i] -> C[2i] }", "{ A[a] -> B[(a)/3] }", + "{ A[a] -> C[(2a)/3] }" }, + { "{ B[i,j] -> C[i + j] }", "{ A[a] -> B[a,a] }", "{ A[a] -> C[2a] }"}, + { "{ B[a] -> C[a,a] }", "{ A[i,j] -> B[i + j] }", + "{ A[i,j] -> C[i + j, i + j] }"}, + { "{ B[i] -> C[([i/2])] }", "{ B[5] }", "{ C[2] }" }, + { "[n] -> { B[i,j] -> C[([i/2]) + 2j] }", + "[n] -> { B[n,[n/3]] }", "[n] -> { C[([n/2]) + 2*[n/3]] }", }, +}; + +static int test_pullback(isl_ctx *ctx) +{ + int i; + isl_multi_aff *ma1, *ma2; + isl_multi_aff *ma; + int equal; + + for (i = 0; i < ARRAY_SIZE(pullback_tests); ++i) { + ma1 = isl_multi_aff_read_from_str(ctx, pullback_tests[i].ma1); + ma = isl_multi_aff_read_from_str(ctx, pullback_tests[i].ma); + ma2 = isl_multi_aff_read_from_str(ctx, pullback_tests[i].res); + ma1 = isl_multi_aff_pullback_multi_aff(ma1, ma); + equal = isl_multi_aff_plain_is_equal(ma1, ma2); + isl_multi_aff_free(ma1); + isl_multi_aff_free(ma2); + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, "bad pullback", + return -1); + } + + return 0; +} + +/* Check that negation is printed correctly. + */ +static int test_ast(isl_ctx *ctx) +{ + isl_ast_expr *expr, *expr1, *expr2, *expr3; + char *str; + int ok; + + expr1 = isl_ast_expr_from_id(isl_id_alloc(ctx, "A", NULL)); + expr2 = isl_ast_expr_from_id(isl_id_alloc(ctx, "B", NULL)); + expr = isl_ast_expr_add(expr1, expr2); + expr = isl_ast_expr_neg(expr); + str = isl_ast_expr_to_str(expr); + ok = str ? !strcmp(str, "-(A + B)") : -1; + free(str); + isl_ast_expr_free(expr); + + if (ok < 0) + return -1; + if (!ok) + isl_die(ctx, isl_error_unknown, + "isl_ast_expr printed incorrectly", return -1); + + expr1 = isl_ast_expr_from_id(isl_id_alloc(ctx, "A", NULL)); + expr2 = isl_ast_expr_from_id(isl_id_alloc(ctx, "B", NULL)); + expr = isl_ast_expr_add(expr1, expr2); + expr3 = isl_ast_expr_from_id(isl_id_alloc(ctx, "C", NULL)); + expr = isl_ast_expr_sub(expr3, expr); + str = isl_ast_expr_to_str(expr); + ok = str ? !strcmp(str, "C - (A + B)") : -1; + free(str); + isl_ast_expr_free(expr); + + if (ok < 0) + return -1; + if (!ok) + isl_die(ctx, isl_error_unknown, + "isl_ast_expr printed incorrectly", return -1); + + return 0; +} + +/* Internal data structure for before_for and after_for callbacks. + * + * depth is the current depth + * before is the number of times before_for has been called + * after is the number of times after_for has been called + */ +struct isl_test_codegen_data { + int depth; + int before; + int after; +}; + +/* This function is called before each for loop in the AST generated + * from test_ast_gen1. + * + * Increment the number of calls and the depth. + * Check that the space returned by isl_ast_build_get_schedule_space + * matches the target space of the schedule returned by + * isl_ast_build_get_schedule. + * Return an isl_id that is checked by the corresponding call + * to after_for. + */ +static __isl_give isl_id *before_for(__isl_keep isl_ast_build *build, + void *user) +{ + struct isl_test_codegen_data *data = user; + isl_ctx *ctx; + isl_space *space; + isl_union_map *schedule; + isl_union_set *uset; + isl_set *set; + int empty; + char name[] = "d0"; + + ctx = isl_ast_build_get_ctx(build); + + if (data->before >= 3) + isl_die(ctx, isl_error_unknown, + "unexpected number of for nodes", return NULL); + if (data->depth >= 2) + isl_die(ctx, isl_error_unknown, + "unexpected depth", return NULL); + + snprintf(name, sizeof(name), "d%d", data->depth); + data->before++; + data->depth++; + + schedule = isl_ast_build_get_schedule(build); + uset = isl_union_map_range(schedule); + if (!uset) + return NULL; + if (isl_union_set_n_set(uset) != 1) { + isl_union_set_free(uset); + isl_die(ctx, isl_error_unknown, + "expecting single range space", return NULL); + } + + space = isl_ast_build_get_schedule_space(build); + set = isl_union_set_extract_set(uset, space); + isl_union_set_free(uset); + empty = isl_set_is_empty(set); + isl_set_free(set); + + if (empty < 0) + return NULL; + if (empty) + isl_die(ctx, isl_error_unknown, + "spaces don't match", return NULL); + + return isl_id_alloc(ctx, name, NULL); +} + +/* This function is called after each for loop in the AST generated + * from test_ast_gen1. + * + * Increment the number of calls and decrement the depth. + * Check that the annotation attached to the node matches + * the isl_id returned by the corresponding call to before_for. + */ +static __isl_give isl_ast_node *after_for(__isl_take isl_ast_node *node, + __isl_keep isl_ast_build *build, void *user) +{ + struct isl_test_codegen_data *data = user; + isl_id *id; + const char *name; + int valid; + + data->after++; + data->depth--; + + if (data->after > data->before) + isl_die(isl_ast_node_get_ctx(node), isl_error_unknown, + "mismatch in number of for nodes", + return isl_ast_node_free(node)); + + id = isl_ast_node_get_annotation(node); + if (!id) + isl_die(isl_ast_node_get_ctx(node), isl_error_unknown, + "missing annotation", return isl_ast_node_free(node)); + + name = isl_id_get_name(id); + valid = name && atoi(name + 1) == data->depth; + isl_id_free(id); + + if (!valid) + isl_die(isl_ast_node_get_ctx(node), isl_error_unknown, + "wrong annotation", return isl_ast_node_free(node)); + + return node; +} + +/* Check that the before_each_for and after_each_for callbacks + * are called for each for loop in the generated code, + * that they are called in the right order and that the isl_id + * returned from the before_each_for callback is attached to + * the isl_ast_node passed to the corresponding after_each_for call. + */ +static int test_ast_gen1(isl_ctx *ctx) +{ + const char *str; + isl_set *set; + isl_union_map *schedule; + isl_ast_build *build; + isl_ast_node *tree; + struct isl_test_codegen_data data; + + str = "[N] -> { : N >= 10 }"; + set = isl_set_read_from_str(ctx, str); + str = "[N] -> { A[i,j] -> S[8,i,3,j] : 0 <= i,j <= N; " + "B[i,j] -> S[8,j,9,i] : 0 <= i,j <= N }"; + schedule = isl_union_map_read_from_str(ctx, str); + + data.before = 0; + data.after = 0; + data.depth = 0; + build = isl_ast_build_from_context(set); + build = isl_ast_build_set_before_each_for(build, + &before_for, &data); + build = isl_ast_build_set_after_each_for(build, + &after_for, &data); + tree = isl_ast_build_ast_from_schedule(build, schedule); + isl_ast_build_free(build); + if (!tree) + return -1; + + isl_ast_node_free(tree); + + if (data.before != 3 || data.after != 3) + isl_die(ctx, isl_error_unknown, + "unexpected number of for nodes", return -1); + + return 0; +} + +/* Check that the AST generator handles domains that are integrally disjoint + * but not ratinoally disjoint. + */ +static int test_ast_gen2(isl_ctx *ctx) +{ + const char *str; + isl_set *set; + isl_union_map *schedule; + isl_union_map *options; + isl_ast_build *build; + isl_ast_node *tree; + + str = "{ A[i,j] -> [i,j] : 0 <= i,j <= 1 }"; + schedule = isl_union_map_read_from_str(ctx, str); + set = isl_set_universe(isl_space_params_alloc(ctx, 0)); + build = isl_ast_build_from_context(set); + + str = "{ [i,j] -> atomic[1] : i + j = 1; [i,j] -> unroll[1] : i = j }"; + options = isl_union_map_read_from_str(ctx, str); + build = isl_ast_build_set_options(build, options); + tree = isl_ast_build_ast_from_schedule(build, schedule); + isl_ast_build_free(build); + if (!tree) + return -1; + isl_ast_node_free(tree); + + return 0; +} + +/* Increment *user on each call. + */ +static __isl_give isl_ast_node *count_domains(__isl_take isl_ast_node *node, + __isl_keep isl_ast_build *build, void *user) +{ + int *n = user; + + (*n)++; + + return node; +} + +/* Test that unrolling tries to minimize the number of instances. + * In particular, for the schedule given below, make sure it generates + * 3 nodes (rather than 101). + */ +static int test_ast_gen3(isl_ctx *ctx) +{ + const char *str; + isl_set *set; + isl_union_map *schedule; + isl_union_map *options; + isl_ast_build *build; + isl_ast_node *tree; + int n_domain = 0; + + str = "[n] -> { A[i] -> [i] : 0 <= i <= 100 and n <= i <= n + 2 }"; + schedule = isl_union_map_read_from_str(ctx, str); + set = isl_set_universe(isl_space_params_alloc(ctx, 0)); + + str = "{ [i] -> unroll[0] }"; + options = isl_union_map_read_from_str(ctx, str); + + build = isl_ast_build_from_context(set); + build = isl_ast_build_set_options(build, options); + build = isl_ast_build_set_at_each_domain(build, + &count_domains, &n_domain); + tree = isl_ast_build_ast_from_schedule(build, schedule); + isl_ast_build_free(build); + if (!tree) + return -1; + + isl_ast_node_free(tree); + + if (n_domain != 3) + isl_die(ctx, isl_error_unknown, + "unexpected number of for nodes", return -1); + + return 0; +} + +/* Check that if the ast_build_exploit_nested_bounds options is set, + * we do not get an outer if node in the generated AST, + * while we do get such an outer if node if the options is not set. + */ +static int test_ast_gen4(isl_ctx *ctx) +{ + const char *str; + isl_set *set; + isl_union_map *schedule; + isl_ast_build *build; + isl_ast_node *tree; + enum isl_ast_node_type type; + int enb; + + enb = isl_options_get_ast_build_exploit_nested_bounds(ctx); + str = "[N,M] -> { A[i,j] -> [i,j] : 0 <= i <= N and 0 <= j <= M }"; + + isl_options_set_ast_build_exploit_nested_bounds(ctx, 1); + + schedule = isl_union_map_read_from_str(ctx, str); + set = isl_set_universe(isl_space_params_alloc(ctx, 0)); + build = isl_ast_build_from_context(set); + tree = isl_ast_build_ast_from_schedule(build, schedule); + isl_ast_build_free(build); + if (!tree) + return -1; + + type = isl_ast_node_get_type(tree); + isl_ast_node_free(tree); + + if (type == isl_ast_node_if) + isl_die(ctx, isl_error_unknown, + "not expecting if node", return -1); + + isl_options_set_ast_build_exploit_nested_bounds(ctx, 0); + + schedule = isl_union_map_read_from_str(ctx, str); + set = isl_set_universe(isl_space_params_alloc(ctx, 0)); + build = isl_ast_build_from_context(set); + tree = isl_ast_build_ast_from_schedule(build, schedule); + isl_ast_build_free(build); + if (!tree) + return -1; + + type = isl_ast_node_get_type(tree); + isl_ast_node_free(tree); + + if (type != isl_ast_node_if) + isl_die(ctx, isl_error_unknown, + "expecting if node", return -1); + + isl_options_set_ast_build_exploit_nested_bounds(ctx, enb); + + return 0; +} + +static int test_ast_gen(isl_ctx *ctx) +{ + if (test_ast_gen1(ctx) < 0) + return -1; + if (test_ast_gen2(ctx) < 0) + return -1; + if (test_ast_gen3(ctx) < 0) + return -1; + if (test_ast_gen4(ctx) < 0) + return -1; + return 0; +} + +/* Check if dropping output dimensions from an isl_pw_multi_aff + * works properly. + */ +static int test_pw_multi_aff(isl_ctx *ctx) +{ + const char *str; + isl_pw_multi_aff *pma1, *pma2; + int equal; + + str = "{ [i,j] -> [i+j, 4i-j] }"; + pma1 = isl_pw_multi_aff_read_from_str(ctx, str); + str = "{ [i,j] -> [4i-j] }"; + pma2 = isl_pw_multi_aff_read_from_str(ctx, str); + + pma1 = isl_pw_multi_aff_drop_dims(pma1, isl_dim_out, 0, 1); + + equal = isl_pw_multi_aff_plain_is_equal(pma1, pma2); + + isl_pw_multi_aff_free(pma1); + isl_pw_multi_aff_free(pma2); + if (equal < 0) + return -1; + if (!equal) + isl_die(ctx, isl_error_unknown, + "expressions not equal", return -1); + + return 0; +} + +/* This is a regression test for a bug where isl_basic_map_simplify + * would end up in an infinite loop. In particular, we construct + * an empty basic set that is not obviously empty. + * isl_basic_set_is_empty marks the basic set as empty. + * After projecting out i3, the variable can be dropped completely, + * but isl_basic_map_simplify refrains from doing so if the basic set + * is empty and would end up in an infinite loop if it didn't test + * explicitly for empty basic maps in the outer loop. + */ +static int test_simplify(isl_ctx *ctx) +{ + const char *str; + isl_basic_set *bset; + int empty; + + str = "{ [i0, i1, i2, i3] : i0 >= -2 and 6i2 <= 4 + i0 + 5i1 and " + "i2 <= 22 and 75i2 <= 111 + 13i0 + 60i1 and " + "25i2 >= 38 + 6i0 + 20i1 and i0 <= -1 and i2 >= 20 and " + "i3 >= i2 }"; + bset = isl_basic_set_read_from_str(ctx, str); + empty = isl_basic_set_is_empty(bset); + bset = isl_basic_set_project_out(bset, isl_dim_set, 3, 1); + isl_basic_set_free(bset); + if (!bset) + return -1; + if (!empty) + isl_die(ctx, isl_error_unknown, + "basic set should be empty", return -1); + + return 0; +} + +/* This is a regression test for a bug where isl_tab_basic_map_partial_lexopt + * with gbr context would fail to disable the use of the shifted tableau + * when transferring equalities for the input to the context, resulting + * in invalid sample values. + */ +static int test_partial_lexmin(isl_ctx *ctx) +{ + const char *str; + isl_basic_set *bset; + isl_basic_map *bmap; + isl_map *map; + + str = "{ [1, b, c, 1 - c] -> [e] : 2e <= -c and 2e >= -3 + c }"; + bmap = isl_basic_map_read_from_str(ctx, str); + str = "{ [a, b, c, d] : c <= 1 and 2d >= 6 - 4b - c }"; + bset = isl_basic_set_read_from_str(ctx, str); + map = isl_basic_map_partial_lexmin(bmap, bset, NULL); + isl_map_free(map); + + if (!map) + return -1; + + return 0; +} + +struct { + const char *name; + int (*fn)(isl_ctx *ctx); +} tests [] = { + { "partial lexmin", &test_partial_lexmin }, + { "simplify", &test_simplify }, + { "curry", &test_curry }, + { "piecewise multi affine expressions", &test_pw_multi_aff }, + { "conversion", &test_conversion }, + { "list", &test_list }, + { "align parameters", &test_align_parameters }, + { "preimage", &test_preimage }, + { "pullback", &test_pullback }, + { "AST", &test_ast }, + { "AST generation", &test_ast_gen }, + { "eliminate", &test_eliminate }, + { "residue class", &test_residue_class }, + { "div", &test_div }, + { "slice", &test_slice }, + { "fixed power", &test_fixed_power }, + { "sample", &test_sample }, + { "output", &test_output }, + { "vertices", &test_vertices }, + { "fixed", &test_fixed }, + { "equal", &test_equal }, + { "product", &test_product }, + { "dim_max", &test_dim_max }, + { "affine", &test_aff }, + { "injective", &test_injective }, + { "schedule", &test_schedule }, + { "union_pw", &test_union_pw }, + { "parse", &test_parse }, + { "single-valued", &test_sv }, + { "affine hull", &test_affine_hull }, + { "coalesce", &test_coalesce }, + { "factorize", &test_factorize }, + { "subset", &test_subset }, + { "subtract", &test_subtract }, +}; + int main() { + int i; struct isl_ctx *ctx; srcdir = getenv("srcdir"); 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) - goto error; - if (test_injective(ctx) < 0) - goto error; - if (test_schedule(ctx) < 0) - goto error; - test_factorize(ctx); - test_subset(ctx); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { + printf("%s\n", tests[i].name); + if (tests[i].fn(ctx) < 0) + goto error; + } test_lift(ctx); test_bound(ctx); test_union(ctx); test_split_periods(ctx); - test_parse(ctx); test_pwqp(ctx); test_lex(ctx); - if (test_sv(ctx) < 0) - goto error; test_bijective(ctx); test_dep(ctx); test_read(ctx); test_bounded(ctx); test_construction(ctx); test_dim(ctx); - test_div(ctx); test_application(ctx); - test_affine_hull(ctx); test_convex_hull(ctx); test_gist(ctx); - test_coalesce(ctx); test_closure(ctx); test_lexmin(ctx); isl_ctx_free(ctx);