X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_convex_hull.c;h=dc8ac917a517b4396107f48526965ea278f649f8;hb=63fb8a7f484648c3caa25351c8c94ac2395ec563;hp=8d02b7ccf6ef401bf752c39e259e765bd6db98e2;hpb=d38e528da2fad74f81c98dc6cd5cacd9b6bea98b;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 8d02b7c..dc8ac91 100644
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2009 Katholieke Universiteit Leuven
  *
- * Use of this software is governed by the GNU LGPLv2.1 license
+ * Use of this software is governed by the MIT license
  *
  * Written by Sven Verdoolaege, K.U.Leuven, Departement
  * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
@@ -14,6 +14,7 @@
 #include <isl_mat_private.h>
 #include <isl/set.h>
 #include <isl/seq.h>
+#include <isl_options_private.h>
 #include "isl_equalities.h"
 #include "isl_tab.h"
 
@@ -93,7 +94,7 @@ __isl_give isl_basic_map *isl_basic_map_remove_redundancies(
 	if (bmap->n_ineq <= 1)
 		return bmap;
 
-	tab = isl_tab_from_basic_map(bmap);
+	tab = isl_tab_from_basic_map(bmap, 0);
 	if (isl_tab_detect_implicit_equalities(tab) < 0)
 		goto error;
 	if (isl_tab_detect_redundant(tab) < 0)
@@ -482,7 +483,7 @@ static __isl_give isl_mat *initial_facet_constraint(__isl_keep isl_set *set)
 	int i;
 	unsigned dim = isl_set_n_dim(set);
 	int is_bound;
-	isl_mat *bounds;
+	isl_mat *bounds = NULL;
 
 	isl_assert(set->ctx, set->n > 0, goto error);
 	bounds = isl_mat_alloc(set->ctx, 1, 1 + dim);
@@ -647,8 +648,8 @@ static struct isl_basic_set *extend(struct isl_basic_set *hull,
 		if (!facet || !hull_facet)
 			goto error;
 		hull = isl_basic_set_cow(hull);
-		hull = isl_basic_set_extend_dim(hull,
-			isl_dim_copy(hull->dim), 0, 0, facet->n_ineq);
+		hull = isl_basic_set_extend_space(hull,
+			isl_space_copy(hull->dim), 0, 0, facet->n_ineq);
 		if (!hull)
 			goto error;
 		for (j = 0; j < facet->n_ineq; ++j) {
@@ -810,9 +811,9 @@ static struct isl_basic_set *convex_hull_0d(struct isl_set *set)
 		return NULL;
 
 	if (isl_set_is_empty(set))
-		convex_hull = isl_basic_set_empty(isl_dim_copy(set->dim));
+		convex_hull = isl_basic_set_empty(isl_space_copy(set->dim));
 	else
-		convex_hull = isl_basic_set_universe(isl_dim_copy(set->dim));
+		convex_hull = isl_basic_set_universe(isl_space_copy(set->dim));
 	isl_set_free(set);
 	return convex_hull;
 }
@@ -961,7 +962,7 @@ static struct isl_basic_set *induced_lineality_space(
 		goto error;
 
 	dim = isl_basic_set_total_dim(bset1);
-	lin = isl_basic_set_alloc_dim(isl_basic_set_get_dim(bset1), 0,
+	lin = isl_basic_set_alloc_space(isl_basic_set_get_space(bset1), 0,
 					bset1->n_eq + bset2->n_eq,
 					bset1->n_ineq + bset2->n_ineq);
 	lin = isl_basic_set_set_rational(lin);
@@ -1075,7 +1076,7 @@ error:
 static struct isl_basic_set *valid_direction_lp(
 	struct isl_basic_set *bset1, struct isl_basic_set *bset2)
 {
-	struct isl_dim *dim;
+	isl_space *dim;
 	struct isl_basic_set *lp;
 	unsigned d;
 	int n;
@@ -1086,8 +1087,8 @@ static struct isl_basic_set *valid_direction_lp(
 	d = 1 + isl_basic_set_total_dim(bset1);
 	n = 2 +
 	    2 * bset1->n_eq + bset1->n_ineq + 2 * bset2->n_eq + bset2->n_ineq;
-	dim = isl_dim_set_alloc(bset1->ctx, 0, n);
-	lp = isl_basic_set_alloc_dim(dim, 0, d, n);
+	dim = isl_space_set_alloc(bset1->ctx, 0, n);
+	lp = isl_basic_set_alloc_space(dim, 0, d, n);
 	if (!lp)
 		goto error;
 	for (i = 0; i < n; ++i) {
@@ -1168,7 +1169,7 @@ static struct isl_vec *valid_direction(
 		goto error;
 	lp = valid_direction_lp(isl_basic_set_copy(bset1),
 				isl_basic_set_copy(bset2));
-	tab = isl_tab_from_basic_set(lp);
+	tab = isl_tab_from_basic_set(lp, 0);
 	sample = isl_tab_get_sample_value(tab);
 	isl_tab_free(tab);
 	isl_basic_set_free(lp);
@@ -1322,7 +1323,7 @@ static struct isl_basic_set *convex_hull_pair_pointed(
 
 	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_alloc_space(isl_basic_set_get_space(bset1), 2, 0);
 	set = isl_set_add_basic_set(set, bset1);
 	set = isl_set_add_basic_set(set, bset2);
 	hull = uset_convex_hull(set);
@@ -1395,7 +1396,7 @@ static struct isl_basic_set *convex_hull_pair(struct isl_basic_set *bset1,
 	}
 	if (lin->n_eq < isl_basic_set_total_dim(lin)) {
 		struct isl_set *set;
-		set = isl_set_alloc_dim(isl_basic_set_get_dim(bset1), 2, 0);
+		set = isl_set_alloc_space(isl_basic_set_get_space(bset1), 2, 0);
 		set = isl_set_add_basic_set(set, bset1);
 		set = isl_set_add_basic_set(set, bset2);
 		return modulo_lineality(set, lin);
@@ -1425,7 +1426,7 @@ struct isl_basic_set *isl_basic_set_lineality_space(struct isl_basic_set *bset)
 	isl_assert(bset->ctx, bset->n_div == 0, goto error);
 	dim = isl_basic_set_total_dim(bset);
 
-	lin = isl_basic_set_alloc_dim(isl_basic_set_get_dim(bset), 0, dim, 0);
+	lin = isl_basic_set_alloc_space(isl_basic_set_get_space(bset), 0, dim, 0);
 	if (!lin)
 		goto error;
 	for (i = 0; i < bset->n_eq; ++i) {
@@ -1467,12 +1468,12 @@ static struct isl_basic_set *uset_combined_lineality_space(struct isl_set *set)
 	if (!set)
 		return NULL;
 	if (set->n == 0) {
-		struct isl_dim *dim = isl_set_get_dim(set);
+		isl_space *dim = isl_set_get_space(set);
 		isl_set_free(set);
 		return isl_basic_set_empty(dim);
 	}
 
-	lin = isl_set_alloc_dim(isl_set_get_dim(set), set->n, 0);
+	lin = isl_set_alloc_space(isl_set_get_space(set), set->n, 0);
 	for (i = 0; i < set->n; ++i)
 		lin = isl_set_add_basic_set(lin,
 		    isl_basic_set_lineality_space(isl_basic_set_copy(set->p[i])));
@@ -1670,7 +1671,7 @@ static struct isl_basic_set *common_constraints(struct isl_basic_set *hull,
 	if (isl_hash_table_init(hull->ctx, table, min_constraints))
 		goto error;
 
-	total = isl_dim_total(set->dim);
+	total = isl_space_dim(set->dim, isl_dim_all);
 	for (i = 0; i < set->p[best]->n_ineq; ++i) {
 		constraints[i].c = isl_mat_sub_alloc6(hull->ctx,
 			set->p[best]->ineq + i, 0, 1, 0, 1 + total);
@@ -1767,7 +1768,7 @@ static struct isl_basic_set *proto_hull(struct isl_set *set, int *is_hull)
 		n_ineq += set->p[i]->n_eq;
 		n_ineq += set->p[i]->n_ineq;
 	}
-	hull = isl_basic_set_alloc_dim(isl_dim_copy(set->dim), 0, 0, n_ineq);
+	hull = isl_basic_set_alloc_space(isl_space_copy(set->dim), 0, 0, n_ineq);
 	hull = isl_basic_set_set_rational(hull);
 	if (!hull)
 		return NULL;
@@ -1853,7 +1854,7 @@ static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
 		goto error;
 
 	if (isl_set_n_dim(set) == 0) {
-		convex_hull = isl_basic_set_universe(isl_dim_copy(set->dim));
+		convex_hull = isl_basic_set_universe(isl_space_copy(set->dim));
 		isl_set_free(set);
 		convex_hull = isl_basic_set_set_rational(convex_hull);
 		return convex_hull;
@@ -1866,6 +1867,7 @@ static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
 	if (set->n == 1) {
 		convex_hull = isl_basic_set_copy(set->p[0]);
 		isl_set_free(set);
+		convex_hull = isl_basic_map_remove_redundancies(convex_hull);
 		return convex_hull;
 	}
 	if (isl_set_n_dim(set) == 1)
@@ -2105,18 +2107,20 @@ error:
  * it can be relaxed (by increasing the constant term) to become
  * a bound for that basic set.  In the latter case, the constant
  * term is updated.
+ * Relaxation of the constant term is only allowed if "shift" is set.
+ *
  * Return 1 if "ineq" is a bound
  *	  0 if "ineq" may attain arbitrarily small values on basic set "j"
  *	 -1 if some error occurred
  */
 static int is_bound(struct sh_data *data, struct isl_set *set, int j,
-			isl_int *ineq)
+	isl_int *ineq, int shift)
 {
 	enum isl_lp_result res;
 	isl_int opt;
 
 	if (!data->p[j].tab) {
-		data->p[j].tab = isl_tab_from_basic_set(set->p[j]);
+		data->p[j].tab = isl_tab_from_basic_set(set->p[j], 0);
 		if (!data->p[j].tab)
 			return -1;
 	}
@@ -2125,8 +2129,12 @@ static int is_bound(struct sh_data *data, struct isl_set *set, int j,
 
 	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);
+	if (res == isl_lp_ok && isl_int_is_neg(opt)) {
+		if (shift)
+			isl_int_sub(ineq[0], ineq[0], opt);
+		else
+			res = isl_lp_unbounded;
+	}
 
 	isl_int_clear(opt);
 
@@ -2134,9 +2142,9 @@ static int is_bound(struct sh_data *data, struct isl_set *set, int j,
 	       res == isl_lp_unbounded ? 0 : -1;
 }
 
-/* Check if inequality "ineq" from basic set "i" can be relaxed to
+/* Check if inequality "ineq" from basic set "i" is or can be relaxed to
  * become a bound on the whole set.  If so, add the (relaxed) inequality
- * to "hull".
+ * to "hull".  Relaxation is only allowed if "shift" is set.
  *
  * We first check if "hull" already contains a translate of the inequality.
  * If so, we are done.
@@ -2152,7 +2160,8 @@ static int is_bound(struct sh_data *data, struct isl_set *set, int j,
  * the inequality accordingly.
  */
 static struct isl_basic_set *add_bound(struct isl_basic_set *hull,
-	struct sh_data *data, struct isl_set *set, int i, isl_int *ineq)
+	struct sh_data *data, struct isl_set *set, int i, isl_int *ineq,
+	int shift)
 {
 	uint32_t c_hash;
 	struct ineq_cmp_data v;
@@ -2187,7 +2196,7 @@ static struct isl_basic_set *add_bound(struct isl_basic_set *hull,
 
 	for (j = 0; j < i; ++j) {
 		int bound;
-		bound = is_bound(data, set, j, hull->ineq[k]);
+		bound = is_bound(data, set, j, hull->ineq[k], shift);
 		if (bound < 0)
 			goto error;
 		if (!bound)
@@ -2215,7 +2224,7 @@ static struct isl_basic_set *add_bound(struct isl_basic_set *hull,
 				isl_int_neg(ineq_j[0], ineq_j[0]);
 			continue;
 		}
-		bound = is_bound(data, set, j, hull->ineq[k]);
+		bound = is_bound(data, set, j, hull->ineq[k], shift);
 		if (bound < 0)
 			goto error;
 		if (!bound)
@@ -2238,12 +2247,12 @@ error:
 	return NULL;
 }
 
-/* Check if any inequality from basic set "i" can be relaxed to
+/* Check if any inequality from basic set "i" is or can be relaxed to
  * become a bound on the whole set.  If so, add the (relaxed) inequality
- * to "hull".
+ * to "hull".  Relaxation is only allowed if "shift" is set.
  */
 static struct isl_basic_set *add_bounds(struct isl_basic_set *bset,
-	struct sh_data *data, struct isl_set *set, int i)
+	struct sh_data *data, struct isl_set *set, int i, int shift)
 {
 	int j, k;
 	unsigned dim = isl_basic_set_total_dim(bset);
@@ -2251,18 +2260,21 @@ static struct isl_basic_set *add_bounds(struct isl_basic_set *bset,
 	for (j = 0; j < set->p[i]->n_eq; ++j) {
 		for (k = 0; k < 2; ++k) {
 			isl_seq_neg(set->p[i]->eq[j], set->p[i]->eq[j], 1+dim);
-			bset = add_bound(bset, data, set, i, set->p[i]->eq[j]);
+			bset = add_bound(bset, data, set, i, set->p[i]->eq[j],
+					    shift);
 		}
 	}
 	for (j = 0; j < set->p[i]->n_ineq; ++j)
-		bset = add_bound(bset, data, set, i, set->p[i]->ineq[j]);
+		bset = add_bound(bset, data, set, i, set->p[i]->ineq[j], shift);
 	return bset;
 }
 
 /* Compute a superset of the convex hull of set that is described
- * by only translates of the constraints in the constituents of set.
+ * by only (translates of) the constraints in the constituents of set.
+ * Translation is only allowed if "shift" is set.
  */
-static struct isl_basic_set *uset_simple_hull(struct isl_set *set)
+static __isl_give isl_basic_set *uset_simple_hull(__isl_take isl_set *set,
+	int shift)
 {
 	struct sh_data *data = NULL;
 	struct isl_basic_set *hull = NULL;
@@ -2279,7 +2291,7 @@ static struct isl_basic_set *uset_simple_hull(struct isl_set *set)
 		n_ineq += 2 * set->p[i]->n_eq + set->p[i]->n_ineq;
 	}
 
-	hull = isl_basic_set_alloc_dim(isl_dim_copy(set->dim), 0, 0, n_ineq);
+	hull = isl_basic_set_alloc_space(isl_space_copy(set->dim), 0, 0, n_ineq);
 	if (!hull)
 		goto error;
 
@@ -2288,7 +2300,7 @@ static struct isl_basic_set *uset_simple_hull(struct isl_set *set)
 		goto error;
 
 	for (i = 0; i < set->n; ++i)
-		hull = add_bounds(hull, data, set, i);
+		hull = add_bounds(hull, data, set, i, shift);
 
 	sh_data_free(data);
 	isl_set_free(set);
@@ -2302,9 +2314,11 @@ error:
 }
 
 /* Compute a superset of the convex hull of map that is described
- * by only translates of the constraints in the constituents of map.
+ * by only (translates of) the constraints in the constituents of map.
+ * Translation is only allowed if "shift" is set.
  */
-struct isl_basic_map *isl_map_simple_hull(struct isl_map *map)
+static __isl_give isl_basic_map *map_simple_hull(__isl_take isl_map *map,
+	int shift)
 {
 	struct isl_set *set = NULL;
 	struct isl_basic_map *model = NULL;
@@ -2328,28 +2342,54 @@ struct isl_basic_map *isl_map_simple_hull(struct isl_map *map)
 	map = isl_map_detect_equalities(map);
 	affine_hull = isl_map_affine_hull(isl_map_copy(map));
 	map = isl_map_align_divs(map);
-	model = isl_basic_map_copy(map->p[0]);
+	model = map ? isl_basic_map_copy(map->p[0]) : NULL;
 
 	set = isl_map_underlying_set(map);
 
-	bset = uset_simple_hull(set);
+	bset = uset_simple_hull(set, shift);
 
 	hull = isl_basic_map_overlying_set(bset, model);
 
 	hull = isl_basic_map_intersect(hull, affine_hull);
 	hull = isl_basic_map_remove_redundancies(hull);
+
+	if (!hull)
+		return NULL;
 	ISL_F_SET(hull, ISL_BASIC_MAP_NO_IMPLICIT);
 	ISL_F_SET(hull, ISL_BASIC_MAP_ALL_EQUALITIES);
 
 	return hull;
 }
 
+/* Compute a superset of the convex hull of map that is described
+ * by only translates of the constraints in the constituents of map.
+ */
+__isl_give isl_basic_map *isl_map_simple_hull(__isl_take isl_map *map)
+{
+	return map_simple_hull(map, 1);
+}
+
 struct isl_basic_set *isl_set_simple_hull(struct isl_set *set)
 {
 	return (struct isl_basic_set *)
 		isl_map_simple_hull((struct isl_map *)set);
 }
 
+/* Compute a superset of the convex hull of map that is described
+ * by only the constraints in the constituents of map.
+ */
+__isl_give isl_basic_map *isl_map_unshifted_simple_hull(
+	__isl_take isl_map *map)
+{
+	return map_simple_hull(map, 0);
+}
+
+__isl_give isl_basic_set *isl_set_unshifted_simple_hull(
+	__isl_take isl_set *set)
+{
+	return isl_map_unshifted_simple_hull(set);
+}
+
 /* Given a set "set", return parametric bounds on the dimension "dim".
  */
 static struct isl_basic_set *set_bounds(struct isl_set *set, int dim)