From 52b23da544afcf25e463541e0426e5ad4883f903 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Sat, 23 May 2015 16:54:39 +0200 Subject: [PATCH] update isl for introduction of isl_stat Signed-off-by: Sven Verdoolaege --- aff.c | 8 ++++---- context.c | 8 ++++---- isl | 2 +- pet_codegen.c | 12 ++++++------ scop.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/aff.c b/aff.c index 614da95..b4e684c 100644 --- a/aff.c +++ b/aff.c @@ -53,7 +53,7 @@ struct pet_union_map_move_dims_data { /* Call isl_map_move_dims on "map" using the arguments in "data" and * add the result to data->res. */ -static int map_move_dims(__isl_take isl_map *map, void *user) +static isl_stat map_move_dims(__isl_take isl_map *map, void *user) { struct pet_union_map_move_dims_data *data = user; @@ -61,7 +61,7 @@ static int map_move_dims(__isl_take isl_map *map, void *user) data->src_type, data->src_pos, data->n); data->res = isl_union_map_add_map(data->res, map); - return 0; + return isl_stat_ok; } /* Call isl_map_move_dims with the given arguments on each of the maps @@ -110,7 +110,7 @@ __isl_give isl_multi_aff *pet_prefix_projection(__isl_take isl_space *space, * The caller is assumed to have checked that this function will * be called exactly once. */ -static int extract_cst(__isl_take isl_set *set, __isl_take isl_aff *aff, +static isl_stat extract_cst(__isl_take isl_set *set, __isl_take isl_aff *aff, void *user) { isl_val **inc = (isl_val **)user; @@ -123,7 +123,7 @@ static int extract_cst(__isl_take isl_set *set, __isl_take isl_aff *aff, isl_set_free(set); isl_aff_free(aff); - return 0; + return isl_stat_ok; } /* If "pa" represents a constant value over a single domain, diff --git a/context.c b/context.c index 4533e9c..fdb300a 100644 --- a/context.c +++ b/context.c @@ -827,7 +827,7 @@ struct pet_patch_map_data { * of "map" needs to be zero and that this zero needs to be removed * from the concatenation. This computation is performed in drop_initial_zero. */ -static int patch_map(__isl_take isl_map *map, void *user) +static isl_stat patch_map(__isl_take isl_map *map, void *user) { struct pet_patch_map_data *data = user; isl_space *space; @@ -850,7 +850,7 @@ static int patch_map(__isl_take isl_map *map, void *user) map = isl_map_apply_range(map, id); data->res = isl_union_map_add_map(data->res, map); - return 0; + return isl_stat_ok; } /* Combine the index expression of "expr" with the subaccess relation "access". @@ -1240,7 +1240,7 @@ struct pet_preimage_domain_data { * in turn matches the domain of the pet_context), by adding the missing * dimensions. */ -static int preimage_domain_pair(__isl_take isl_id *key, +static isl_stat preimage_domain_pair(__isl_take isl_id *key, __isl_take isl_pw_aff *val, void *user) { struct pet_preimage_domain_data *data = user; @@ -1262,7 +1262,7 @@ static int preimage_domain_pair(__isl_take isl_id *key, val = isl_pw_aff_pullback_multi_aff(val, ma); data->assignments = isl_id_to_pw_aff_set(data->assignments, key, val); - return 0; + return isl_stat_ok; } /* Compute the preimage of "assignments" under the function represented by "ma". diff --git a/isl b/isl index 23e8573..370a8b7 160000 --- a/isl +++ b/isl @@ -1 +1 @@ -Subproject commit 23e8573a83a1c957a62c6bad59a1514eb68be274 +Subproject commit 370a8b7d078f15e47a4c8766645d2de68f8374fe diff --git a/pet_codegen.c b/pet_codegen.c index 05b4845..72ae1e7 100644 --- a/pet_codegen.c +++ b/pet_codegen.c @@ -138,7 +138,7 @@ static __isl_give isl_ast_build *set_options(__isl_take isl_ast_build *build, * where S is the name of the domain and the number of arguments * is equal to the dimension of "set". */ -static int print_declaration(__isl_take isl_set *set, void *user) +static isl_stat print_declaration(__isl_take isl_set *set, void *user) { isl_printer **p = user; int i, n; @@ -159,7 +159,7 @@ static int print_declaration(__isl_take isl_set *set, void *user) isl_set_free(set); - return 0; + return isl_stat_ok; } /* Print a function declaration for each domain in "uset". @@ -175,7 +175,7 @@ static __isl_give isl_printer *print_declarations(__isl_take isl_printer *p, /* Check that the domain of "map" is named. */ -static int check_name(__isl_take isl_map *map, void *user) +static isl_stat check_name(__isl_take isl_map *map, void *user) { int named; isl_ctx *ctx; @@ -185,11 +185,11 @@ static int check_name(__isl_take isl_map *map, void *user) isl_map_free(map); if (named < 0) - return -1; + return isl_stat_error; if (!named) isl_die(ctx, isl_error_invalid, - "all domains should be named", return -1); - return 0; + "all domains should be named", return isl_stat_error); + return isl_stat_ok; } /* Given an AST "tree", print out the following code diff --git a/scop.c b/scop.c index 92a0de0..c07daa6 100644 --- a/scop.c +++ b/scop.c @@ -1563,7 +1563,7 @@ struct pet_outer_projection_data { /* Create a function that maps "set" onto its outer data->n dimensions and * add it to data->res. */ -static int add_outer_projection(__isl_take isl_set *set, void *user) +static isl_stat add_outer_projection(__isl_take isl_set *set, void *user) { struct pet_outer_projection_data *data = user; int dim; @@ -1578,7 +1578,7 @@ static int add_outer_projection(__isl_take isl_set *set, void *user) isl_set_free(set); - return 0; + return isl_stat_ok; } /* Create and return a function that maps the sets in "domain" -- 2.11.4.GIT