X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_map.c;h=0478d727434301d6ae83fe91e9574257fbb98c9a;hb=63fb8a7f484648c3caa25351c8c94ac2395ec563;hp=9848bd2aef73074fbc96a0b6db8a73abb75c47ac;hpb=156e2dba0e4a1a4a36a0e160895ca2a949a7f890;p=platform%2Fupstream%2Fisl.git diff --git a/isl_map.c b/isl_map.c index 9848bd2..0478d72 100644 --- a/isl_map.c +++ b/isl_map.c @@ -18,7 +18,6 @@ #include #include "isl_space_private.h" #include "isl_equalities.h" -#include #include #include #include @@ -11057,32 +11056,29 @@ __isl_give isl_basic_map *isl_basic_map_order_ge(__isl_take isl_basic_map *bmap, return bmap; } -/* Add a constraint imposing that the value of the first dimension is +/* Construct a basic map where the value of the first dimension is * greater than that of the second. */ -__isl_give isl_map *isl_map_order_gt(__isl_take isl_map *map, +static __isl_give isl_basic_map *greator(__isl_take isl_space *space, enum isl_dim_type type1, int pos1, enum isl_dim_type type2, int pos2) { isl_basic_map *bmap = NULL; int i; - if (!map) + if (!space) return NULL; - if (pos1 >= isl_map_dim(map, type1)) - isl_die(map->ctx, isl_error_invalid, + if (pos1 >= isl_space_dim(space, type1)) + isl_die(isl_space_get_ctx(space), isl_error_invalid, "index out of bounds", goto error); - if (pos2 >= isl_map_dim(map, type2)) - isl_die(map->ctx, isl_error_invalid, + if (pos2 >= isl_space_dim(space, type2)) + isl_die(isl_space_get_ctx(space), isl_error_invalid, "index out of bounds", goto error); - if (type1 == type2 && pos1 == pos2) { - isl_space *space = isl_map_get_space(map); - isl_map_free(map); - return isl_map_empty(space); - } + if (type1 == type2 && pos1 == pos2) + return isl_basic_map_empty(space); - bmap = isl_basic_map_alloc_space(isl_map_get_space(map), 0, 0, 1); + bmap = isl_basic_map_alloc_space(space, 0, 0, 1); i = isl_basic_map_alloc_inequality(bmap); if (i < 0) goto error; @@ -11094,16 +11090,44 @@ __isl_give isl_map *isl_map_order_gt(__isl_take isl_map *map, isl_int_set_si(bmap->ineq[i][0], -1); bmap = isl_basic_map_finalize(bmap); - map = isl_map_intersect(map, isl_map_from_basic_map(bmap)); - - return map; + return bmap; error: + isl_space_free(space); isl_basic_map_free(bmap); - isl_map_free(map); return NULL; } /* Add a constraint imposing that the value of the first dimension is + * greater than that of the second. + */ +__isl_give isl_basic_map *isl_basic_map_order_gt(__isl_take isl_basic_map *bmap, + enum isl_dim_type type1, int pos1, enum isl_dim_type type2, int pos2) +{ + isl_basic_map *gt; + + gt = greator(isl_basic_map_get_space(bmap), type1, pos1, type2, pos2); + + bmap = isl_basic_map_intersect(bmap, gt); + + return bmap; +} + +/* Add a constraint imposing that the value of the first dimension is + * greater than that of the second. + */ +__isl_give isl_map *isl_map_order_gt(__isl_take isl_map *map, + enum isl_dim_type type1, int pos1, enum isl_dim_type type2, int pos2) +{ + isl_basic_map *bmap; + + bmap = greator(isl_map_get_space(map), type1, pos1, type2, pos2); + + map = isl_map_intersect(map, isl_map_from_basic_map(bmap)); + + return map; +} + +/* Add a constraint imposing that the value of the first dimension is * smaller than that of the second. */ __isl_give isl_map *isl_map_order_lt(__isl_take isl_map *map, @@ -11258,24 +11282,6 @@ error: return NULL; } -/* Check if the range of "ma" is compatible with "space". - * Return -1 if anything is wrong. - */ -static int check_space_compatible_range_multi_aff( - __isl_keep isl_space *space, __isl_keep isl_multi_aff *ma) -{ - int m; - isl_space *ma_space; - - ma_space = isl_multi_aff_get_space(ma); - m = isl_space_is_range_internal(space, ma_space); - isl_space_free(ma_space); - if (m >= 0 && !m) - isl_die(isl_space_get_ctx(space), isl_error_invalid, - "spaces don't match", return -1); - return m; -} - /* Check if the range of "ma" is compatible with the domain or range * (depending on "type") of "bmap". * Return -1 if anything is wrong. @@ -11521,7 +11527,7 @@ __isl_give isl_basic_map *isl_basic_map_preimage_multi_aff( n_div_bmap = isl_basic_map_dim(bmap, isl_dim_div); n_div_ma = ma->n ? isl_aff_dim(ma->p[0], isl_dim_div) : 0; - space = isl_space_domain(isl_multi_aff_get_space(ma)); + space = isl_multi_aff_get_domain_space(ma); space = isl_space_set(isl_basic_map_get_space(bmap), type, space); rational = isl_basic_map_is_rational(bmap); strides = rational ? 0 : multi_aff_strides(ma); @@ -11595,74 +11601,123 @@ __isl_give isl_basic_set *isl_basic_set_preimage_multi_aff( return isl_basic_map_preimage_multi_aff(bset, isl_dim_set, ma); } -/* Check if the range of "ma" is compatible with "set". +/* Check if the range of "ma" is compatible with the domain or range + * (depending on "type") of "map". * Return -1 if anything is wrong. */ -static int check_set_compatible_range_multi_aff( - __isl_keep isl_set *set, __isl_keep isl_multi_aff *ma) +static int check_map_compatible_range_multi_aff( + __isl_keep isl_map *map, enum isl_dim_type type, + __isl_keep isl_multi_aff *ma) { - return check_space_compatible_range_multi_aff(set->dim, ma); + int m; + isl_space *ma_space; + + ma_space = isl_multi_aff_get_space(ma); + m = isl_space_tuple_match(map->dim, type, ma_space, isl_dim_out); + isl_space_free(ma_space); + if (m >= 0 && !m) + isl_die(isl_map_get_ctx(map), isl_error_invalid, + "spaces don't match", return -1); + return m; } -/* Compute the preimage of "set" under the function represented by "ma". - * In other words, plug in "ma" in "set. The result is a set - * that lives in the domain space of "ma". +/* Compute the preimage of the domain or range (depending on "type") + * of "map" under the function represented by "ma". + * In other words, plug in "ma" in the domain or range of "map". + * The result is a map that lives in the same space as "map" + * except that the domain or range has been replaced by + * the domain space of "ma". + * + * The parameters are assumed to have been aligned. */ -static __isl_give isl_set *set_preimage_multi_aff(__isl_take isl_set *set, - __isl_take isl_multi_aff *ma) +static __isl_give isl_map *map_preimage_multi_aff(__isl_take isl_map *map, + enum isl_dim_type type, __isl_take isl_multi_aff *ma) { int i; + isl_space *space; - set = isl_set_cow(set); + map = isl_map_cow(map); ma = isl_multi_aff_align_divs(ma); - if (!set || !ma) + if (!map || !ma) goto error; - if (check_set_compatible_range_multi_aff(set, ma) < 0) + if (check_map_compatible_range_multi_aff(map, type, ma) < 0) goto error; - for (i = 0; i < set->n; ++i) { - set->p[i] = isl_basic_set_preimage_multi_aff(set->p[i], + for (i = 0; i < map->n; ++i) { + map->p[i] = isl_basic_map_preimage_multi_aff(map->p[i], type, isl_multi_aff_copy(ma)); - if (!set->p[i]) + if (!map->p[i]) goto error; } - isl_space_free(set->dim); - set->dim = isl_multi_aff_get_domain_space(ma); - if (!set->dim) + space = isl_multi_aff_get_domain_space(ma); + space = isl_space_set(isl_map_get_space(map), type, space); + + isl_space_free(map->dim); + map->dim = space; + if (!map->dim) goto error; isl_multi_aff_free(ma); - if (set->n > 1) - ISL_F_CLR(set, ISL_MAP_DISJOINT); - ISL_F_CLR(set, ISL_SET_NORMALIZED); - return set; + if (map->n > 1) + ISL_F_CLR(map, ISL_MAP_DISJOINT); + ISL_F_CLR(map, ISL_SET_NORMALIZED); + return map; error: isl_multi_aff_free(ma); - isl_set_free(set); + isl_map_free(map); return NULL; } -__isl_give isl_set *isl_set_preimage_multi_aff(__isl_take isl_set *set, - __isl_take isl_multi_aff *ma) +/* Compute the preimage of the domain or range (depending on "type") + * of "map" under the function represented by "ma". + * In other words, plug in "ma" in the domain or range of "map". + * The result is a map that lives in the same space as "map" + * except that the domain or range has been replaced by + * the domain space of "ma". + */ +__isl_give isl_map *isl_map_preimage_multi_aff(__isl_take isl_map *map, + enum isl_dim_type type, __isl_take isl_multi_aff *ma) { - if (!set || !ma) + if (!map || !ma) goto error; - if (isl_space_match(set->dim, isl_dim_param, ma->space, isl_dim_param)) - return set_preimage_multi_aff(set, ma); + if (isl_space_match(map->dim, isl_dim_param, ma->space, isl_dim_param)) + return map_preimage_multi_aff(map, type, ma); - if (!isl_space_has_named_params(set->dim) || + if (!isl_space_has_named_params(map->dim) || !isl_space_has_named_params(ma->space)) - isl_die(set->ctx, isl_error_invalid, + isl_die(map->ctx, isl_error_invalid, "unaligned unnamed parameters", goto error); - set = isl_set_align_params(set, isl_multi_aff_get_space(ma)); - ma = isl_multi_aff_align_params(ma, isl_set_get_space(set)); + map = isl_map_align_params(map, isl_multi_aff_get_space(ma)); + ma = isl_multi_aff_align_params(ma, isl_map_get_space(map)); - return set_preimage_multi_aff(set, ma); + return map_preimage_multi_aff(map, type, ma); error: isl_multi_aff_free(ma); - return isl_set_free(set); + return isl_map_free(map); +} + +/* Compute the preimage of "set" under the function represented by "ma". + * In other words, plug in "ma" "set". The result is a set + * that lives in the domain space of "ma". + */ +__isl_give isl_set *isl_set_preimage_multi_aff(__isl_take isl_set *set, + __isl_take isl_multi_aff *ma) +{ + return isl_map_preimage_multi_aff(set, isl_dim_set, ma); +} + +/* Compute the preimage of the domain of "map" under the function + * represented by "ma". + * In other words, plug in "ma" in the domain of "map". + * The result is a map that lives in the same space as "map" + * except that the domain has been replaced by the domain space of "ma". + */ +__isl_give isl_map *isl_map_preimage_domain_multi_aff(__isl_take isl_map *map, + __isl_take isl_multi_aff *ma) +{ + return isl_map_preimage_multi_aff(map, isl_dim_in, ma); } /* Compute the preimage of "set" under the function represented by "pma".