if (i < total)
return 0;
- res = isl_solve_lp(*bmap, 0, c, (*bmap)->ctx->one, opt_n, opt_d);
+ res = isl_basic_map_solve_lp(*bmap, 0, c, (*bmap)->ctx->one,
+ opt_n, opt_d, NULL);
if (res == isl_lp_unbounded)
return 0;
if (res == isl_lp_error)
return bmap;
tab = isl_tab_from_basic_map(bmap);
- tab = isl_tab_detect_equalities(bmap->ctx, tab);
- tab = isl_tab_detect_redundant(bmap->ctx, tab);
+ tab = isl_tab_detect_implicit_equalities(tab);
+ if (isl_tab_detect_redundant(tab) < 0)
+ goto error;
bmap = isl_basic_map_update_from_tab(bmap, tab);
- isl_tab_free(bmap->ctx, tab);
+ isl_tab_free(tab);
ISL_F_SET(bmap, ISL_BASIC_MAP_NO_IMPLICIT);
ISL_F_SET(bmap, ISL_BASIC_MAP_NO_REDUNDANT);
return bmap;
+error:
+ isl_tab_free(tab);
+ isl_basic_map_free(bmap);
+ return NULL;
}
struct isl_basic_set *isl_basic_set_convex_hull(struct isl_basic_set *bset)
* constraint c and if so, set the constant term such that the
* resulting constraint is a bounding constraint for the set.
*/
-static int uset_is_bound(struct isl_ctx *ctx, struct isl_set *set,
- isl_int *c, unsigned len)
+static int uset_is_bound(struct isl_set *set, isl_int *c, unsigned len)
{
int first;
int j;
if (ISL_F_ISSET(set->p[j], ISL_BASIC_SET_EMPTY))
continue;
- res = isl_solve_lp((struct isl_basic_map*)set->p[j],
- 0, c, ctx->one, &opt, &opt_denom);
+ res = isl_basic_set_solve_lp(set->p[j],
+ 0, c, set->ctx->one, &opt, &opt_denom, NULL);
if (res == isl_lp_unbounded)
break;
if (res == isl_lp_error)
* hyperplane (but not necessarily a facet).
* Assumes set "set" is bounded.
*/
-static int is_independent_bound(struct isl_ctx *ctx,
- struct isl_set *set, isl_int *c,
+static int is_independent_bound(struct isl_set *set, isl_int *c,
struct isl_mat *dirs, int n)
{
int is_bound;
}
}
- is_bound = uset_is_bound(ctx, set, dirs->row[n], dirs->n_col);
+ is_bound = uset_is_bound(set, dirs->row[n], dirs->n_col);
if (is_bound != 1)
return is_bound;
if (i < n) {
* on the set "set", based on the constraints of the basic sets
* in "set".
*/
-static struct isl_mat *independent_bounds(struct isl_ctx *ctx,
- struct isl_set *set)
+static struct isl_mat *independent_bounds(struct isl_set *set)
{
int i, j, n;
struct isl_mat *dirs = NULL;
unsigned dim = isl_set_n_dim(set);
- dirs = isl_mat_alloc(ctx, dim, 1+dim);
+ dirs = isl_mat_alloc(set->ctx, dim, 1+dim);
if (!dirs)
goto error;
struct isl_basic_set *bset = set->p[i];
for (j = 0; n < dim && j < bset->n_eq; ++j) {
- f = is_independent_bound(ctx, set, bset->eq[j],
- dirs, n);
+ f = is_independent_bound(set, bset->eq[j], dirs, n);
if (f < 0)
goto error;
if (f)
++n;
}
for (j = 0; n < dim && j < bset->n_ineq; ++j) {
- f = is_independent_bound(ctx, set, bset->ineq[j],
- dirs, n);
+ f = is_independent_bound(set, bset->ineq[j], dirs, n);
if (f < 0)
goto error;
if (f)
dirs->n_row = n;
return dirs;
error:
- isl_mat_free(ctx, dirs);
+ isl_mat_free(dirs);
return NULL;
}
-static struct isl_basic_set *isl_basic_set_set_rational(
- struct isl_basic_set *bset)
+struct isl_basic_set *isl_basic_set_set_rational(struct isl_basic_set *bset)
{
if (!bset)
return NULL;
return NULL;
}
-static struct isl_basic_set *isl_basic_set_add_equality(struct isl_ctx *ctx,
+static struct isl_basic_set *isl_basic_set_add_equality(
struct isl_basic_set *bset, isl_int *c)
{
int i;
- unsigned total;
unsigned dim;
if (ISL_F_ISSET(bset, ISL_BASIC_SET_EMPTY))
return bset;
- isl_assert(ctx, isl_basic_set_n_param(bset) == 0, goto error);
- isl_assert(ctx, bset->n_div == 0, goto error);
+ isl_assert(bset->ctx, isl_basic_set_n_param(bset) == 0, goto error);
+ isl_assert(bset->ctx, bset->n_div == 0, goto error);
dim = isl_basic_set_n_dim(bset);
bset = isl_basic_set_cow(bset);
bset = isl_basic_set_extend(bset, 0, dim, 0, 1, 0);
return NULL;
}
-static struct isl_set *isl_set_add_equality(struct isl_ctx *ctx,
- struct isl_set *set, isl_int *c)
+static struct isl_set *isl_set_add_equality(struct isl_set *set, isl_int *c)
{
int i;
if (!set)
return NULL;
for (i = 0; i < set->n; ++i) {
- set->p[i] = isl_basic_set_add_equality(ctx, set->p[i], c);
+ set->p[i] = isl_basic_set_add_equality(set->p[i], c);
if (!set->p[i])
goto error;
}
isl_seq_clr(T->row[0]+1, dim - 1);
isl_seq_cpy(T->row[1], facet, dim);
isl_seq_cpy(T->row[2], ridge, dim);
- T = isl_mat_right_inverse(set->ctx, T);
+ T = isl_mat_right_inverse(T);
set = isl_set_preimage(set, T);
T = NULL;
if (!set)
}
isl_int_init(num);
isl_int_init(den);
- res = isl_solve_lp((struct isl_basic_map *)lp, 0,
- obj->block.data, set->ctx->one, &num, &den);
+ res = isl_basic_set_solve_lp(lp, 0,
+ obj->block.data, set->ctx->one, &num, &den, NULL);
if (res == isl_lp_ok) {
isl_int_neg(num, num);
isl_seq_combine(facet, num, facet, den, ridge, dim);
return facet;
error:
isl_basic_set_free(lp);
- isl_mat_free(set->ctx, T);
+ isl_mat_free(T);
isl_set_free(set);
return NULL;
}
* The resulting linear combination of the bounding constraints will
* correspond to a facet of the convex hull.
*/
-static struct isl_mat *initial_facet_constraint(struct isl_ctx *ctx,
- struct isl_set *set, struct isl_mat *bounds)
+static struct isl_mat *initial_facet_constraint(struct isl_set *set,
+ struct isl_mat *bounds)
{
struct isl_set *slice = NULL;
struct isl_basic_set *face = NULL;
int i;
unsigned dim = isl_set_n_dim(set);
- isl_assert(ctx, set->n > 0, goto error);
- isl_assert(ctx, bounds->n_row == dim, goto error);
+ isl_assert(set->ctx, set->n > 0, goto error);
+ isl_assert(set->ctx, bounds->n_row == dim, goto error);
while (bounds->n_row > 1) {
slice = isl_set_copy(set);
- slice = isl_set_add_equality(ctx, slice, bounds->row[0]);
+ slice = isl_set_add_equality(slice, bounds->row[0]);
face = isl_set_affine_hull(slice);
if (!face)
goto error;
isl_basic_set_free(face);
break;
}
- m = isl_mat_alloc(ctx, 1 + face->n_eq, 1 + dim);
+ m = isl_mat_alloc(set->ctx, 1 + face->n_eq, 1 + dim);
if (!m)
goto error;
isl_int_set_si(m->row[0][0], 1);
isl_seq_clr(m->row[0]+1, dim);
for (i = 0; i < face->n_eq; ++i)
isl_seq_cpy(m->row[1 + i], face->eq[i], 1 + dim);
- U = isl_mat_right_inverse(ctx, m);
- Q = isl_mat_right_inverse(ctx, isl_mat_copy(ctx, U));
- U = isl_mat_drop_cols(ctx, U, 1 + face->n_eq,
- dim - face->n_eq);
- Q = isl_mat_drop_rows(ctx, Q, 1 + face->n_eq,
- dim - face->n_eq);
- U = isl_mat_drop_cols(ctx, U, 0, 1);
- Q = isl_mat_drop_rows(ctx, Q, 0, 1);
- bounds = isl_mat_product(ctx, bounds, U);
- bounds = isl_mat_product(ctx, bounds, Q);
+ U = isl_mat_right_inverse(m);
+ Q = isl_mat_right_inverse(isl_mat_copy(U));
+ U = isl_mat_drop_cols(U, 1 + face->n_eq, dim - face->n_eq);
+ Q = isl_mat_drop_rows(Q, 1 + face->n_eq, dim - face->n_eq);
+ U = isl_mat_drop_cols(U, 0, 1);
+ Q = isl_mat_drop_rows(Q, 0, 1);
+ bounds = isl_mat_product(bounds, U);
+ bounds = isl_mat_product(bounds, Q);
while (isl_seq_first_non_zero(bounds->row[bounds->n_row-1],
bounds->n_col) == -1) {
bounds->n_row--;
- isl_assert(ctx, bounds->n_row > 1, goto error);
+ isl_assert(set->ctx, bounds->n_row > 1, goto error);
}
if (!wrap_facet(set, bounds->row[0],
bounds->row[bounds->n_row-1]))
return bounds;
error:
isl_basic_set_free(face);
- isl_mat_free(ctx, bounds);
+ isl_mat_free(bounds);
return NULL;
}
isl_int_set_si(m->row[0][0], 1);
isl_seq_clr(m->row[0]+1, dim);
isl_seq_cpy(m->row[1], c, 1+dim);
- U = isl_mat_right_inverse(set->ctx, m);
- Q = isl_mat_right_inverse(set->ctx, isl_mat_copy(set->ctx, U));
- U = isl_mat_drop_cols(set->ctx, U, 1, 1);
- Q = isl_mat_drop_rows(set->ctx, Q, 1, 1);
+ U = isl_mat_right_inverse(m);
+ Q = isl_mat_right_inverse(isl_mat_copy(U));
+ U = isl_mat_drop_cols(U, 1, 1);
+ Q = isl_mat_drop_rows(Q, 1, 1);
set = isl_set_preimage(set, U);
facet = uset_convex_hull_wrap_bounded(set);
facet = isl_basic_set_preimage(facet, Q);
int k;
struct isl_basic_set *facet = NULL;
struct isl_basic_set *hull_facet = NULL;
- unsigned total;
unsigned dim;
isl_assert(set->ctx, set->n > 0, goto error);
for (i = 0; i < hull->n_ineq; ++i) {
facet = compute_facet(set, hull->ineq[i]);
- facet = isl_basic_set_add_equality(facet->ctx, facet, hull->ineq[i]);
+ facet = isl_basic_set_add_equality(facet, hull->ineq[i]);
facet = isl_basic_set_gauss(facet, NULL);
facet = isl_basic_set_normalize_constraints(facet);
hull_facet = isl_basic_set_copy(hull);
- hull_facet = isl_basic_set_add_equality(hull_facet->ctx, hull_facet, hull->ineq[i]);
+ hull_facet = isl_basic_set_add_equality(hull_facet, hull->ineq[i]);
hull_facet = isl_basic_set_gauss(hull_facet, NULL);
hull_facet = isl_basic_set_normalize_constraints(hull_facet);
if (!facet)
* We simply collect the lower and upper bounds of each basic set
* and the biggest of those.
*/
-static struct isl_basic_set *convex_hull_1d(struct isl_ctx *ctx,
- struct isl_set *set)
+static struct isl_basic_set *convex_hull_1d(struct isl_set *set)
{
struct isl_mat *c = NULL;
isl_int *lower = NULL;
set = isl_set_remove_empty_parts(set);
if (!set)
goto error;
- isl_assert(ctx, set->n > 0, goto error);
- c = isl_mat_alloc(ctx, 2, 2);
+ isl_assert(set->ctx, set->n > 0, goto error);
+ c = isl_mat_alloc(set->ctx, 2, 2);
if (!c)
goto error;
if (set->p[0]->n_eq > 0) {
- isl_assert(ctx, set->p[0]->n_eq == 1, goto error);
+ isl_assert(set->ctx, set->p[0]->n_eq == 1, goto error);
lower = c->row[0];
upper = c->row[1];
if (isl_int_is_pos(set->p[0]->eq[0][1])) {
isl_int_clear(a);
isl_int_clear(b);
- hull = isl_basic_set_alloc(ctx, 0, 1, 0, 0, 2);
+ hull = isl_basic_set_alloc(set->ctx, 0, 1, 0, 0, 2);
hull = isl_basic_set_set_rational(hull);
if (!hull)
goto error;
}
hull = isl_basic_set_finalize(hull);
isl_set_free(set);
- isl_mat_free(ctx, c);
+ isl_mat_free(c);
return hull;
error:
isl_set_free(set);
- isl_mat_free(ctx, c);
+ isl_mat_free(c);
return NULL;
}
struct isl_tab *tab;
int bounded;
- tab = isl_tab_from_recession_cone((struct isl_basic_map *)bset);
- bounded = isl_tab_cone_is_bounded(bset->ctx, tab);
- isl_tab_free(bset->ctx, tab);
+ tab = isl_tab_from_recession_cone(bset);
+ bounded = isl_tab_cone_is_bounded(tab);
+ isl_tab_free(tab);
return bounded;
}
goto error;
lin_dim = total - lin->n_eq;
M = isl_mat_sub_alloc(set->ctx, lin->eq, 0, lin->n_eq, 1, total);
- M = isl_mat_left_hermite(set->ctx, M, 0, &U, &Q);
+ M = isl_mat_left_hermite(M, 0, &U, &Q);
if (!M)
goto error;
- isl_mat_free(set->ctx, M);
+ isl_mat_free(M);
isl_basic_set_free(lin);
- Q = isl_mat_drop_rows(set->ctx, Q, Q->n_row - lin_dim, lin_dim);
+ Q = isl_mat_drop_rows(Q, Q->n_row - lin_dim, lin_dim);
- U = isl_mat_lin_to_aff(set->ctx, U);
- Q = isl_mat_lin_to_aff(set->ctx, Q);
+ U = isl_mat_lin_to_aff(U);
+ Q = isl_mat_lin_to_aff(Q);
set = isl_set_preimage(set, U);
set = isl_set_remove_dims(set, total - lin_dim, lin_dim);
static struct isl_vec *valid_direction(
struct isl_basic_set *bset1, struct isl_basic_set *bset2)
{
- struct isl_ctx *ctx = NULL;
struct isl_basic_set *lp;
struct isl_tab *tab;
struct isl_vec *sample = NULL;
if (!bset1 || !bset2)
goto error;
- ctx = bset1->ctx;
lp = valid_direction_lp(isl_basic_set_copy(bset1),
isl_basic_set_copy(bset2));
tab = isl_tab_from_basic_set(lp);
- sample = isl_tab_get_sample_value(ctx, tab);
- isl_tab_free(ctx, tab);
+ sample = isl_tab_get_sample_value(tab);
+ isl_tab_free(tab);
isl_basic_set_free(lp);
if (!sample)
goto error;
d = isl_basic_set_total_dim(bset1);
- dir = isl_vec_alloc(ctx, 1 + d);
+ dir = isl_vec_alloc(bset1->ctx, 1 + d);
if (!dir)
goto error;
isl_seq_clr(dir->block.data + 1, dir->size - 1);
bset1->ctx->one, dir->block.data,
sample->block.data[n++], bset1->ineq[i], 1 + d);
isl_vec_free(sample);
+ isl_seq_normalize(bset1->ctx, dir->block.data + 1, dir->size - 1);
isl_basic_set_free(bset1);
isl_basic_set_free(bset2);
- isl_seq_normalize(dir->block.data + 1, dir->size - 1);
return dir;
error:
isl_vec_free(sample);
static struct isl_basic_set *homogeneous_map(struct isl_basic_set *bset,
struct isl_mat *T)
{
- struct isl_ctx *ctx = NULL;
int k;
if (!bset)
goto error;
- ctx = bset->ctx;
bset = isl_basic_set_extend_constraints(bset, 0, 1);
k = isl_basic_set_alloc_inequality(bset);
if (k < 0)
bset = isl_basic_set_preimage(bset, T);
return bset;
error:
- isl_mat_free(ctx, T);
+ isl_mat_free(T);
isl_basic_set_free(bset);
return NULL;
}
if (!T)
goto error;
isl_seq_cpy(T->row[0], dir->block.data, dir->size);
- T = isl_mat_unimodular_complete(ctx, T, 1);
- T2 = isl_mat_right_inverse(ctx, isl_mat_copy(ctx, T));
+ T = isl_mat_unimodular_complete(T, 1);
+ T2 = isl_mat_right_inverse(isl_mat_copy(T));
- bset1 = homogeneous_map(bset1, isl_mat_copy(ctx, T2));
+ bset1 = homogeneous_map(bset1, isl_mat_copy(T2));
bset2 = homogeneous_map(bset2, T2);
set = isl_set_alloc_dim(isl_basic_set_get_dim(bset1), 2, 0);
set = isl_set_add(set, bset1);
if (!hull)
goto error;
- bounds = independent_bounds(set->ctx, set);
+ bounds = independent_bounds(set);
if (!bounds)
goto error;
isl_assert(set->ctx, bounds->n_row == isl_set_n_dim(set), goto error);
- bounds = initial_facet_constraint(set->ctx, set, bounds);
+ bounds = initial_facet_constraint(set, bounds);
if (!bounds)
goto error;
k = isl_basic_set_alloc_inequality(hull);
dim = isl_set_n_dim(set);
isl_assert(set->ctx, 1 + dim == bounds->n_col, goto error);
isl_seq_cpy(hull->ineq[k], bounds->row[0], bounds->n_col);
- isl_mat_free(set->ctx, bounds);
+ isl_mat_free(bounds);
return hull;
error:
isl_basic_set_free(hull);
- isl_mat_free(set->ctx, bounds);
+ isl_mat_free(bounds);
return NULL;
}
struct max_constraint *c;
uint32_t c_hash;
- c_hash = isl_seq_hash(con + 1, len, isl_hash_init());
+ c_hash = isl_seq_get_hash(con + 1, len);
entry = isl_hash_table_find(ctx, table, c_hash, max_constraint_equal,
con + 1, 0);
if (!entry)
c->ineq = ineq;
return;
}
- c->c = isl_mat_cow(ctx, c->c);
+ c->c = isl_mat_cow(c->c);
isl_int_set(c->c->row[0][0], con[0]);
c->ineq = ineq;
}
struct max_constraint *c;
uint32_t c_hash;
- c_hash = isl_seq_hash(con + 1, len, isl_hash_init());
+ c_hash = isl_seq_get_hash(con + 1, len);
entry = isl_hash_table_find(ctx, table, c_hash, max_constraint_equal,
con + 1, 0);
if (!entry)
for (i = 0; i < min_constraints; ++i) {
struct isl_hash_table_entry *entry;
uint32_t c_hash;
- c_hash = isl_seq_hash(constraints[i].c->row[0] + 1, total,
- isl_hash_init());
+ c_hash = isl_seq_get_hash(constraints[i].c->row[0] + 1, total);
entry = isl_hash_table_find(hull->ctx, table, c_hash,
max_constraint_equal, constraints[i].c->row[0] + 1, 1);
if (!entry)
isl_hash_table_clear(table);
for (i = 0; i < min_constraints; ++i)
- isl_mat_free(hull->ctx, constraints[i].c);
+ isl_mat_free(constraints[i].c);
free(constraints);
free(table);
return hull;
free(table);
if (constraints)
for (i = 0; i < min_constraints; ++i)
- isl_mat_free(hull->ctx, constraints[i].c);
+ isl_mat_free(constraints[i].c);
free(constraints);
return hull;
}
*/
static struct isl_basic_set *uset_convex_hull(struct isl_set *set)
{
- int i;
struct isl_basic_set *convex_hull = NULL;
struct isl_basic_set *lin;
return convex_hull;
}
if (isl_set_n_dim(set) == 1)
- return convex_hull_1d(set->ctx, set);
+ return convex_hull_1d(set);
if (isl_set_is_bounded(set))
return uset_convex_hull_wrap(set);
*/
static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
{
- int i;
struct isl_basic_set *convex_hull = NULL;
if (isl_set_n_dim(set) == 0) {
if (!set)
goto error;
- set = isl_set_normalize(set);
+ set = isl_set_coalesce(set);
if (!set)
goto error;
if (set->n == 1) {
return convex_hull;
}
if (isl_set_n_dim(set) == 1)
- return convex_hull_1d(set->ctx, set);
+ return convex_hull_1d(set);
return uset_convex_hull_wrap(set);
error:
struct isl_ctx *ctx;
unsigned n;
struct isl_hash_table *hull_table;
- struct sh_data_entry p[0];
+ struct sh_data_entry p[1];
};
static void sh_data_free(struct sh_data *data)
isl_hash_table_free(data->ctx, data->hull_table);
for (i = 0; i < data->n; ++i) {
isl_hash_table_free(data->ctx, data->p[i].table);
- isl_tab_free(data->ctx, data->p[i].tab);
+ isl_tab_free(data->p[i].tab);
}
free(data);
}
v.len = len;
v.p = ineq;
- c_hash = isl_seq_hash(ineq + 1, len, isl_hash_init());
+ c_hash = isl_seq_get_hash(ineq + 1, len);
entry = isl_hash_table_find(ctx, table, c_hash, has_ineq, &v, 1);
if (!entry)
return - 1;
int i;
data = isl_calloc(set->ctx, struct sh_data,
- sizeof(struct sh_data) + set->n * sizeof(struct sh_data_entry));
+ sizeof(struct sh_data) +
+ (set->n - 1) * sizeof(struct sh_data_entry));
if (!data)
return NULL;
data->ctx = set->ctx;
isl_int_init(opt);
- res = isl_tab_min(data->ctx, data->p[j].tab, ineq, data->ctx->one,
- &opt, NULL);
+ res = isl_tab_min(data->p[j].tab, ineq, data->ctx->one,
+ &opt, NULL, 0);
if (res == isl_lp_ok && isl_int_is_neg(opt))
isl_int_sub(ineq[0], ineq[0], opt);
v.len = isl_basic_set_total_dim(hull);
v.p = ineq;
- c_hash = isl_seq_hash(ineq + 1, v.len, isl_hash_init());
+ c_hash = isl_seq_get_hash(ineq + 1, v.len);
entry = isl_hash_table_find(hull->ctx, data->hull_table, c_hash,
has_ineq, &v, 0);
struct sh_data *data = NULL;
struct isl_basic_set *hull = NULL;
unsigned n_ineq;
- int i, j;
+ int i;
if (!set)
return NULL;
projects / platform / upstream / isl.git / blobdiff