X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_map_subtract.c;h=2c958c766f9e801469503df13f95fa4d976a9edb;hb=3d9f65131f9da197bca3a30eccf3a70107f50f03;hp=650c196bc30dd16f5889f88c4c83ec2003604197;hpb=fe5114da93acf44fcb1a5bc9845dc3fa2784ce8f;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_map_subtract.c b/isl_map_subtract.c
index 650c196..2c958c7 100644
--- a/isl_map_subtract.c
+++ b/isl_map_subtract.c
@@ -1,54 +1,96 @@
 /*
  * 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
  */
 
-#include "isl_seq.h"
-#include "isl_set.h"
-#include "isl_map.h"
-#include "isl_map_private.h"
+#include <isl_map_private.h>
+#include <isl/seq.h>
+#include <isl/set.h>
+#include <isl/map.h>
 #include "isl_tab.h"
+#include <isl_point_private.h>
+
+/* Expand the constraint "c" into "v".  The initial "dim" dimensions
+ * are the same, but "v" may have more divs than "c" and the divs of "c"
+ * may appear in different positions in "v".
+ * The number of divs in "c" is given by "n_div" and the mapping
+ * of divs in "c" to divs in "v" is given by "div_map".
+ *
+ * Although it shouldn't happen in practice, it is theoretically
+ * possible that two or more divs in "c" are mapped to the same div in "v".
+ * These divs are then necessarily the same, so we simply add their
+ * coefficients.
+ */
+static void expand_constraint(isl_vec *v, unsigned dim,
+	isl_int *c, int *div_map, unsigned n_div)
+{
+	int i;
+
+	isl_seq_cpy(v->el, c, 1 + dim);
+	isl_seq_clr(v->el + 1 + dim, v->size - (1 + dim));
+
+	for (i = 0; i < n_div; ++i) {
+		int pos = 1 + dim + div_map[i];
+		isl_int_add(v->el[pos], v->el[pos], c[1 + dim + i]);
+	}
+}
 
 /* Add all constraints of bmap to tab.  The equalities of bmap
  * are added as a pair of inequalities.
  */
 static int tab_add_constraints(struct isl_tab *tab,
-	__isl_keep isl_basic_map *bmap)
+	__isl_keep isl_basic_map *bmap, int *div_map)
 {
 	int i;
-	unsigned total;
+	unsigned dim;
+	unsigned tab_total;
+	unsigned bmap_total;
+	isl_vec *v;
 
 	if (!tab || !bmap)
 		return -1;
 
-	total = isl_basic_map_total_dim(bmap);
+	tab_total = isl_basic_map_total_dim(tab->bmap);
+	bmap_total = isl_basic_map_total_dim(bmap);
+	dim = isl_space_dim(tab->bmap->dim, isl_dim_all);
 
 	if (isl_tab_extend_cons(tab, 2 * bmap->n_eq + bmap->n_ineq) < 0)
 		return -1;
 
+	v = isl_vec_alloc(bmap->ctx, 1 + tab_total);
+	if (!v)
+		return -1;
+
 	for (i = 0; i < bmap->n_eq; ++i) {
-		if (isl_tab_add_ineq(tab, bmap->eq[i]) < 0)
-			return -1;
-		isl_seq_neg(bmap->eq[i], bmap->eq[i], 1 + total);
-		if (isl_tab_add_ineq(tab, bmap->eq[i]) < 0)
-			return -1;
-		isl_seq_neg(bmap->eq[i], bmap->eq[i], 1 + total);
+		expand_constraint(v, dim, bmap->eq[i], div_map, bmap->n_div);
+		if (isl_tab_add_ineq(tab, v->el) < 0)
+			goto error;
+		isl_seq_neg(bmap->eq[i], bmap->eq[i], 1 + bmap_total);
+		expand_constraint(v, dim, bmap->eq[i], div_map, bmap->n_div);
+		if (isl_tab_add_ineq(tab, v->el) < 0)
+			goto error;
+		isl_seq_neg(bmap->eq[i], bmap->eq[i], 1 + bmap_total);
 		if (tab->empty)
-			return 0;
+			break;
 	}
 
 	for (i = 0; i < bmap->n_ineq; ++i) {
-		if (isl_tab_add_ineq(tab, bmap->ineq[i]) < 0)
-			return -1;
+		expand_constraint(v, dim, bmap->ineq[i], div_map, bmap->n_div);
+		if (isl_tab_add_ineq(tab, v->el) < 0)
+			goto error;
 		if (tab->empty)
-			return 0;
+			break;
 	}
 
+	isl_vec_free(v);
 	return 0;
+error:
+	isl_vec_free(v);
+	return -1;
 }
 
 /* Add a specific constraint of bmap (or its opposite) to tab.
@@ -57,42 +99,109 @@ static int tab_add_constraints(struct isl_tab *tab,
  * that is equal to the equality, and once for its negation.
  */
 static int tab_add_constraint(struct isl_tab *tab,
-	__isl_keep isl_basic_map *bmap, int c, int oppose)
+	__isl_keep isl_basic_map *bmap, int *div_map, int c, int oppose)
 {
-	unsigned total;
+	unsigned dim;
+	unsigned tab_total;
+	unsigned bmap_total;
+	isl_vec *v;
 	int r;
 
 	if (!tab || !bmap)
 		return -1;
 
-	total = isl_basic_map_total_dim(bmap);
+	tab_total = isl_basic_map_total_dim(tab->bmap);
+	bmap_total = isl_basic_map_total_dim(bmap);
+	dim = isl_space_dim(tab->bmap->dim, isl_dim_all);
+
+	v = isl_vec_alloc(bmap->ctx, 1 + tab_total);
+	if (!v)
+		return -1;
 
 	if (c < 2 * bmap->n_eq) {
 		if ((c % 2) != oppose)
-			isl_seq_neg(bmap->eq[c/2], bmap->eq[c/2], 1 + total);
+			isl_seq_neg(bmap->eq[c/2], bmap->eq[c/2],
+					1 + bmap_total);
 		if (oppose)
 			isl_int_sub_ui(bmap->eq[c/2][0], bmap->eq[c/2][0], 1);
-		r = isl_tab_add_ineq(tab, bmap->eq[c/2]);
+		expand_constraint(v, dim, bmap->eq[c/2], div_map, bmap->n_div);
+		r = isl_tab_add_ineq(tab, v->el);
 		if (oppose)
 			isl_int_add_ui(bmap->eq[c/2][0], bmap->eq[c/2][0], 1);
 		if ((c % 2) != oppose)
-			isl_seq_neg(bmap->eq[c/2], bmap->eq[c/2], 1 + total);
+			isl_seq_neg(bmap->eq[c/2], bmap->eq[c/2],
+					1 + bmap_total);
 	} else {
 		c -= 2 * bmap->n_eq;
 		if (oppose) {
-			isl_seq_neg(bmap->ineq[c], bmap->ineq[c], 1 + total);
+			isl_seq_neg(bmap->ineq[c], bmap->ineq[c],
+					1 + bmap_total);
 			isl_int_sub_ui(bmap->ineq[c][0], bmap->ineq[c][0], 1);
 		}
-		r = isl_tab_add_ineq(tab, bmap->ineq[c]);
+		expand_constraint(v, dim, bmap->ineq[c], div_map, bmap->n_div);
+		r = isl_tab_add_ineq(tab, v->el);
 		if (oppose) {
 			isl_int_add_ui(bmap->ineq[c][0], bmap->ineq[c][0], 1);
-			isl_seq_neg(bmap->ineq[c], bmap->ineq[c], 1 + total);
+			isl_seq_neg(bmap->ineq[c], bmap->ineq[c],
+					1 + bmap_total);
 		}
 	}
 
+	isl_vec_free(v);
 	return r;
 }
 
+static int tab_add_divs(struct isl_tab *tab, __isl_keep isl_basic_map *bmap,
+	int **div_map)
+{
+	int i, j;
+	struct isl_vec *vec;
+	unsigned total;
+	unsigned dim;
+
+	if (!bmap)
+		return -1;
+	if (!bmap->n_div)
+		return 0;
+
+	if (!*div_map)
+		*div_map = isl_alloc_array(bmap->ctx, int, bmap->n_div);
+	if (!*div_map)
+		return -1;
+
+	total = isl_basic_map_total_dim(tab->bmap);
+	dim = total - tab->bmap->n_div;
+	vec = isl_vec_alloc(bmap->ctx, 2 + total + bmap->n_div);
+	if (!vec)
+		return -1;
+
+	for (i = 0; i < bmap->n_div; ++i) {
+		isl_seq_cpy(vec->el, bmap->div[i], 2 + dim);
+		isl_seq_clr(vec->el + 2 + dim, tab->bmap->n_div);
+		for (j = 0; j < i; ++j)
+			isl_int_set(vec->el[2 + dim + (*div_map)[j]],
+					bmap->div[i][2 + dim + j]);
+		for (j = 0; j < tab->bmap->n_div; ++j)
+			if (isl_seq_eq(tab->bmap->div[j],
+					vec->el, 2 + dim + tab->bmap->n_div))
+				break;
+		(*div_map)[i] = j;
+		if (j == tab->bmap->n_div) {
+			vec->size = 2 + dim + tab->bmap->n_div;
+			if (isl_tab_add_div(tab, vec, NULL, NULL) < 0)
+				goto error;
+		}
+	}
+
+	isl_vec_free(vec);
+
+	return 0;
+error:
+	isl_vec_free(vec);
+
+	return -1;
+}
+
 /* Freeze all constraints of tableau tab.
  */
 static int tab_freeze_constraints(struct isl_tab *tab)
@@ -110,7 +219,8 @@ static int tab_freeze_constraints(struct isl_tab *tab)
  * Put the indices of the redundant constraints in index
  * and return the number of redundant constraints.
  */
-static int n_non_redundant(struct isl_tab *tab, int offset, int **index)
+static int n_non_redundant(isl_ctx *ctx, struct isl_tab *tab,
+	int offset, int **index)
 {
 	int i, n;
 	int n_test = tab->n_con - offset;
@@ -119,7 +229,7 @@ static int n_non_redundant(struct isl_tab *tab, int offset, int **index)
 		return -1;
 
 	if (!*index)
-		*index = isl_alloc_array(tab->mat->ctx, int, n_test);
+		*index = isl_alloc_array(ctx, int, n_test);
 	if (!*index)
 		return -1;
 
@@ -152,12 +262,12 @@ struct isl_diff_collector {
  * a negative value is treated as an error, but the calling
  * function can interpret the results based on the state of dc.
  *
- * Assumes that both bmap and map have known divs.
+ * Assumes that map has known divs.
  *
  * The difference is computed by a backtracking algorithm.
  * Each level corresponds to a basic map in "map".
  * When a node in entered for the first time, we check
- * if the corresonding basic map intersect the current piece
+ * if the corresonding basic map intersects the current piece
  * of "bmap".  If not, we move to the next level.
  * Otherwise, we split the current piece into as many
  * pieces as there are non-redundant constraints of the current
@@ -165,7 +275,7 @@ struct isl_diff_collector {
  * handled by a child of the current node.
  * In particular, if there are n non-redundant constraints,
  * then for each 0 <= i < n, a piece is cut off by adding
- * constraints 0 <= j < i and adding the opposite of constrain i.
+ * constraints 0 <= j < i and adding the opposite of constraint i.
  * If there are no non-redundant constraints, meaning that the current
  * piece is a subset of the current basic map, then we simply backtrack.
  *
@@ -182,11 +292,13 @@ static int basic_map_collect_diff(__isl_take isl_basic_map *bmap,
 	int level;
 	int init;
 	int empty;
+	isl_ctx *ctx;
 	struct isl_tab *tab = NULL;
 	struct isl_tab_undo **snap = NULL;
 	int *k = NULL;
 	int *n = NULL;
 	int **index = NULL;
+	int **div_map = NULL;
 
 	empty = isl_basic_map_is_empty(bmap);
 	if (empty) {
@@ -201,26 +313,20 @@ static int basic_map_collect_diff(__isl_take isl_basic_map *bmap,
 	if (!bmap || !map)
 		goto error;
 
+	ctx = map->ctx;
 	snap = isl_alloc_array(map->ctx, struct isl_tab_undo *, map->n);
 	k = isl_alloc_array(map->ctx, int, map->n);
 	n = isl_alloc_array(map->ctx, int, map->n);
 	index = isl_calloc_array(map->ctx, int *, map->n);
-	if (!snap || !k || !n || !index)
+	div_map = isl_calloc_array(map->ctx, int *, map->n);
+	if (!snap || !k || !n || !index || !div_map)
 		goto error;
 
-	for (i = 0; i < map->n; ++i) {
-		bmap = isl_basic_map_align_divs(bmap, map->p[i]);
-		if (!bmap)
-			goto error;
-	}
-	for (i = 0; i < map->n; ++i) {
-		map->p[i] = isl_basic_map_align_divs(map->p[i], bmap);
-		if (!map->p[i])
-			goto error;
-	}
+	bmap = isl_basic_map_order_divs(bmap);
+	map = isl_map_order_divs(map);
 
-	tab = isl_tab_from_basic_map(bmap);
-	if (isl_tab_track_bmap(tab, isl_basic_map_copy(bmap)) < 0)
+	tab = isl_tab_from_basic_map(bmap, 1);
+	if (!tab)
 		goto error;
 
 	modified = 0;
@@ -253,22 +359,30 @@ static int basic_map_collect_diff(__isl_take isl_basic_map *bmap,
 			continue;
 		}
 		if (init) {
-			int offset = tab->n_con;
+			int offset;
+			struct isl_tab_undo *snap2;
+			snap2 = isl_tab_snap(tab);
+			if (tab_add_divs(tab, map->p[level],
+					 &div_map[level]) < 0)
+				goto error;
+			offset = tab->n_con;
 			snap[level] = isl_tab_snap(tab);
 			if (tab_freeze_constraints(tab) < 0)
 				goto error;
-			if (tab_add_constraints(tab, map->p[level]) < 0)
+			if (tab_add_constraints(tab, map->p[level],
+						div_map[level]) < 0)
 				goto error;
 			k[level] = 0;
 			n[level] = 0;
 			if (tab->empty) {
-				if (isl_tab_rollback(tab, snap[level]) < 0)
+				if (isl_tab_rollback(tab, snap2) < 0)
 					goto error;
 				level++;
 				continue;
 			}
 			modified = 1;
-			n[level] = n_non_redundant(tab, offset, &index[level]);
+			n[level] = n_non_redundant(ctx, tab, offset,
+						    &index[level]);
 			if (n[level] < 0)
 				goto error;
 			if (n[level] == 0) {
@@ -279,7 +393,7 @@ static int basic_map_collect_diff(__isl_take isl_basic_map *bmap,
 			if (isl_tab_rollback(tab, snap[level]) < 0)
 				goto error;
 			if (tab_add_constraint(tab, map->p[level],
-						index[level][0], 1) < 0)
+					div_map[level], index[level][0], 1) < 0)
 				goto error;
 			level++;
 			continue;
@@ -291,11 +405,13 @@ static int basic_map_collect_diff(__isl_take isl_basic_map *bmap,
 			if (isl_tab_rollback(tab, snap[level]) < 0)
 				goto error;
 			if (tab_add_constraint(tab, map->p[level],
+						div_map[level],
 						index[level][k[level]], 0) < 0)
 				goto error;
 			snap[level] = isl_tab_snap(tab);
 			k[level]++;
 			if (tab_add_constraint(tab, map->p[level],
+						div_map[level],
 						index[level][k[level]], 1) < 0)
 				goto error;
 			level++;
@@ -311,6 +427,9 @@ static int basic_map_collect_diff(__isl_take isl_basic_map *bmap,
 	for (i = 0; index && i < map->n; ++i)
 		free(index[i]);
 	free(index);
+	for (i = 0; div_map && i < map->n; ++i)
+		free(div_map[i]);
+	free(div_map);
 
 	isl_basic_map_free(bmap);
 	isl_map_free(map);
@@ -324,6 +443,9 @@ error:
 	for (i = 0; index && i < map->n; ++i)
 		free(index[i]);
 	free(index);
+	for (i = 0; div_map && i < map->n; ++i)
+		free(div_map[i]);
+	free(div_map);
 	isl_basic_map_free(bmap);
 	isl_map_free(map);
 	return -1;
@@ -369,7 +491,8 @@ static __isl_give isl_map *basic_map_subtract(__isl_take isl_basic_map *bmap,
 /* Return the set difference between map1 and map2.
  * (U_i A_i) \ (U_j B_j) is computed as U_i (A_i \ (U_j B_j))
  */
-struct isl_map *isl_map_subtract(struct isl_map *map1, struct isl_map *map2)
+static __isl_give isl_map *map_subtract( __isl_take isl_map *map1,
+	__isl_take isl_map *map2)
 {
 	int i;
 	struct isl_map *diff;
@@ -377,7 +500,7 @@ struct isl_map *isl_map_subtract(struct isl_map *map1, struct isl_map *map2)
 	if (!map1 || !map2)
 		goto error;
 
-	isl_assert(map1->ctx, isl_dim_equal(map1->dim, map2->dim), goto error);
+	isl_assert(map1->ctx, isl_space_is_equal(map1->dim, map2->dim), goto error);
 
 	if (isl_map_is_empty(map2)) {
 		isl_map_free(map2);
@@ -413,6 +536,12 @@ error:
 	return NULL;
 }
 
+__isl_give isl_map *isl_map_subtract( __isl_take isl_map *map1,
+	__isl_take isl_map *map2)
+{
+	return isl_map_align_params_map_map_and(map1, map2, &map_subtract);
+}
+
 struct isl_set *isl_set_subtract(struct isl_set *set1, struct isl_set *set2)
 {
 	return (struct isl_set *)
@@ -420,6 +549,58 @@ struct isl_set *isl_set_subtract(struct isl_set *set1, struct isl_set *set2)
 			(struct isl_map *)set1, (struct isl_map *)set2);
 }
 
+/* Remove the elements of "dom" from the domain of "map".
+ */
+static __isl_give isl_map *map_subtract_domain(__isl_take isl_map *map,
+	__isl_take isl_set *dom)
+{
+	isl_map *ext_dom;
+
+	if (!isl_map_compatible_domain(map, dom))
+		isl_die(isl_set_get_ctx(dom), isl_error_invalid,
+			"incompatible spaces", goto error);
+	
+	ext_dom = isl_map_universe(isl_map_get_space(map));
+	ext_dom = isl_map_intersect_domain(ext_dom, dom);
+	return isl_map_subtract(map, ext_dom);
+error:
+	isl_map_free(map);
+	isl_set_free(dom);
+	return NULL;
+}
+
+__isl_give isl_map *isl_map_subtract_domain(__isl_take isl_map *map,
+	__isl_take isl_set *dom)
+{
+	return isl_map_align_params_map_map_and(map, dom, &map_subtract_domain);
+}
+
+/* Remove the elements of "dom" from the range of "map".
+ */
+static __isl_give isl_map *map_subtract_range(__isl_take isl_map *map,
+	__isl_take isl_set *dom)
+{
+	isl_map *ext_dom;
+
+	if (!isl_map_compatible_range(map, dom))
+		isl_die(isl_set_get_ctx(dom), isl_error_invalid,
+			"incompatible spaces", goto error);
+	
+	ext_dom = isl_map_universe(isl_map_get_space(map));
+	ext_dom = isl_map_intersect_range(ext_dom, dom);
+	return isl_map_subtract(map, ext_dom);
+error:
+	isl_map_free(map);
+	isl_set_free(dom);
+	return NULL;
+}
+
+__isl_give isl_map *isl_map_subtract_range(__isl_take isl_map *map,
+	__isl_take isl_set *dom)
+{
+	return isl_map_align_params_map_map_and(map, dom, &map_subtract_range);
+}
+
 /* A diff collector that aborts as soon as its add function is called,
  * setting empty to 0.
  */
@@ -451,7 +632,7 @@ static int basic_map_diff_is_empty(__isl_keep isl_basic_map *bmap,
 	int r;
 	struct isl_is_empty_diff_collector edc;
 
-	r = isl_basic_map_fast_is_empty(bmap);
+	r = isl_basic_map_plain_is_empty(bmap);
 	if (r)
 		return r;
 
@@ -487,7 +668,7 @@ static int map_diff_is_empty(__isl_keep isl_map *map1, __isl_keep isl_map *map2)
 
 /* Return 1 if "bmap" contains a single element.
  */
-int isl_basic_map_is_singleton(__isl_keep isl_basic_map *bmap)
+int isl_basic_map_plain_is_singleton(__isl_keep isl_basic_map *bmap)
 {
 	if (!bmap)
 		return -1;
@@ -500,22 +681,23 @@ int isl_basic_map_is_singleton(__isl_keep isl_basic_map *bmap)
 
 /* Return 1 if "map" contains a single element.
  */
-int isl_map_is_singleton(__isl_keep isl_map *map)
+int isl_map_plain_is_singleton(__isl_keep isl_map *map)
 {
 	if (!map)
 		return -1;
 	if (map->n != 1)
 		return 0;
 
-	return isl_basic_map_is_singleton(map->p[0]);
+	return isl_basic_map_plain_is_singleton(map->p[0]);
 }
 
 /* Given a singleton basic map, extract the single element
- * as an isl_vec.
+ * as an isl_point.
  */
-static __isl_give isl_vec *singleton_extract_point(__isl_keep isl_basic_map *bmap)
+static __isl_give isl_point *singleton_extract_point(
+	__isl_keep isl_basic_map *bmap)
 {
-	int i, j;
+	int j;
 	unsigned dim;
 	struct isl_vec *point;
 	isl_int m;
@@ -533,7 +715,6 @@ static __isl_give isl_vec *singleton_extract_point(__isl_keep isl_basic_map *bma
 
 	isl_int_set_si(point->el[0], 1);
 	for (j = 0; j < bmap->n_eq; ++j) {
-		int s;
 		int i = dim - 1 - j;
 		isl_assert(bmap->ctx,
 		    isl_seq_first_non_zero(bmap->eq[j] + 1, i) == -1,
@@ -556,59 +737,23 @@ static __isl_give isl_vec *singleton_extract_point(__isl_keep isl_basic_map *bma
 	}
 
 	isl_int_clear(m);
-	return point;
+	return isl_point_alloc(isl_basic_map_get_space(bmap), point);
 error:
 	isl_int_clear(m);
 	isl_vec_free(point);
 	return NULL;
 }
 
-/* Return 1 if "bmap" contains the point "point".
- * "bmap" is assumed to have known divs.
- * The point is first extended with the divs and then passed
- * to basic_map_contains.
- */
-static int basic_map_contains_point(__isl_keep isl_basic_map *bmap,
-	__isl_keep isl_vec *point)
-{
-	int i;
-	struct isl_vec *vec;
-	unsigned dim;
-	int contains;
-
-	if (!bmap || !point)
-		return -1;
-	if (bmap->n_div == 0)
-		return isl_basic_map_contains(bmap, point);
-
-	dim = isl_basic_map_total_dim(bmap) - bmap->n_div;
-	vec = isl_vec_alloc(bmap->ctx, 1 + dim + bmap->n_div);
-	if (!vec)
-		return -1;
-
-	isl_seq_cpy(vec->el, point->el, point->size);
-	for (i = 0; i < bmap->n_div; ++i) {
-		isl_seq_inner_product(bmap->div[i] + 1, vec->el,
-					1 + dim + i, &vec->el[1+dim+i]);
-		isl_int_fdiv_q(vec->el[1+dim+i], vec->el[1+dim+i],
-				bmap->div[i][0]);
-	}
-
-	contains = isl_basic_map_contains(bmap, vec);
-
-	isl_vec_free(vec);
-	return contains;
-}
-
 /* Return 1 is the singleton map "map1" is a subset of "map2",
  * i.e., if the single element of "map1" is also an element of "map2".
+ * Assumes "map2" has known divs.
  */
 static int map_is_singleton_subset(__isl_keep isl_map *map1,
 	__isl_keep isl_map *map2)
 {
 	int i;
 	int is_subset = 0;
-	struct isl_vec *point;
+	struct isl_point *point;
 
 	if (!map1 || !map2)
 		return -1;
@@ -620,47 +765,67 @@ static int map_is_singleton_subset(__isl_keep isl_map *map1,
 		return -1;
 
 	for (i = 0; i < map2->n; ++i) {
-		is_subset = basic_map_contains_point(map2->p[i], point);
+		is_subset = isl_basic_map_contains_point(map2->p[i], point);
 		if (is_subset)
 			break;
 	}
 
-	isl_vec_free(point);
+	isl_point_free(point);
 	return is_subset;
 }
 
-int isl_map_is_subset(struct isl_map *map1, struct isl_map *map2)
+static int map_is_subset(__isl_keep isl_map *map1, __isl_keep isl_map *map2)
 {
 	int is_subset = 0;
-	struct isl_map *diff;
+	int empty;
+	int rat1, rat2;
 
 	if (!map1 || !map2)
 		return -1;
 
-	if (isl_map_is_empty(map1))
+	if (!isl_map_has_equal_space(map1, map2))
+		return 0;
+
+	empty = isl_map_is_empty(map1);
+	if (empty < 0)
+		return -1;
+	if (empty)
 		return 1;
 
-	if (isl_map_is_empty(map2))
+	empty = isl_map_is_empty(map2);
+	if (empty < 0)
+		return -1;
+	if (empty)
+		return 0;
+
+	rat1 = isl_map_has_rational(map1);
+	rat2 = isl_map_has_rational(map2);
+	if (rat1 < 0 || rat2 < 0)
+		return -1;
+	if (rat1 && !rat2)
 		return 0;
 
-	if (isl_map_fast_is_universe(map2))
+	if (isl_map_plain_is_universe(map2))
 		return 1;
 
-	map1 = isl_map_compute_divs(isl_map_copy(map1));
 	map2 = isl_map_compute_divs(isl_map_copy(map2));
-	if (isl_map_is_singleton(map1)) {
+	if (isl_map_plain_is_singleton(map1)) {
 		is_subset = map_is_singleton_subset(map1, map2);
-		isl_map_free(map1);
 		isl_map_free(map2);
 		return is_subset;
 	}
 	is_subset = map_diff_is_empty(map1, map2);
-	isl_map_free(map1);
 	isl_map_free(map2);
 
 	return is_subset;
 }
 
+int isl_map_is_subset(__isl_keep isl_map *map1, __isl_keep isl_map *map2)
+{
+	return isl_map_align_params_map_map_and_test(map1, map2,
+							&map_is_subset);
+}
+
 int isl_set_is_subset(struct isl_set *set1, struct isl_set *set2)
 {
 	return isl_map_is_subset(
@@ -708,14 +873,19 @@ __isl_give isl_set *isl_set_make_disjoint(__isl_take isl_set *set)
 	return (struct isl_set *)isl_map_make_disjoint((struct isl_map *)set);
 }
 
-__isl_give isl_set *isl_set_complement(__isl_take isl_set *set)
+__isl_give isl_map *isl_map_complement(__isl_take isl_map *map)
 {
-	isl_set *universe;
+	isl_map *universe;
 
-	if (!set)
+	if (!map)
 		return NULL;
 
-	universe = isl_set_universe(isl_set_get_dim(set));
+	universe = isl_map_universe(isl_map_get_space(map));
 
-	return isl_set_subtract(universe, set);
+	return isl_map_subtract(universe, map);
+}
+
+__isl_give isl_set *isl_set_complement(__isl_take isl_set *set)
+{
+	return isl_map_complement(set);
 }