X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_test.c;h=a0173b3543c8ff311346defb80f143277c7397a0;hb=44d79a0484a9e0cbb0f40221b8a42dec5fa6c133;hp=de558b9444f40bde9eb957c98160ea1896a5b172;hpb=0c49639375e79641e9ffc0b972584e2820da587d;p=platform%2Fupstream%2Fisl.git diff --git a/isl_test.c b/isl_test.c index de558b9..a0173b3 100644 --- a/isl_test.c +++ b/isl_test.c @@ -44,7 +44,7 @@ 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); } @@ -53,8 +53,8 @@ void test_parse_map_equal(isl_ctx *ctx, const char *str, const char *str2) { isl_map *map, *map2; - map = isl_map_read_from_str(ctx, str, -1); - map2 = isl_map_read_from_str(ctx, str2, -1); + map = isl_map_read_from_str(ctx, str); + map2 = isl_map_read_from_str(ctx, str2); assert(map && map2 && isl_map_is_equal(map, map2)); isl_map_free(map); isl_map_free(map2); @@ -75,12 +75,12 @@ void test_parse(struct isl_ctx *ctx) 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); @@ -98,20 +98,20 @@ void test_parse(struct isl_ctx *ctx) test_parse_map_equal(ctx, "{ [x,y] : x >= min(y, 2*y+3) }", str); 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); @@ -120,6 +120,30 @@ void test_parse(struct isl_ctx *ctx) str2 = "[n] -> { [c1] : c1 >= 0 and 3c1 <= -4 + n }"; test_parse_map_equal(ctx, str, str2); + str = "{ [i,j] -> [i] : i < j; [i,j] -> [j] : j <= i }"; + str2 = "{ [i,j] -> [min(i,j)] }"; + test_parse_map_equal(ctx, str, str2); + + str = "{ [i,j] : i != j }"; + str2 = "{ [i,j] : i < j or i > j }"; + test_parse_map_equal(ctx, str, str2); + + str = "{ [i,j] : (i+1)*2 >= j }"; + str2 = "{ [i, j] : j <= 2 + 2i }"; + test_parse_map_equal(ctx, str, str2); + + str = "{ [i] -> [i > 0 ? 4 : 5] }"; + str2 = "{ [i] -> [5] : i <= 0; [i] -> [4] : i >= 1 }"; + test_parse_map_equal(ctx, str, str2); + + 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); + + str = "{ [x] : x >= 0 }"; + str2 = "{ [x] : x-0 >= 0 }"; + test_parse_map_equal(ctx, str, str2); + test_parse_pwqp(ctx, "{ [i] -> i + [ (i + [i/3])/2 ] }"); test_parse_map(ctx, "{ S1[i] -> [([i/10]),i%10] : 0 <= i <= 45 }"); } @@ -136,8 +160,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); @@ -153,17 +177,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); @@ -173,29 +197,32 @@ void test_bounded(struct isl_ctx *ctx) void test_construction(struct isl_ctx *ctx) { isl_int v; - struct isl_dim *dim; + isl_space *dim; + isl_local_space *ls; struct isl_basic_set *bset; struct isl_constraint *c; isl_int_init(v); - dim = isl_dim_set_alloc(ctx, 1, 1); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 1, 1); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_inequality_alloc(isl_basic_set_get_dim(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_dim(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); @@ -207,24 +234,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)); @@ -235,17 +262,19 @@ void test_dim(struct isl_ctx *ctx) void test_div(struct isl_ctx *ctx) { isl_int v; - struct isl_dim *dim; + isl_space *dim; + isl_local_space *ls; struct isl_basic_set *bset; struct isl_constraint *c; isl_int_init(v); /* test 1 */ - dim = isl_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -254,7 +283,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_dim(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); @@ -266,13 +295,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_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -281,7 +312,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_dim(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); @@ -293,13 +324,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_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -308,7 +341,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_dim(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); @@ -320,13 +353,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_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -335,7 +370,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_dim(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); @@ -347,20 +382,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_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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_dim(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); @@ -371,19 +408,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_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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_dim(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); @@ -394,6 +433,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 @@ -405,10 +445,11 @@ void test_div(struct isl_ctx *ctx) * and we end up with the original equality and div again. * Perhaps we can avoid the introduction of this temporary div. */ - dim = isl_dim_set_alloc(ctx, 0, 4); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 4); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -425,13 +466,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_dim_set_alloc(ctx, 0, 5); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 5); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -442,7 +485,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_dim(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); @@ -457,13 +500,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_dim_set_alloc(ctx, 0, 4); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 4); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -472,7 +517,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_dim(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); @@ -487,13 +532,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_dim_set_alloc(ctx, 0, 3); - bset = isl_basic_set_universe(dim); + dim = isl_space_set_alloc(ctx, 0, 3); + bset = isl_basic_set_universe(isl_space_copy(dim)); + ls = isl_local_space_from_space(dim); - c = isl_equality_alloc(isl_basic_set_get_dim(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); @@ -504,6 +551,7 @@ 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); @@ -521,12 +569,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); @@ -554,8 +602,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); @@ -587,13 +635,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); @@ -632,8 +680,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); @@ -659,12 +707,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); @@ -691,7 +739,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 " @@ -700,7 +748,7 @@ 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); @@ -710,9 +758,9 @@ void test_coalesce_set(isl_ctx *ctx, const char *str, int check_one) { isl_set *set, *set2; - 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); + set2 = isl_set_read_from_str(ctx, str); assert(isl_set_is_equal(set, set2)); if (check_one) assert(set && set->n == 1); @@ -728,106 +776,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); @@ -850,7 +898,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], " @@ -870,7 +918,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); @@ -879,9 +927,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); @@ -901,9 +949,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); @@ -912,9 +960,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); @@ -923,9 +971,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); @@ -980,7 +1028,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); @@ -990,7 +1038,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, @@ -998,18 +1046,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); @@ -1019,7 +1067,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, @@ -1027,7 +1075,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); @@ -1040,7 +1088,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); @@ -1053,7 +1101,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); @@ -1066,7 +1114,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, @@ -1077,7 +1125,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); @@ -1085,11 +1133,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)); @@ -1099,7 +1147,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); @@ -1108,7 +1156,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); @@ -1117,7 +1165,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); @@ -1127,14 +1175,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); @@ -1144,17 +1192,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); @@ -1163,19 +1211,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); @@ -1200,7 +1248,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); @@ -1208,10 +1256,10 @@ void test_closure(struct isl_ctx *ctx) void test_lex(struct isl_ctx *ctx) { - isl_dim *dim; + isl_space *dim; isl_map *map; - dim = isl_dim_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); @@ -1220,11 +1268,11 @@ void test_lex(struct isl_ctx *ctx) static int consume_lexmin(__isl_take isl_basic_set *dom, __isl_take isl_aff_list *list, void *user) { - isl_dim *dim; + isl_space *dim; isl_basic_map *bmap; isl_map **map = user; - dim = isl_basic_set_get_dim(dom); + dim = isl_basic_set_get_space(dom); bmap = isl_basic_map_from_aff_list(dim, list); bmap = isl_basic_map_intersect_domain(bmap, dom); @@ -1253,32 +1301,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)); @@ -1286,21 +1334,21 @@ 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_dim(bmap)); + bmap = isl_basic_map_read_from_str(ctx, str); + map2 = isl_map_empty(isl_basic_map_get_space(bmap)); isl_basic_map_foreach_lexmin(bmap, &consume_lexmin, &map2); map = isl_map_from_basic_map(bmap); assert(isl_map_is_equal(map, map2)); @@ -1340,7 +1388,7 @@ 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); @@ -1350,7 +1398,7 @@ static int map_is_equal(__isl_keep isl_map *map, const char *str) void test_dep(struct isl_ctx *ctx) { const char *str; - isl_dim *dim; + isl_space *dim; isl_map *map; isl_access_info *ai; isl_flow *flow; @@ -1360,20 +1408,20 @@ 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); - dim = isl_dim_alloc(ctx, 0, 3, 3); - mm.must = isl_map_empty(isl_dim_copy(dim)); + dim = isl_space_alloc(ctx, 0, 3, 3); + mm.must = isl_map_empty(isl_space_copy(dim)); mm.may = isl_map_empty(dim); isl_flow_foreach(flow, collect_must_may, &mm); @@ -1390,20 +1438,20 @@ 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); - dim = isl_dim_alloc(ctx, 0, 3, 3); - mm.must = isl_map_empty(isl_dim_copy(dim)); + dim = isl_space_alloc(ctx, 0, 3, 3); + mm.must = isl_map_empty(isl_space_copy(dim)); mm.may = isl_map_empty(dim); isl_flow_foreach(flow, collect_must_may, &mm); @@ -1419,20 +1467,20 @@ 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); - dim = isl_dim_alloc(ctx, 0, 3, 3); - mm.must = isl_map_empty(isl_dim_copy(dim)); + dim = isl_space_alloc(ctx, 0, 3, 3); + mm.must = isl_map_empty(isl_space_copy(dim)); mm.may = isl_map_empty(dim); isl_flow_foreach(flow, collect_must_may, &mm); @@ -1449,20 +1497,20 @@ 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); - dim = isl_dim_alloc(ctx, 0, 3, 3); - mm.must = isl_map_empty(isl_dim_copy(dim)); + dim = isl_space_alloc(ctx, 0, 3, 3); + mm.must = isl_map_empty(isl_space_copy(dim)); mm.may = isl_map_empty(dim); isl_flow_foreach(flow, collect_must_may, &mm); @@ -1479,20 +1527,20 @@ 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); - dim = isl_dim_alloc(ctx, 0, 3, 3); - mm.must = isl_map_empty(isl_dim_copy(dim)); + dim = isl_space_alloc(ctx, 0, 3, 3); + mm.must = isl_map_empty(isl_space_copy(dim)); mm.may = isl_map_empty(dim); isl_flow_foreach(flow, collect_must_may, &mm); @@ -1511,16 +1559,16 @@ 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); - dim = isl_dim_alloc(ctx, 0, 5, 5); - mm.must = isl_map_empty(isl_dim_copy(dim)); + dim = isl_space_alloc(ctx, 0, 5, 5); + mm.must = isl_map_empty(isl_space_copy(dim)); mm.may = isl_map_empty(dim); isl_flow_foreach(flow, collect_must_may, &mm); @@ -1543,7 +1591,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) @@ -1553,7 +1601,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) @@ -1589,7 +1637,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 @@ -1624,7 +1672,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); @@ -1638,7 +1686,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); @@ -1652,7 +1700,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); @@ -1666,7 +1714,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); @@ -1763,13 +1811,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); } @@ -1780,7 +1828,7 @@ 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); @@ -1793,11 +1841,11 @@ void test_subset(isl_ctx *ctx) isl_set *set1, *set2; str = "{ [112, 0] }"; - set1 = isl_set_read_from_str(ctx, str, 0); + set1 = isl_set_read_from_str(ctx, str); 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); + set2 = isl_set_read_from_str(ctx, str); assert(isl_set_is_subset(set1, set2)); isl_set_free(set1); isl_set_free(set2); @@ -1816,7 +1864,7 @@ 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); @@ -1832,7 +1880,7 @@ 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); @@ -1879,7 +1927,7 @@ int test_one_schedule(isl_ctx *ctx, const char *d, const char *w, W = isl_union_map_intersect_domain(W, isl_union_set_copy(D)); R = isl_union_map_intersect_domain(R, isl_union_set_copy(D)); - empty = isl_union_map_empty(isl_union_map_get_dim(S)); + empty = isl_union_map_empty(isl_union_map_get_space(S)); isl_union_map_compute_flow(isl_union_map_copy(R), isl_union_map_copy(W), empty, isl_union_map_copy(S), @@ -1924,19 +1972,19 @@ int test_one_schedule(isl_ctx *ctx, const char *d, const char *w, } else { delta_set = isl_set_from_union_set(delta); - slice = isl_set_universe(isl_set_get_dim(delta_set)); + slice = isl_set_universe(isl_set_get_space(delta_set)); for (i = 0; i < tilable; ++i) slice = isl_set_lower_bound_si(slice, isl_dim_set, i, 0); is_tilable = isl_set_is_subset(delta_set, slice); isl_set_free(slice); - slice = isl_set_universe(isl_set_get_dim(delta_set)); + slice = isl_set_universe(isl_set_get_space(delta_set)); for (i = 0; i < parallel; ++i) slice = isl_set_fix_si(slice, isl_dim_set, i, 0); is_parallel = isl_set_is_subset(delta_set, slice); isl_set_free(slice); - origin = isl_set_universe(isl_set_get_dim(delta_set)); + origin = isl_set_universe(isl_set_get_space(delta_set)); for (i = 0; i < isl_set_dim(origin, isl_dim_set); ++i) origin = isl_set_fix_si(origin, isl_dim_set, i, 0); @@ -2164,6 +2212,21 @@ int test_schedule(isl_ctx *ctx) if (test_one_schedule(ctx, D, W, R, S, 0, 0) < 0) return -1; + D = "[n] -> { S_0[j, k] : j <= -1 + n and j >= 0 and " + "k <= -1 + n and k >= 0 }"; + W = "[n] -> { S_0[j, k] -> B[j] : j <= -1 + n and j >= 0 and " "k <= -1 + n and k >= 0 }"; + R = "[n] -> { S_0[j, k] -> B[j] : j <= -1 + n and j >= 0 and " + "k <= -1 + n and k >= 0; " + "S_0[j, k] -> B[k] : j <= -1 + n and j >= 0 and " + "k <= -1 + n and k >= 0; " + "S_0[j, k] -> A[k] : j <= -1 + n and j >= 0 and " + "k <= -1 + n and k >= 0 }"; + S = "[n] -> { S_0[j, k] -> [2, j, k] }"; + ctx->opt->schedule_outer_zero_distance = 1; + if (test_one_schedule(ctx, D, W, R, S, 0, 0) < 0) + return -1; + ctx->opt->schedule_outer_zero_distance = 0; + return test_special_schedule(ctx); } @@ -2222,25 +2285,25 @@ int test_aff(isl_ctx *ctx) { const char *str; isl_set *set; - isl_dim *dim; + isl_space *dim; isl_local_space *ls; isl_aff *aff; int zero; - dim = isl_dim_set_alloc(ctx, 0, 1); - ls = isl_local_space_from_dim(dim); - aff = isl_aff_zero(ls); + dim = isl_space_set_alloc(ctx, 0, 1); + ls = isl_local_space_from_space(dim); + 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); @@ -2259,47 +2322,48 @@ 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) @@ -2307,25 +2371,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); @@ -2344,7 +2408,7 @@ int test_product(isl_ctx *ctx) 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); @@ -2363,9 +2427,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); @@ -2377,6 +2441,50 @@ int test_equal(isl_ctx *ctx) return 0; } +static int test_plain_fixed(isl_ctx *ctx, __isl_take isl_map *map, + enum isl_dim_type type, unsigned pos, int fixed) +{ + int test; + + test = isl_map_plain_is_fixed(map, type, pos, NULL); + isl_map_free(map); + if (test < 0) + return -1; + if (test == fixed) + return 0; + if (fixed) + isl_die(ctx, isl_error_unknown, + "map not detected as fixed", return -1); + else + isl_die(ctx, isl_error_unknown, + "map detected as fixed", return -1); +} + +int test_fixed(isl_ctx *ctx) +{ + const char *str; + isl_map *map; + + str = "{ [i] -> [i] }"; + map = isl_map_read_from_str(ctx, str); + if (test_plain_fixed(ctx, map, isl_dim_out, 0, 0)) + return -1; + str = "{ [i] -> [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); + if (test_plain_fixed(ctx, map, isl_dim_out, 0, 1)) + return -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; + + return 0; +} + int main() { struct isl_ctx *ctx; @@ -2385,6 +2493,8 @@ int main() 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)