summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: d6d3cc7)
rawpatchinlineside by side (parent: d6d3cc7)
| author | Sven Verdoolaege <skimo@kotnet.org> | |
| Fri, 5 Aug 2016 10:02:45 +0000 (5 12:02 +0200) | ||
| committer | Sven Verdoolaege <sven.verdoolaege@gmail.com> | |
| Thu, 28 Nov 2019 10:23:12 +0000 (28 11:23 +0100) |
Every call to these functions currently passes in the space
of the first argument as second argument, so there is no need
to pass it in separately.
Since the space argument is removed, the "_space" name suffix
is also removed.
Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
of the first argument as second argument, so there is no need
to pass it in separately.
Since the space argument is removed, the "_space" name suffix
is also removed.
Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
diff --git a/isl_affine_hull.c b/isl_affine_hull.c
--- a/isl_affine_hull.c
+++ b/isl_affine_hull.c
isl_basic_set_free(hull);
return isl_basic_map_set_to_empty(bmap);
}
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim), 0,
- hull->n_eq, 0);
+ bmap = isl_basic_map_extend(bmap, 0, hull->n_eq, 0);
total = isl_basic_set_dim(hull, isl_dim_all);
if (total < 0)
goto error;
if (isl_int_is_one(M->row[0][0]))
return bmap;
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim),
- M->n_row - 1, M->n_row - 1, 0);
+ bmap = isl_basic_map_extend(bmap, M->n_row - 1, M->n_row - 1, 0);
isl_int_init(gcd);
for (i = 1; i < M->n_row; ++i) {
diff --git a/isl_coalesce.c b/isl_coalesce.c
--- a/isl_coalesce.c
+++ b/isl_coalesce.c
{
int i, j, d;
isl_size n;
- isl_space *space;
- space = isl_basic_map_get_space(info->bmap);
info->bmap = isl_basic_map_cow(info->bmap);
- info->bmap = isl_basic_map_extend_space(info->bmap, space,
- extra_var, 0, 0);
+ info->bmap = isl_basic_map_extend(info->bmap, extra_var, 0, 0);
n = isl_aff_list_n_aff(list);
if (!info->bmap || n < 0)
return isl_stat_error;
diff --git a/isl_convex_hull.c b/isl_convex_hull.c
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
if (!facet || !hull_facet)
goto error;
hull = isl_basic_set_cow(hull);
- hull = isl_basic_set_extend_space(hull,
- isl_space_copy(hull->dim), 0, 0, facet->n_ineq);
+ hull = isl_basic_set_extend(hull, 0, 0, facet->n_ineq);
if (!hull)
goto error;
for (j = 0; j < facet->n_ineq; ++j) {
diff --git a/isl_map.c b/isl_map.c
--- a/isl_map.c
+++ b/isl_map.c
if (isl_basic_map_check_range(bmap, isl_dim_div, pos, 0) < 0)
return isl_basic_map_free(bmap);
- bmap = isl_basic_map_extend_space(bmap,
- isl_basic_map_get_space(bmap), 1, 0, 2);
+ bmap = isl_basic_map_extend(bmap, 1, 0, 2);
k = isl_basic_map_alloc_div(bmap);
if (k < 0)
return isl_basic_map_free(bmap);
return NULL;
}
-__isl_give isl_basic_map *isl_basic_map_extend_space(
- __isl_take isl_basic_map *base, __isl_take isl_space *space,
+__isl_give isl_basic_map *isl_basic_map_extend(__isl_take isl_basic_map *base,
unsigned extra, unsigned n_eq, unsigned n_ineq)
{
+ isl_space *space;
struct isl_basic_map *ext;
unsigned flags;
int dims_ok;
- if (!space)
- goto error;
-
if (!base)
goto error;
- dims_ok = isl_space_is_equal(base->dim, space) &&
- base->extra >= base->n_div + extra;
+ dims_ok = base->extra >= base->n_div + extra;
if (dims_ok && room_for_con(base, n_eq + n_ineq) &&
- room_for_ineq(base, n_ineq)) {
- isl_space_free(space);
+ room_for_ineq(base, n_ineq))
return base;
- }
- isl_assert(base->ctx, base->dim->nparam <= space->nparam, goto error);
- isl_assert(base->ctx, base->dim->n_in <= space->n_in, goto error);
- isl_assert(base->ctx, base->dim->n_out <= space->n_out, goto error);
extra += base->extra;
n_eq += base->n_eq;
n_ineq += base->n_ineq;
+ space = isl_basic_map_get_space(base);
ext = isl_basic_map_alloc_space(space, extra, n_eq, n_ineq);
- space = NULL;
if (!ext)
goto error;
return ext;
error:
- isl_space_free(space);
isl_basic_map_free(base);
return NULL;
}
-__isl_give isl_basic_set *isl_basic_set_extend_space(
- __isl_take isl_basic_set *base,
- __isl_take isl_space *dim, unsigned extra,
- unsigned n_eq, unsigned n_ineq)
+__isl_give isl_basic_set *isl_basic_set_extend(__isl_take isl_basic_set *base,
+ unsigned extra, unsigned n_eq, unsigned n_ineq)
{
- return bset_from_bmap(isl_basic_map_extend_space(bset_to_bmap(base),
- dim, extra, n_eq, n_ineq));
+ return bset_from_bmap(isl_basic_map_extend(bset_to_bmap(base),
+ extra, n_eq, n_ineq));
}
struct isl_basic_map *isl_basic_map_extend_constraints(
struct isl_basic_map *base, unsigned n_eq, unsigned n_ineq)
{
- if (!base)
- return NULL;
- return isl_basic_map_extend_space(base, isl_space_copy(base->dim),
- 0, n_eq, n_ineq);
+ return isl_basic_map_extend(base, 0, n_eq, n_ineq);
}
struct isl_basic_set *isl_basic_set_extend_constraints(
bmap = isl_basic_map_cow(bmap);
if (!bmap)
goto error;
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim),
+ bmap = isl_basic_map_extend(bmap,
bset->n_div, bset->n_eq, bset->n_ineq);
bmap_domain = isl_basic_map_from_domain(bset);
bmap = add_constraints(bmap, bmap_domain, 0, 0);
bmap = isl_basic_map_cow(bmap);
if (!bmap)
goto error;
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim),
+ bmap = isl_basic_map_extend(bmap,
bset->n_div, bset->n_eq, bset->n_ineq);
bmap_range = bset_to_bmap(bset);
bmap = add_constraints(bmap, bmap_range, 0, 0);
bmap1 = isl_basic_map_cow(bmap1);
if (!bmap1)
goto error;
- bmap1 = isl_basic_map_extend_space(bmap1, isl_space_copy(bmap1->dim),
+ bmap1 = isl_basic_map_extend(bmap1,
bmap2->n_div, bmap2->n_eq, bmap2->n_ineq);
bmap1 = add_constraints(bmap1, bmap2, 0, 0);
if (!bset || !eq)
goto error;
- bset = isl_basic_set_extend_space(bset, isl_space_copy(bset->dim), 0,
- eq->n_row, 0);
+ bset = isl_basic_set_extend(bset, 0, eq->n_row, 0);
if (!bset)
goto error;
"not an expansion", goto error);
n_div = bmap->n_div;
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim),
- div->n_row - n_div, 0,
+ bmap = isl_basic_map_extend(bmap, div->n_row - n_div, 0,
2 * (div->n_row - n_div));
for (i = n_div; i < div->n_row; ++i)
dst = isl_basic_map_cow(dst);
if (!dst)
goto error;
- dst = isl_basic_map_extend_space(dst,
- isl_space_copy(dst->dim),
+ dst = isl_basic_map_extend(dst,
extra, 0, 2 * extra);
extended = 1;
}
diff --git a/isl_map_private.h b/isl_map_private.h
--- a/isl_map_private.h
+++ b/isl_map_private.h
isl_bool isl_basic_map_compatible_range(__isl_keep isl_basic_map *bmap,
__isl_keep isl_basic_set *bset);
-__isl_give isl_basic_map *isl_basic_map_extend_space(
- __isl_take isl_basic_map *base, __isl_take isl_space *space,
+__isl_give isl_basic_map *isl_basic_map_extend(__isl_take isl_basic_map *base,
+ unsigned extra, unsigned n_eq, unsigned n_ineq);
+__isl_give isl_basic_set *isl_basic_set_extend(__isl_take isl_basic_set *base,
unsigned extra, unsigned n_eq, unsigned n_ineq);
-__isl_give isl_basic_set *isl_basic_set_extend_space(
- __isl_take isl_basic_set *base,
- __isl_take isl_space *dim, unsigned extra,
- unsigned n_eq, unsigned n_ineq);
__isl_give isl_map *isl_map_grow(__isl_take isl_map *map, int n);
struct isl_set *isl_set_grow(struct isl_set *set, int n);
diff --git a/isl_map_simplify.c b/isl_map_simplify.c
--- a/isl_map_simplify.c
+++ b/isl_map_simplify.c
@@ -1066,8 +1066,7 @@ static __isl_give isl_basic_map *normalize_divs(__isl_take isl_basic_map *bmap,
needed++;
}
if (needed > dropped) {
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim),
- needed, needed, 0);
+ bmap = isl_basic_map_extend(bmap, needed, needed, 0);
if (!bmap)
goto error;
}
diff --git a/isl_tab_pip.c b/isl_tab_pip.c
--- a/isl_tab_pip.c
+++ b/isl_tab_pip.c
}
other = bmap_n_div - common;
if (dom->n_div - common > 0) {
- bmap = isl_basic_map_extend_space(bmap, isl_space_copy(bmap->dim),
- dom->n_div - common, 0, 0);
+ bmap = isl_basic_map_extend(bmap, dom->n_div - common, 0, 0);
if (!bmap)
return NULL;
}