From: Sven Verdoolaege Date: Sat, 26 Jun 2010 15:34:32 +0000 (+0200) Subject: rename isl_basic_map_convex_hull to isl_basic_map_remove_redundancies X-Git-Tag: isl-0.03~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae24e1036a2724fb889c5d2afcc6669f92369f10;p=platform%2Fupstream%2Fisl.git rename isl_basic_map_convex_hull to isl_basic_map_remove_redundancies --- diff --git a/include/isl_map.h b/include/isl_map.h index 9c66f2d..8637cd5 100644 --- a/include/isl_map.h +++ b/include/isl_map.h @@ -156,7 +156,8 @@ struct isl_basic_map *isl_basic_map_empty_like_map(struct isl_map *model); __isl_give isl_basic_map *isl_basic_map_universe(__isl_take isl_dim *dim); __isl_give isl_basic_map *isl_basic_map_universe_like( __isl_keep isl_basic_map *bmap); -struct isl_basic_map *isl_basic_map_convex_hull(struct isl_basic_map *bmap); +__isl_give isl_basic_map *isl_basic_map_remove_redundancies( + __isl_take isl_basic_map *bmap); __isl_give isl_basic_map *isl_map_simple_hull(__isl_take isl_map *map); __isl_give isl_basic_map *isl_basic_map_intersect_domain( diff --git a/isl_convex_hull.c b/isl_convex_hull.c index ac79825..d3d5ff2 100644 --- a/isl_convex_hull.c +++ b/isl_convex_hull.c @@ -79,7 +79,7 @@ int isl_basic_set_constraint_is_redundant(struct isl_basic_set **bset, (struct isl_basic_map **)bset, c, opt_n, opt_d); } -/* Compute the convex hull of a basic map, by removing the redundant +/* Remove redundant * constraints. If the minimal value along the normal of a constraint * is the same if the constraint is removed, then the constraint is redundant. * @@ -87,7 +87,8 @@ int isl_basic_set_constraint_is_redundant(struct isl_basic_set **bset, * corresponding equality and the checked if the dimension was that * of a facet. */ -struct isl_basic_map *isl_basic_map_convex_hull(struct isl_basic_map *bmap) +__isl_give isl_basic_map *isl_basic_map_remove_redundancies( + __isl_take isl_basic_map *bmap) { struct isl_tab *tab; @@ -118,10 +119,11 @@ error: return NULL; } -struct isl_basic_set *isl_basic_set_convex_hull(struct isl_basic_set *bset) +__isl_give isl_basic_set *isl_basic_set_remove_redundancies( + __isl_take isl_basic_set *bset) { return (struct isl_basic_set *) - isl_basic_map_convex_hull((struct isl_basic_map *)bset); + isl_basic_map_remove_redundancies((struct isl_basic_map *)bset); } /* Check if the set set is bound in the direction of the affine @@ -865,7 +867,7 @@ static struct isl_basic_set *convex_hull_pair_elim(struct isl_basic_set *bset1, } hull = isl_basic_set_set_rational(hull); hull = isl_basic_set_remove_dims(hull, dim, 2*(1+dim)); - hull = isl_basic_set_convex_hull(hull); + hull = isl_basic_set_remove_redundancies(hull); isl_basic_set_free(bset1); isl_basic_set_free(bset2); return hull; @@ -2285,7 +2287,7 @@ struct isl_basic_map *isl_map_simple_hull(struct isl_map *map) hull = isl_basic_map_overlying_set(bset, model); hull = isl_basic_map_intersect(hull, affine_hull); - hull = isl_basic_map_convex_hull(hull); + hull = isl_basic_map_remove_redundancies(hull); ISL_F_SET(hull, ISL_BASIC_MAP_NO_IMPLICIT); ISL_F_SET(hull, ISL_BASIC_MAP_ALL_EQUALITIES); diff --git a/isl_map.c b/isl_map.c index 3276cf6..e152cdc 100644 --- a/isl_map.c +++ b/isl_map.c @@ -5300,7 +5300,7 @@ int isl_basic_map_is_empty(struct isl_basic_map *bmap) if (ISL_F_ISSET(bmap, ISL_BASIC_MAP_RATIONAL)) { struct isl_basic_map *copy = isl_basic_map_copy(bmap); - copy = isl_basic_map_convex_hull(copy); + copy = isl_basic_map_remove_redundancies(copy); empty = ISL_F_ISSET(copy, ISL_BASIC_MAP_EMPTY); isl_basic_map_free(copy); return empty; @@ -6028,7 +6028,7 @@ struct isl_basic_map *isl_basic_map_normalize(struct isl_basic_map *bmap) return NULL; if (ISL_F_ISSET(bmap, ISL_BASIC_MAP_NORMALIZED)) return bmap; - bmap = isl_basic_map_convex_hull(bmap); + bmap = isl_basic_map_remove_redundancies(bmap); bmap = isl_basic_map_sort_constraints(bmap); ISL_F_SET(bmap, ISL_BASIC_MAP_NORMALIZED); return bmap; diff --git a/isl_map_simplify.c b/isl_map_simplify.c index 29d13fc..75a1035 100644 --- a/isl_map_simplify.c +++ b/isl_map_simplify.c @@ -1321,7 +1321,7 @@ struct isl_basic_map *isl_basic_map_eliminate_vars( bmap = isl_basic_map_normalize_constraints(bmap); bmap = remove_duplicate_constraints(bmap, NULL); bmap = isl_basic_map_gauss(bmap, NULL); - bmap = isl_basic_map_convex_hull(bmap); + bmap = isl_basic_map_remove_redundancies(bmap); if (!bmap) goto error; if (ISL_F_ISSET(bmap, ISL_BASIC_MAP_EMPTY)) @@ -1808,8 +1808,8 @@ struct isl_basic_map *isl_basic_map_gist(struct isl_basic_map *bmap, return bmap; } - bmap = isl_basic_map_convex_hull(bmap); - context = isl_basic_map_convex_hull(context); + bmap = isl_basic_map_remove_redundancies(bmap); + context = isl_basic_map_remove_redundancies(context); if (context->n_eq) bmap = normalize_divs_in_context(bmap, context); @@ -1849,7 +1849,7 @@ __isl_give isl_map *isl_map_gist_basic_map(__isl_take isl_map *map, return isl_map_universe(dim); } - context = isl_basic_map_convex_hull(context); + context = isl_basic_map_remove_redundancies(context); map = isl_map_cow(map); if (!map || !context) goto error;;