X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_affine_hull.c;h=ffb775b89415268c79fa63316beb051411e7b55c;hb=d17afdd1f5e49c0c5dcf6a6e0687330dcdc8e6bf;hp=6bdd27977d5858a1b9a8f439c67ba356b5be49a6;hpb=4cbd5b883a65e395a3091507751b199385ddd37b;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_affine_hull.c b/isl_affine_hull.c
index 6bdd279..ffb775b 100644
--- a/isl_affine_hull.c
+++ b/isl_affine_hull.c
@@ -1,12 +1,22 @@
-#include "isl_ctx.h"
-#include "isl_seq.h"
-#include "isl_set.h"
-#include "isl_lp.h"
-#include "isl_map.h"
-#include "isl_map_private.h"
+/*
+ * Copyright 2008-2009 Katholieke Universiteit Leuven
+ *
+ * Use of this software is governed by the GNU LGPLv2.1 license
+ *
+ * Written by Sven Verdoolaege, K.U.Leuven, Departement
+ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
+ */
+
+#include <isl_ctx_private.h>
+#include <isl_map_private.h>
+#include <isl/seq.h>
+#include <isl/set.h>
+#include <isl/lp.h>
+#include <isl/map.h>
 #include "isl_equalities.h"
 #include "isl_sample.h"
 #include "isl_tab.h"
+#include <isl_mat_private.h>
 
 struct isl_basic_map *isl_basic_map_implicit_equalities(
 						struct isl_basic_map *bmap)
@@ -25,12 +35,17 @@ struct isl_basic_map *isl_basic_map_implicit_equalities(
 		return bmap;
 
 	tab = isl_tab_from_basic_map(bmap);
-	tab = isl_tab_detect_implicit_equalities(tab);
+	if (isl_tab_detect_implicit_equalities(tab) < 0)
+		goto error;
 	bmap = isl_basic_map_update_from_tab(bmap, tab);
 	isl_tab_free(tab);
 	bmap = isl_basic_map_gauss(bmap, NULL);
 	ISL_F_SET(bmap, ISL_BASIC_MAP_NO_IMPLICIT);
 	return bmap;
+error:
+	isl_tab_free(tab);
+	isl_basic_map_free(bmap);
+	return NULL;
 }
 
 struct isl_basic_set *isl_basic_set_implicit_equalities(
@@ -192,6 +207,9 @@ static struct isl_basic_set *affine_hull(
 	int col;
 	int row;
 
+	if (!bset1 || !bset2)
+		goto error;
+
 	total = 1 + isl_basic_set_n_dim(bset1);
 
 	row = 0;
@@ -212,12 +230,13 @@ static struct isl_basic_set *affine_hull(
 				--row;
 		}
 	}
-	isl_basic_set_free(bset2);
 	isl_assert(bset1->ctx, row == bset1->n_eq, goto error);
+	isl_basic_set_free(bset2);
 	bset1 = isl_basic_set_normalize_constraints(bset1);
 	return bset1;
 error:
 	isl_basic_set_free(bset1);
+	isl_basic_set_free(bset2);
 	return NULL;
 }
 
@@ -242,7 +261,6 @@ static struct isl_vec *outside_point(struct isl_tab *tab, isl_int *eq, int up)
 	struct isl_vec *sample = NULL;
 	struct isl_tab_undo *snap;
 	unsigned dim;
-	int k;
 
 	if (!tab)
 		return NULL;
@@ -278,7 +296,7 @@ static struct isl_vec *outside_point(struct isl_tab *tab, isl_int *eq, int up)
 	if (!up)
 		isl_seq_neg(eq, eq, 1 + dim);
 
-	if (isl_tab_rollback(tab, snap) < 0)
+	if (sample && isl_tab_rollback(tab, snap) < 0)
 		goto error;
 
 	return sample;
@@ -309,6 +327,32 @@ error:
 	return NULL;
 }
 
+__isl_give isl_set *isl_set_recession_cone(__isl_take isl_set *set)
+{
+	int i;
+
+	if (!set)
+		return NULL;
+	if (set->n == 0)
+		return set;
+
+	set = isl_set_remove_divs(set);
+	set = isl_set_cow(set);
+	if (!set)
+		return NULL;
+
+	for (i = 0; i < set->n; ++i) {
+		set->p[i] = isl_basic_set_recession_cone(set->p[i]);
+		if (!set->p[i])
+			goto error;
+	}
+
+	return set;
+error:
+	isl_set_free(set);
+	return NULL;
+}
+
 /* Extend an initial (under-)approximation of the affine hull of basic
  * set represented by the tableau "tab"
  * by looking for points that do not satisfy one of the equalities
@@ -321,7 +365,7 @@ error:
 static struct isl_basic_set *extend_affine_hull(struct isl_tab *tab,
 	struct isl_basic_set *hull)
 {
-	int i, j, k;
+	int i, j;
 	unsigned dim;
 
 	if (!tab || !hull)
@@ -349,8 +393,7 @@ static struct isl_basic_set *extend_affine_hull(struct isl_tab *tab,
 				break;
 			isl_vec_free(sample);
 
-			tab = isl_tab_add_eq(tab, hull->eq[j]);
-			if (!tab)
+			if (isl_tab_add_eq(tab, hull->eq[j]) < 0)
 				goto error;
 		}
 		if (j == hull->n_eq)
@@ -361,6 +404,8 @@ static struct isl_basic_set *extend_affine_hull(struct isl_tab *tab,
 			goto error;
 		point = isl_basic_set_from_vec(sample);
 		hull = affine_hull(hull, point);
+		if (!hull)
+			return NULL;
 	}
 
 	return hull;
@@ -372,16 +417,19 @@ error:
 /* Drop all constraints in bset that involve any of the dimensions
  * first to first+n-1.
  */
-static struct isl_basic_set *drop_constraints_involving
-	(struct isl_basic_set *bset, unsigned first, unsigned n)
+__isl_give isl_basic_set *isl_basic_set_drop_constraints_involving(
+	__isl_take isl_basic_set *bset, unsigned first, unsigned n)
 {
 	int i;
 
-	if (!bset)
-		return NULL;
+	if (n == 0)
+		return bset;
 
 	bset = isl_basic_set_cow(bset);
 
+	if (!bset)
+		return NULL;
+
 	for (i = bset->n_eq - 1; i >= 0; --i) {
 		if (isl_seq_first_non_zero(bset->eq[i] + 1 + first, n) == -1)
 			continue;
@@ -413,7 +461,7 @@ static struct isl_basic_set *uset_affine_hull_bounded(struct isl_basic_set *bset
 	struct isl_tab *tab = NULL;
 	unsigned dim;
 
-	if (isl_basic_set_fast_is_empty(bset))
+	if (isl_basic_set_plain_is_empty(bset))
 		return bset;
 
 	dim = isl_basic_set_n_dim(bset);
@@ -476,7 +524,7 @@ error:
 }
 
 /* Given an unbounded tableau and an integer point satisfying the tableau,
- * construct an intial affine hull containing the recession cone
+ * construct an initial affine hull containing the recession cone
  * shifted to the given point.
  *
  * The unbounded directions are taken from the last rows of the basis,
@@ -528,7 +576,7 @@ error:
  * isl_tab_set_initial_basis_with_cone will add some additional
  * constraints to the tableau that have to be removed again.
  * In this case, we therefore rollback to the state before
- * any constraints were added and then add the eqaulities back in.
+ * any constraints were added and then add the equalities back in.
  */
 struct isl_tab *isl_tab_detect_equalities(struct isl_tab *tab,
 	struct isl_tab *tab_cone)
@@ -591,7 +639,8 @@ struct isl_tab *isl_tab_detect_equalities(struct isl_tab *tab,
 	if (hull->n_eq > tab->n_zero) {
 		for (j = 0; j < hull->n_eq; ++j) {
 			isl_seq_normalize(tab->mat->ctx, hull->eq[j], 1 + tab->n_var);
-			tab = isl_tab_add_eq(tab, hull->eq[j]);
+			if (isl_tab_add_eq(tab, hull->eq[j]) < 0)
+				goto error;
 		}
 	}
 
@@ -648,7 +697,7 @@ static struct isl_basic_set *affine_hull_with_cone(struct isl_basic_set *bset,
 	total = isl_basic_set_total_dim(cone);
 	cone_dim = total - cone->n_eq;
 
-	M = isl_mat_sub_alloc(bset->ctx, cone->eq, 0, cone->n_eq, 1, total);
+	M = isl_mat_sub_alloc6(bset->ctx, cone->eq, 0, cone->n_eq, 1, total);
 	M = isl_mat_left_hermite(M, 0, &U, &Q);
 	if (!M)
 		goto error;
@@ -657,7 +706,8 @@ static struct isl_basic_set *affine_hull_with_cone(struct isl_basic_set *bset,
 	U = isl_mat_lin_to_aff(U);
 	bset = isl_basic_set_preimage(bset, isl_mat_copy(U));
 
-	bset = drop_constraints_involving(bset, total - cone_dim, cone_dim);
+	bset = isl_basic_set_drop_constraints_involving(bset, total - cone_dim,
+							cone_dim);
 	bset = isl_basic_set_drop_dims(bset, total - cone_dim, cone_dim);
 
 	Q = isl_mat_lin_to_aff(Q);
@@ -678,8 +728,11 @@ static struct isl_basic_set *affine_hull_with_cone(struct isl_basic_set *bset,
 		else
 			isl_mat_free(U);
 		hull = isl_basic_set_preimage(hull, Q);
-		isl_vec_free(hull->sample);
-		hull->sample = sample;
+		if (hull) {
+			isl_vec_free(hull->sample);
+			hull->sample = sample;
+		} else
+			isl_vec_free(sample);
 	}
 
 	isl_basic_set_free(cone);
@@ -711,7 +764,7 @@ static struct isl_basic_set *uset_affine_hull(struct isl_basic_set *bset)
 {
 	struct isl_basic_set *cone;
 
-	if (isl_basic_set_fast_is_empty(bset))
+	if (isl_basic_set_plain_is_empty(bset))
 		return bset;
 
 	cone = isl_basic_set_recession_cone(isl_basic_set_copy(bset));
@@ -768,17 +821,21 @@ static struct isl_basic_set *equalities_in_underlying_set(
 	if (!T2)
 		return hull;
 
-	if (!hull)
+	if (!hull) {
 		isl_mat_free(T1);
-	else {
+		isl_mat_free(T2);
+	} else {
 		struct isl_vec *sample = isl_vec_copy(hull->sample);
 		if (sample && sample->size > 0)
 			sample = isl_mat_vec_product(T1, sample);
 		else
 			isl_mat_free(T1);
 		hull = isl_basic_set_preimage(hull, T2);
-		isl_vec_free(hull->sample);
-		hull->sample = sample;
+		if (hull) {
+			isl_vec_free(hull->sample);
+			hull->sample = sample;
+		} else
+			isl_vec_free(sample);
 	}
 
 	return hull;
@@ -844,7 +901,8 @@ __isl_give isl_basic_set *isl_basic_set_detect_equalities(
 		isl_basic_map_detect_equalities((isl_basic_map *)bset);
 }
 
-struct isl_map *isl_map_detect_equalities(struct isl_map *map)
+__isl_give isl_map *isl_map_inline_foreach_basic_map(__isl_take isl_map *map,
+	__isl_give isl_basic_map *(*fn)(__isl_take isl_basic_map *bmap))
 {
 	struct isl_basic_map *bmap;
 	int i;
@@ -854,7 +912,7 @@ struct isl_map *isl_map_detect_equalities(struct isl_map *map)
 
 	for (i = 0; i < map->n; ++i) {
 		bmap = isl_basic_map_copy(map->p[i]);
-		bmap = isl_basic_map_detect_equalities(bmap);
+		bmap = fn(bmap);
 		if (!bmap)
 			goto error;
 		isl_basic_map_free(map->p[i]);
@@ -867,6 +925,12 @@ error:
 	return NULL;
 }
 
+__isl_give isl_map *isl_map_detect_equalities(__isl_take isl_map *map)
+{
+	return isl_map_inline_foreach_basic_map(map,
+					    &isl_basic_map_detect_equalities);
+}
+
 __isl_give isl_set *isl_set_detect_equalities(__isl_take isl_set *set)
 {
 	return (isl_set *)isl_map_detect_equalities((isl_map *)set);
@@ -880,7 +944,9 @@ struct isl_basic_map *isl_basic_map_affine_hull(struct isl_basic_map *bmap)
 {
 	bmap = isl_basic_map_detect_equalities(bmap);
 	bmap = isl_basic_map_cow(bmap);
-	isl_basic_map_free_inequality(bmap, bmap->n_ineq);
+	if (bmap)
+		isl_basic_map_free_inequality(bmap, bmap->n_ineq);
+	bmap = isl_basic_map_finalize(bmap);
 	return bmap;
 }
 
@@ -897,6 +963,9 @@ struct isl_basic_map *isl_map_affine_hull(struct isl_map *map)
 	struct isl_basic_map *hull = NULL;
 	struct isl_set *set;
 
+	map = isl_map_detect_equalities(map);
+	map = isl_map_align_divs(map);
+
 	if (!map)
 		return NULL;
 
@@ -906,10 +975,6 @@ struct isl_basic_map *isl_map_affine_hull(struct isl_map *map)
 		return hull;
 	}
 
-	map = isl_map_detect_equalities(map);
-	map = isl_map_align_divs(map);
-	if (!map)
-		return NULL;
 	model = isl_basic_map_copy(map->p[0]);
 	set = isl_map_underlying_set(map);
 	set = isl_set_cow(set);