summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: bcad76d)
rawpatchinlineside by side (parent: bcad76d)
| author | Sven Verdoolaege <skimo@kotnet.org> | |
| Wed, 28 Sep 2016 10:15:55 +0000 (28 12:15 +0200) | ||
| committer | Sven Verdoolaege <skimo@kotnet.org> | |
| Wed, 2 Nov 2016 07:33:16 +0000 (2 08:33 +0100) |
The motivation for this change is the same as for bset_from_bmap
in a recent commit.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
in a recent commit.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
isl_pw_union_opt.c \
read_in_string_templ.c \
set_to_map.c \
+ set_from_map.c \
isl_tab_lexopt_templ.c \
isl_union_macro.h \
isl_union_templ.c \
diff --git a/isl_affine_hull.c b/isl_affine_hull.c
--- a/isl_affine_hull.c
+++ b/isl_affine_hull.c
#include <bset_to_bmap.c>
#include <bset_from_bmap.c>
#include <set_to_map.c>
+#include <set_from_map.c>
struct isl_basic_map *isl_basic_map_implicit_equalities(
struct isl_basic_map *bmap)
__isl_give isl_set *isl_set_detect_equalities(__isl_take isl_set *set)
{
- return (isl_set *)isl_map_detect_equalities(set_to_map(set));
+ return set_from_map(isl_map_detect_equalities(set_to_map(set)));
}
/* Return the superset of "bmap" described by the equalities
diff --git a/isl_coalesce.c b/isl_coalesce.c
--- a/isl_coalesce.c
+++ b/isl_coalesce.c
#include <isl_equalities.h>
#include <set_to_map.c>
+#include <set_from_map.c>
#define STATUS_ERROR -1
#define STATUS_REDUNDANT 1
*/
struct isl_set *isl_set_coalesce(struct isl_set *set)
{
- return (struct isl_set *)isl_map_coalesce(set_to_map(set));
+ return set_from_map(isl_map_coalesce(set_to_map(set)));
}
diff --git a/isl_map.c b/isl_map.c
--- a/isl_map.c
+++ b/isl_map.c
#include <bset_to_bmap.c>
#include <bset_from_bmap.c>
#include <set_to_map.c>
+#include <set_from_map.c>
static unsigned n(__isl_keep isl_space *dim, enum isl_dim_type type)
{
__isl_give isl_set *isl_set_set_tuple_name(__isl_take isl_set *set,
const char *s)
{
- return (isl_set *)isl_map_set_tuple_name(set_to_map(set),
- isl_dim_set, s);
+ return set_from_map(isl_map_set_tuple_name(set_to_map(set),
+ isl_dim_set, s));
}
__isl_give isl_map *isl_map_set_tuple_id(__isl_take isl_map *map,
__isl_give isl_set *isl_set_set_dim_name(__isl_take isl_set *set,
enum isl_dim_type type, unsigned pos, const char *s)
{
- return (isl_set *)isl_map_set_dim_name(set_to_map(set), type, pos, s);
+ return set_from_map(isl_map_set_dim_name(set_to_map(set),
+ type, pos, s));
}
isl_bool isl_basic_map_has_dim_id(__isl_keep isl_basic_map *bmap,
__isl_give isl_set *isl_set_eliminate(__isl_take isl_set *set,
enum isl_dim_type type, unsigned first, unsigned n)
{
- return (isl_set *)isl_map_eliminate(set_to_map(set), type, first, n);
+ return set_from_map(isl_map_eliminate(set_to_map(set), type, first, n));
}
/* Eliminate the specified n dimensions starting at first from the
__isl_give isl_set *isl_set_remove_divs_involving_dims(__isl_take isl_set *set,
enum isl_dim_type type, unsigned first, unsigned n)
{
- return (isl_set *)isl_map_remove_divs_involving_dims(set_to_map(set),
- type, first, n);
+ return set_from_map(isl_map_remove_divs_involving_dims(set_to_map(set),
+ type, first, n));
}
/* Does the desciption of "bmap" depend on the specified dimensions?
__isl_give isl_set *isl_set_remove_unknown_divs(__isl_take isl_set *set)
{
- return (isl_set *)isl_map_remove_unknown_divs(set_to_map(set));
+ return set_from_map(isl_map_remove_unknown_divs(set_to_map(set)));
}
__isl_give isl_basic_set *isl_basic_set_remove_dims(
__isl_give isl_set *isl_set_remove_dims(__isl_take isl_set *bset,
enum isl_dim_type type, unsigned first, unsigned n)
{
- return (isl_set *)isl_map_remove_dims(set_to_map(bset), type, first, n);
+ return set_from_map(isl_map_remove_dims(set_to_map(bset),
+ type, first, n));
}
/* Project out n inputs starting at first using Fourier-Motzkin */
*/
struct isl_set *isl_set_grow(struct isl_set *set, int n)
{
- return (struct isl_set *)isl_map_grow(set_to_map(set), n);
+ return set_from_map(isl_map_grow(set_to_map(set), n));
}
struct isl_set *isl_set_dup(struct isl_set *set)
__isl_give isl_set *isl_set_add_basic_set(__isl_take isl_set *set,
__isl_take isl_basic_set *bset)
{
- return (struct isl_set *)isl_map_add_basic_map(set_to_map(set),
- bset_to_bmap(bset));
+ return set_from_map(isl_map_add_basic_map(set_to_map(set),
+ bset_to_bmap(bset)));
}
__isl_null isl_set *isl_set_free(__isl_take isl_set *set)
struct isl_set *isl_set_intersect(struct isl_set *set1, struct isl_set *set2)
{
- return (struct isl_set *)
- isl_map_intersect(set_to_map(set1),
- set_to_map(set2));
+ return set_from_map(isl_map_intersect(set_to_map(set1),
+ set_to_map(set2)));
}
/* map_intersect_internal accepts intersections
if (!set)
return NULL;
isl_assert(set->ctx, type != isl_dim_in, goto error);
- return (isl_set *)isl_map_add_dims(set_to_map(set), type, n);
+ return set_from_map(isl_map_add_dims(set_to_map(set), type, n));
error:
isl_set_free(set);
return NULL;
if (!set)
return NULL;
isl_assert(set->ctx, dst_type != isl_dim_in, goto error);
- return (isl_set *)isl_map_move_dims(set_to_map(set), dst_type, dst_pos,
- src_type, src_pos, n);
+ return set_from_map(isl_map_move_dims(set_to_map(set),
+ dst_type, dst_pos, src_type, src_pos, n));
error:
isl_set_free(set);
return NULL;
__isl_give isl_set *isl_set_project_out(__isl_take isl_set *set,
enum isl_dim_type type, unsigned first, unsigned n)
{
- return (isl_set *)isl_map_project_out(set_to_map(set), type, first, n);
+ return set_from_map(isl_map_project_out(set_to_map(set),
+ type, first, n));
}
/* Return a map that projects the elements in "set" onto their
__isl_give isl_set *isl_set_sum(__isl_take isl_set *set1,
__isl_take isl_set *set2)
{
- return (isl_set *)isl_map_sum(set_to_map(set1), set_to_map(set2));
+ return set_from_map(isl_map_sum(set_to_map(set1), set_to_map(set2)));
}
/* Given a basic map A -> f(A), construct A -> -f(A).
__isl_give isl_set *isl_set_neg(__isl_take isl_set *set)
{
- return (isl_set *)isl_map_neg(set_to_map(set));
+ return set_from_map(isl_map_neg(set_to_map(set)));
}
/* Given a basic map A -> f(A) and an integer d, construct a basic map
}
if (!map->dim)
goto error;
- return (struct isl_set *)map;
+ return set_from_map(map);
error:
isl_map_free(map);
return NULL;
struct isl_set *isl_set_to_underlying_set(struct isl_set *set)
{
- return (struct isl_set *)isl_map_underlying_set(set_to_map(set));
+ return set_from_map(isl_map_underlying_set(set_to_map(set)));
}
/* Replace the space of "bmap" by "space".
__isl_give isl_set *isl_set_reset_space(__isl_take isl_set *set,
__isl_take isl_space *dim)
{
- return (struct isl_set *) isl_map_reset_space(set_to_map(set), dim);
+ return set_from_map(isl_map_reset_space(set_to_map(set), dim));
}
/* Compute the parameter domain of the given basic set.
if (!map)
goto error;
if (isl_map_is_set(map))
- return (isl_set *)map;
+ return set_from_map(map);
map = isl_map_cow(map);
if (!map)
goto error;
- set = (struct isl_set *) map;
+ set = set_from_map(map);
set->dim = isl_space_range(set->dim);
if (!set->dim)
goto error;
__isl_give isl_set *isl_set_fix_si(__isl_take isl_set *set,
enum isl_dim_type type, unsigned pos, int value)
{
- return (struct isl_set *)
- isl_map_fix_si(set_to_map(set), type, pos, value);
+ return set_from_map(isl_map_fix_si(set_to_map(set), type, pos, value));
}
__isl_give isl_map *isl_map_fix(__isl_take isl_map *map,
__isl_give isl_set *isl_set_fix(__isl_take isl_set *set,
enum isl_dim_type type, unsigned pos, isl_int value)
{
- return (struct isl_set *)isl_map_fix(set_to_map(set), type, pos, value);
+ return set_from_map(isl_map_fix(set_to_map(set), type, pos, value));
}
/* Fix the value of the variable at position "pos" of type "type" of "map"
struct isl_set *isl_set_fix_dim_si(struct isl_set *set, unsigned dim, int value)
{
- return (struct isl_set *)
- isl_map_fix_si(set_to_map(set), isl_dim_set, dim, value);
+ return set_from_map(isl_map_fix_si(set_to_map(set),
+ isl_dim_set, dim, value));
}
static __isl_give isl_basic_map *basic_map_bound_si(
__isl_give isl_set *isl_set_lower_bound_si(__isl_take isl_set *set,
enum isl_dim_type type, unsigned pos, int value)
{
- return (struct isl_set *)
- isl_map_lower_bound_si(set_to_map(set), type, pos, value);
+ return set_from_map(isl_map_lower_bound_si(set_to_map(set),
+ type, pos, value));
}
__isl_give isl_set *isl_set_upper_bound_si(__isl_take isl_set *set,
__isl_take isl_set *set, __isl_take isl_set *dom,
__isl_give isl_set **empty)
{
- return (struct isl_set *)
- isl_map_partial_lexmin(set_to_map(set),
- dom, empty);
+ return set_from_map(isl_map_partial_lexmin(set_to_map(set),
+ dom, empty));
}
__isl_give isl_set *isl_set_partial_lexmax(
__isl_take isl_set *set, __isl_take isl_set *dom,
__isl_give isl_set **empty)
{
- return (struct isl_set *)
- isl_map_partial_lexmax(set_to_map(set),
- dom, empty);
+ return set_from_map(isl_map_partial_lexmax(set_to_map(set),
+ dom, empty));
}
/* Compute the lexicographic minimum (or maximum if "flags" includes
__isl_give isl_set *isl_basic_set_lexmin(__isl_take isl_basic_set *bset)
{
- return (isl_set *)isl_basic_map_lexmin(bset_to_bmap(bset));
+ return set_from_map(isl_basic_map_lexmin(bset_to_bmap(bset)));
}
__isl_give isl_set *isl_basic_set_lexmax(__isl_take isl_basic_set *bset)
{
- return (isl_set *)isl_basic_map_lexmax(bset_to_bmap(bset));
+ return set_from_map(isl_basic_map_lexmax(bset_to_bmap(bset)));
}
/* Compute the lexicographic minimum of "bset" over its parametric domain
struct isl_set *isl_basic_set_compute_divs(struct isl_basic_set *bset)
{
- return (struct isl_set *)
- isl_basic_map_compute_divs(bset_to_bmap(bset));
+ return set_from_map(isl_basic_map_compute_divs(bset_to_bmap(bset)));
}
struct isl_set *isl_set_compute_divs(struct isl_set *set)
{
- return (struct isl_set *)
- isl_map_compute_divs(set_to_map(set));
+ return set_from_map(isl_map_compute_divs(set_to_map(set)));
}
struct isl_set *isl_map_domain(struct isl_map *map)
if (!map)
return NULL;
- set = (struct isl_set *)map;
+ set = set_from_map(map);
set->dim = isl_space_domain(set->dim);
if (!set->dim)
goto error;
struct isl_set *isl_set_union_disjoint(
struct isl_set *set1, struct isl_set *set2)
{
- return (struct isl_set *)
- isl_map_union_disjoint(
- set_to_map(set1), set_to_map(set2));
+ return set_from_map(isl_map_union_disjoint(set_to_map(set1),
+ set_to_map(set2)));
}
struct isl_set *isl_set_union(struct isl_set *set1, struct isl_set *set2)
{
- return (struct isl_set *)
- isl_map_union(set_to_map(set1), set_to_map(set2));
+ return set_from_map(isl_map_union(set_to_map(set1), set_to_map(set2)));
}
/* Apply "fn" to pairs of elements from "map" and "set" and collect
struct isl_set *isl_basic_set_union(
struct isl_basic_set *bset1, struct isl_basic_set *bset2)
{
- return (struct isl_set *)isl_basic_map_union(
- bset_to_bmap(bset1),
- bset_to_bmap(bset2));
+ return set_from_map(isl_basic_map_union(bset_to_bmap(bset1),
+ bset_to_bmap(bset2)));
}
/* Order divs such that any div only depends on previous divs */
struct isl_set *isl_set_align_divs(struct isl_set *set)
{
- return (struct isl_set *)isl_map_align_divs(set_to_map(set));
+ return set_from_map(isl_map_align_divs(set_to_map(set)));
}
/* Align the divs of the basic maps in "map" to those
struct isl_set *isl_set_remove_empty_parts(struct isl_set *set)
{
- return (struct isl_set *)
- isl_map_remove_empty_parts(set_to_map(set));
+ return set_from_map(isl_map_remove_empty_parts(set_to_map(set)));
}
struct isl_basic_map *isl_map_copy_basic_map(struct isl_map *map)
struct isl_set *isl_set_drop_basic_set(struct isl_set *set,
struct isl_basic_set *bset)
{
- return (struct isl_set *)isl_map_drop_basic_map(set_to_map(set),
- bset_to_bmap(bset));
+ return set_from_map(isl_map_drop_basic_map(set_to_map(set),
+ bset_to_bmap(bset)));
}
/* Given two basic sets bset1 and bset2, compute the maximal difference
struct isl_set *isl_set_normalize(struct isl_set *set)
{
- return (struct isl_set *)isl_map_normalize(set_to_map(set));
+ return set_from_map(isl_map_normalize(set_to_map(set)));
}
isl_bool isl_map_plain_is_equal(__isl_keep isl_map *map1,
__isl_give isl_set *isl_set_flatten(__isl_take isl_set *set)
{
- return (isl_set *)isl_map_flatten(set_to_map(set));
+ return set_from_map(isl_map_flatten(set_to_map(set)));
}
__isl_give isl_map *isl_set_flatten_map(__isl_take isl_set *set)
__isl_give isl_set *isl_set_realign(__isl_take isl_set *set,
__isl_take isl_reordering *r)
{
- return (isl_set *)isl_map_realign(set_to_map(set), r);
+ return set_from_map(isl_map_realign(set_to_map(set), r));
}
__isl_give isl_map *isl_map_align_params(__isl_take isl_map *map,
diff --git a/isl_map_simplify.c b/isl_map_simplify.c
--- a/isl_map_simplify.c
+++ b/isl_map_simplify.c
#include <bset_to_bmap.c>
#include <bset_from_bmap.c>
#include <set_to_map.c>
+#include <set_from_map.c>
static void swap_equality(struct isl_basic_map *bmap, int a, int b)
{
struct isl_set *isl_set_drop(struct isl_set *set,
enum isl_dim_type type, unsigned first, unsigned n)
{
- return (isl_set *)isl_map_drop(set_to_map(set), type, first, n);
+ return set_from_map(isl_map_drop(set_to_map(set), type, first, n));
}
struct isl_map *isl_map_drop_inputs(
__isl_give isl_set *isl_set_gist_basic_set(__isl_take isl_set *set,
__isl_take isl_basic_set *context)
{
- return (struct isl_set *)isl_map_gist_basic_map(set_to_map(set),
- bset_to_bmap(context));
+ return set_from_map(isl_map_gist_basic_map(set_to_map(set),
+ bset_to_bmap(context)));
}
__isl_give isl_set *isl_set_gist_params_basic_set(__isl_take isl_set *set,
__isl_give isl_set *isl_set_gist(__isl_take isl_set *set,
__isl_take isl_set *context)
{
- return (struct isl_set *)isl_map_gist(set_to_map(set),
- set_to_map(context));
+ return set_from_map(isl_map_gist(set_to_map(set), set_to_map(context)));
}
/* Compute the gist of "bmap" with respect to the constraints "context"
struct isl_set *isl_set_drop_redundant_divs(struct isl_set *set)
{
- return (struct isl_set *)
- isl_map_drop_redundant_divs(set_to_map(set));
+ return set_from_map(isl_map_drop_redundant_divs(set_to_map(set)));
}
/* Does "bmap" satisfy any equality that involves more than 2 variables
diff --git a/isl_map_subtract.c b/isl_map_subtract.c
--- a/isl_map_subtract.c
+++ b/isl_map_subtract.c
#include <isl_vec_private.h>
#include <set_to_map.c>
+#include <set_from_map.c>
/* Expand the constraint "c" into "v". The initial "dim" dimensions
* are the same, but "v" may have more divs than "c" and the divs of "c"
struct isl_set *isl_set_subtract(struct isl_set *set1, struct isl_set *set2)
{
- return (struct isl_set *)
- isl_map_subtract(
- set_to_map(set1), set_to_map(set2));
+ return set_from_map(isl_map_subtract(set_to_map(set1),
+ set_to_map(set2)));
}
/* Remove the elements of "dom" from the domain of "map".
__isl_give isl_set *isl_set_make_disjoint(__isl_take isl_set *set)
{
- return (struct isl_set *)isl_map_make_disjoint(set_to_map(set));
+ return set_from_map(isl_map_make_disjoint(set_to_map(set)));
}
__isl_give isl_map *isl_map_complement(__isl_take isl_map *map)
diff --git a/isl_union_map.c b/isl_union_map.c
--- a/isl_union_map.c
+++ b/isl_union_map.c
#include <bset_from_bmap.c>
#include <set_to_map.c>
+#include <set_from_map.c>
/* Return the number of parameters of "umap", where "type"
* is required to be set to isl_dim_param.
__isl_give isl_set *isl_union_set_extract_set(__isl_keep isl_union_set *uset,
__isl_take isl_space *dim)
{
- return (isl_set *)isl_union_map_extract_map(uset, dim);
+ return set_from_map(isl_union_map_extract_map(uset, dim));
}
/* Check if umap contains a map in the given space.
static __isl_give isl_map *lex_le_set(__isl_take isl_map *set1,
__isl_take isl_map *set2)
{
- return isl_set_lex_le_set((isl_set *)set1, (isl_set *)set2);
+ return isl_set_lex_le_set(set_from_map(set1), set_from_map(set2));
}
static __isl_give isl_map *lex_lt_set(__isl_take isl_map *set1,
__isl_take isl_map *set2)
{
- return isl_set_lex_lt_set((isl_set *)set1, (isl_set *)set2);
+ return isl_set_lex_lt_set(set_from_map(set1), set_from_map(set2));
}
__isl_give isl_union_map *isl_union_set_lex_lt_union_set(
diff --git a/set_from_map.c b/set_from_map.c
--- /dev/null
+++ b/set_from_map.c
@@ -0,0 +1,8 @@
+#include <isl/map_type.h>
+
+/* Return the set that was treated as the map "map".
+ */
+static __isl_give isl_set *set_from_map(__isl_take isl_map *map)
+{
+ return (isl_set *) map;
+}