From 3af305c547a88b969351965361b19ddaeed7495f Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Wed, 29 Feb 2012 18:53:50 +0100 Subject: [PATCH 1/1] add isl_basic_{set,map}_insert_dims We already had a (private) isl_basic_map_insert, but we rename it to isl_basic_map_insert_dims for consistency with isl_map_insert_dims. Signed-off-by: Sven Verdoolaege --- doc/user.pod | 8 ++++++++ include/isl/map.h | 3 +++ include/isl/set.h | 3 +++ isl_map.c | 16 ++++++++++++---- isl_map_private.h | 3 --- isl_map_simplify.c | 2 +- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/doc/user.pod b/doc/user.pod index 4fb15a6..20f890b 100644 --- a/doc/user.pod +++ b/doc/user.pod @@ -2403,6 +2403,14 @@ All parameters need to be named. __isl_give isl_map *isl_map_add_dims( __isl_take isl_map *map, enum isl_dim_type type, unsigned n); + __isl_give isl_basic_set *isl_basic_set_insert_dims( + __isl_take isl_basic_set *bset, + enum isl_dim_type type, unsigned pos, + unsigned n); + __isl_give isl_basic_map *isl_basic_map_insert_dims( + __isl_take isl_basic_map *bmap, + enum isl_dim_type type, unsigned pos, + unsigned n); __isl_give isl_set *isl_set_insert_dims( __isl_take isl_set *set, enum isl_dim_type type, unsigned pos, unsigned n); diff --git a/include/isl/map.h b/include/isl/map.h index d17ce87..af5e40c 100644 --- a/include/isl/map.h +++ b/include/isl/map.h @@ -395,6 +395,9 @@ __isl_give isl_basic_map *isl_basic_map_add(__isl_take isl_basic_map *bmap, enum isl_dim_type type, unsigned n); __isl_give isl_map *isl_map_add_dims(__isl_take isl_map *map, enum isl_dim_type type, unsigned n); +__isl_give isl_basic_map *isl_basic_map_insert_dims( + __isl_take isl_basic_map *bmap, enum isl_dim_type type, + unsigned pos, unsigned n); __isl_give isl_map *isl_map_insert_dims(__isl_take isl_map *map, enum isl_dim_type type, unsigned pos, unsigned n); __isl_give isl_basic_map *isl_basic_map_move_dims( diff --git a/include/isl/set.h b/include/isl/set.h index f97633c..f2e85ad 100644 --- a/include/isl/set.h +++ b/include/isl/set.h @@ -305,6 +305,9 @@ struct isl_set *isl_set_fix_dim_si(struct isl_set *set, unsigned dim, int value); struct isl_set *isl_set_lower_bound_dim(struct isl_set *set, unsigned dim, isl_int value); +__isl_give isl_basic_set *isl_basic_set_insert_dims( + __isl_take isl_basic_set *bset, + enum isl_dim_type type, unsigned pos, unsigned n); __isl_give isl_set *isl_set_insert_dims(__isl_take isl_set *set, enum isl_dim_type type, unsigned pos, unsigned n); __isl_give isl_basic_set *isl_basic_set_add(__isl_take isl_basic_set *bset, diff --git a/isl_map.c b/isl_map.c index 16b17c1..ec96252 100644 --- a/isl_map.c +++ b/isl_map.c @@ -2904,8 +2904,9 @@ static __isl_give isl_basic_map *basic_map_space_reset( return bmap; } -__isl_give isl_basic_map *isl_basic_map_insert(__isl_take isl_basic_map *bmap, - enum isl_dim_type type, unsigned pos, unsigned n) +__isl_give isl_basic_map *isl_basic_map_insert_dims( + __isl_take isl_basic_map *bmap, enum isl_dim_type type, + unsigned pos, unsigned n) { isl_space *res_dim; struct isl_basic_map *res; @@ -2950,12 +2951,19 @@ __isl_give isl_basic_map *isl_basic_map_insert(__isl_take isl_basic_map *bmap, return isl_basic_map_finalize(res); } +__isl_give isl_basic_set *isl_basic_set_insert_dims( + __isl_take isl_basic_set *bset, + enum isl_dim_type type, unsigned pos, unsigned n) +{ + return isl_basic_map_insert_dims(bset, type, pos, n); +} + __isl_give isl_basic_map *isl_basic_map_add(__isl_take isl_basic_map *bmap, enum isl_dim_type type, unsigned n) { if (!bmap) return NULL; - return isl_basic_map_insert(bmap, type, + return isl_basic_map_insert_dims(bmap, type, isl_basic_map_dim(bmap, type), n); } @@ -3002,7 +3010,7 @@ __isl_give isl_map *isl_map_insert_dims(__isl_take isl_map *map, goto error; for (i = 0; i < map->n; ++i) { - map->p[i] = isl_basic_map_insert(map->p[i], type, pos, n); + map->p[i] = isl_basic_map_insert_dims(map->p[i], type, pos, n); if (!map->p[i]) goto error; } diff --git a/isl_map_private.h b/isl_map_private.h index 6d07dd0..d8e17f7 100644 --- a/isl_map_private.h +++ b/isl_map_private.h @@ -95,9 +95,6 @@ struct isl_map { struct isl_basic_map *p[1]; }; -__isl_give isl_basic_map *isl_basic_map_insert(__isl_take isl_basic_map *bmap, - enum isl_dim_type type, unsigned pos, unsigned n); - __isl_give isl_map *isl_map_realign(__isl_take isl_map *map, __isl_take isl_reordering *r); __isl_give isl_set *isl_set_realign(__isl_take isl_set *set, diff --git a/isl_map_simplify.c b/isl_map_simplify.c index c07b211..7b14003 100644 --- a/isl_map_simplify.c +++ b/isl_map_simplify.c @@ -1533,7 +1533,7 @@ __isl_give isl_basic_map *isl_basic_map_eliminate( space = isl_basic_map_get_space(bmap); bmap = isl_basic_map_project_out(bmap, type, first, n); - bmap = isl_basic_map_insert(bmap, type, first, n); + bmap = isl_basic_map_insert_dims(bmap, type, first, n); bmap = isl_basic_map_reset_space(bmap, space); return bmap; error: -- 2.7.4