X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_aff.c;h=1147ceafcd0d0c5283e81bb8c217fe3d3ab0da54;hb=425f35468a61002282f6bc261c0ba403ab116a2a;hp=7c46d345338c274b61f33293ae64413631307695;hpb=4812e46bc3d8f879ef9ff10098bb265a2430ceda;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_aff.c b/isl_aff.c
index 7c46d34..1147cea 100644
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -12,13 +12,14 @@
 #include <isl_ctx_private.h>
 #include <isl_map_private.h>
 #include <isl_aff_private.h>
-#include <isl_dim_private.h>
+#include <isl_space_private.h>
 #include <isl_local_space_private.h>
 #include <isl_mat_private.h>
 #include <isl_list_private.h>
 #include <isl/constraint.h>
 #include <isl/seq.h>
 #include <isl/set.h>
+#include <isl_config.h>
 
 __isl_give isl_aff *isl_aff_alloc_vec(__isl_take isl_local_space *ls,
 	__isl_take isl_vec *v)
@@ -56,6 +57,10 @@ __isl_give isl_aff *isl_aff_alloc(__isl_take isl_local_space *ls)
 	if (!isl_local_space_divs_known(ls))
 		isl_die(ctx, isl_error_invalid, "local space has unknown divs",
 			goto error);
+	if (!isl_local_space_is_set(ls))
+		isl_die(ctx, isl_error_invalid,
+			"domain of affine expression should be a set",
+			goto error);
 
 	total = isl_local_space_dim(ls, isl_dim_all);
 	v = isl_vec_alloc(ctx, 1 + 1 + total);
@@ -65,7 +70,7 @@ error:
 	return NULL;
 }
 
-__isl_give isl_aff *isl_aff_zero(__isl_take isl_local_space *ls)
+__isl_give isl_aff *isl_aff_zero_on_domain(__isl_take isl_local_space *ls)
 {
 	isl_aff *aff;
 
@@ -129,45 +134,97 @@ isl_ctx *isl_aff_get_ctx(__isl_keep isl_aff *aff)
 	return aff ? isl_local_space_get_ctx(aff->ls) : NULL;
 }
 
+/* Externally, an isl_aff has a map space, but internally, the
+ * ls field corresponds to the domain of that space.
+ */
 int isl_aff_dim(__isl_keep isl_aff *aff, enum isl_dim_type type)
 {
-	return aff ? isl_local_space_dim(aff->ls, type) : 0;
+	if (!aff)
+		return 0;
+	if (type == isl_dim_out)
+		return 1;
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+	return isl_local_space_dim(aff->ls, type);
 }
 
-__isl_give isl_dim *isl_aff_get_dim(__isl_keep isl_aff *aff)
+__isl_give isl_space *isl_aff_get_domain_space(__isl_keep isl_aff *aff)
 {
-	return aff ? isl_local_space_get_dim(aff->ls) : NULL;
+	return aff ? isl_local_space_get_space(aff->ls) : NULL;
 }
 
-__isl_give isl_local_space *isl_aff_get_local_space(__isl_keep isl_aff *aff)
+__isl_give isl_space *isl_aff_get_space(__isl_keep isl_aff *aff)
+{
+	isl_space *space;
+	if (!aff)
+		return NULL;
+	space = isl_local_space_get_space(aff->ls);
+	space = isl_space_from_domain(space);
+	space = isl_space_add_dims(space, isl_dim_out, 1);
+	return space;
+}
+
+__isl_give isl_local_space *isl_aff_get_domain_local_space(
+	__isl_keep isl_aff *aff)
 {
 	return aff ? isl_local_space_copy(aff->ls) : NULL;
 }
 
+__isl_give isl_local_space *isl_aff_get_local_space(__isl_keep isl_aff *aff)
+{
+	isl_local_space *ls;
+	if (!aff)
+		return NULL;
+	ls = isl_local_space_copy(aff->ls);
+	ls = isl_local_space_from_domain(ls);
+	ls = isl_local_space_add_dims(ls, isl_dim_out, 1);
+	return ls;
+}
+
+/* Externally, an isl_aff has a map space, but internally, the
+ * ls field corresponds to the domain of that space.
+ */
 const char *isl_aff_get_dim_name(__isl_keep isl_aff *aff,
 	enum isl_dim_type type, unsigned pos)
 {
-	return aff ? isl_local_space_get_dim_name(aff->ls, type, pos) : 0;
+	if (!aff)
+		return NULL;
+	if (type == isl_dim_out)
+		return NULL;
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+	return isl_local_space_get_dim_name(aff->ls, type, pos);
 }
 
-__isl_give isl_aff *isl_aff_reset_dim(__isl_take isl_aff *aff,
-	__isl_take isl_dim *dim)
+__isl_give isl_aff *isl_aff_reset_domain_space(__isl_take isl_aff *aff,
+	__isl_take isl_space *dim)
 {
 	aff = isl_aff_cow(aff);
 	if (!aff || !dim)
 		goto error;
 
-	aff->ls = isl_local_space_reset_dim(aff->ls, dim);
+	aff->ls = isl_local_space_reset_space(aff->ls, dim);
 	if (!aff->ls)
 		return isl_aff_free(aff);
 
 	return aff;
 error:
 	isl_aff_free(aff);
-	isl_dim_free(dim);
+	isl_space_free(dim);
 	return NULL;
 }
 
+/* Reset the space of "aff".  This function is called from isl_pw_templ.c
+ * and doesn't know if the space of an element object is represented
+ * directly or through its domain.  It therefore passes along both.
+ */
+__isl_give isl_aff *isl_aff_reset_space_and_domain(__isl_take isl_aff *aff,
+	__isl_take isl_space *space, __isl_take isl_space *domain)
+{
+	isl_space_free(space);
+	return isl_aff_reset_domain_space(aff, domain);
+}
+
 /* Reorder the coefficients of the affine expression based
  * on the given reodering.
  * The reordering r is assumed to have been extended with the local
@@ -182,7 +239,8 @@ static __isl_give isl_vec *vec_reorder(__isl_take isl_vec *vec,
 	if (!vec || !r)
 		goto error;
 
-	res = isl_vec_alloc(vec->ctx, 2 + isl_dim_total(r->dim) + n_div);
+	res = isl_vec_alloc(vec->ctx,
+			    2 + isl_space_dim(r->dim, isl_dim_all) + n_div);
 	isl_seq_cpy(res->el, vec->el, 2);
 	isl_seq_clr(res->el + 2, res->size - 2);
 	for (i = 0; i < r->len; ++i)
@@ -197,9 +255,10 @@ error:
 	return NULL;
 }
 
-/* Reorder the dimensions of "aff" according to the given reordering.
+/* Reorder the dimensions of the domain of "aff" according
+ * to the given reordering.
  */
-__isl_give isl_aff *isl_aff_realign(__isl_take isl_aff *aff,
+__isl_give isl_aff *isl_aff_realign_domain(__isl_take isl_aff *aff,
 	__isl_take isl_reordering *r)
 {
 	aff = isl_aff_cow(aff);
@@ -265,6 +324,13 @@ int isl_aff_get_coefficient(__isl_keep isl_aff *aff,
 	if (!aff)
 		return -1;
 
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"output/set dimension does not have a coefficient",
+			return -1);
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+
 	if (pos >= isl_local_space_dim(aff->ls, type))
 		isl_die(aff->v->ctx, isl_error_invalid,
 			"position out of bounds", return -1);
@@ -356,6 +422,13 @@ __isl_give isl_aff *isl_aff_set_coefficient(__isl_take isl_aff *aff,
 	if (!aff)
 		return NULL;
 
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"output/set dimension does not have a coefficient",
+			return isl_aff_free(aff));
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+
 	if (pos >= isl_local_space_dim(aff->ls, type))
 		isl_die(aff->v->ctx, isl_error_invalid,
 			"position out of bounds", return isl_aff_free(aff));
@@ -380,6 +453,13 @@ __isl_give isl_aff *isl_aff_set_coefficient_si(__isl_take isl_aff *aff,
 	if (!aff)
 		return NULL;
 
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"output/set dimension does not have a coefficient",
+			return isl_aff_free(aff));
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+
 	if (pos >= isl_local_space_dim(aff->ls, type))
 		isl_die(aff->v->ctx, isl_error_invalid,
 			"position out of bounds", return isl_aff_free(aff));
@@ -404,6 +484,13 @@ __isl_give isl_aff *isl_aff_add_coefficient(__isl_take isl_aff *aff,
 	if (!aff)
 		return NULL;
 
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"output/set dimension does not have a coefficient",
+			return isl_aff_free(aff));
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+
 	if (pos >= isl_local_space_dim(aff->ls, type))
 		isl_die(aff->v->ctx, isl_error_invalid,
 			"position out of bounds", return isl_aff_free(aff));
@@ -435,7 +522,7 @@ __isl_give isl_aff *isl_aff_add_coefficient_si(__isl_take isl_aff *aff,
 	return aff;
 }
 
-__isl_give isl_div *isl_aff_get_div(__isl_keep isl_aff *aff, int pos)
+__isl_give isl_aff *isl_aff_get_div(__isl_keep isl_aff *aff, int pos)
 {
 	if (!aff)
 		return NULL;
@@ -457,6 +544,16 @@ __isl_give isl_aff *isl_aff_neg(__isl_take isl_aff *aff)
 	return aff;
 }
 
+__isl_give isl_aff *isl_aff_normalize(__isl_take isl_aff *aff)
+{
+	if (!aff)
+		return NULL;
+	aff->v = isl_vec_normalize(aff->v);
+	if (!aff->v)
+		return isl_aff_free(aff);
+	return aff;
+}
+
 /* Given f, return floor(f).
  * If f is an integer expression, then just return f.
  * Otherwise, if f = g/m, write g = q m + r,
@@ -660,7 +757,7 @@ __isl_give isl_aff *isl_aff_add(__isl_take isl_aff *aff1,
 		goto error;
 
 	ctx = isl_aff_get_ctx(aff1);
-	if (!isl_dim_equal(aff1->ls->dim, aff2->ls->dim))
+	if (!isl_space_is_equal(aff1->ls->dim, aff2->ls->dim))
 		isl_die(ctx, isl_error_invalid,
 			"spaces don't match", goto error);
 
@@ -763,6 +860,12 @@ __isl_give isl_aff *isl_aff_set_dim_name(__isl_take isl_aff *aff,
 	aff = isl_aff_cow(aff);
 	if (!aff)
 		return NULL;
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"cannot set name of output/set dimension",
+			return isl_aff_free(aff));
+	if (type == isl_dim_in)
+		type = isl_dim_set;
 	aff->ls = isl_local_space_set_dim_name(aff->ls, type, pos, s);
 	if (!aff->ls)
 		return isl_aff_free(aff);
@@ -770,6 +873,29 @@ __isl_give isl_aff *isl_aff_set_dim_name(__isl_take isl_aff *aff,
 	return aff;
 }
 
+__isl_give isl_aff *isl_aff_set_dim_id(__isl_take isl_aff *aff,
+	enum isl_dim_type type, unsigned pos, __isl_take isl_id *id)
+{
+	aff = isl_aff_cow(aff);
+	if (!aff)
+		return isl_id_free(id);
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"cannot set name of output/set dimension",
+			goto error);
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+	aff->ls = isl_local_space_set_dim_id(aff->ls, type, pos, id);
+	if (!aff->ls)
+		return isl_aff_free(aff);
+
+	return aff;
+error:
+	isl_id_free(id);
+	isl_aff_free(aff);
+	return NULL;
+}
+
 /* Exploit the equalities in "eq" to simplify the affine expression
  * and the expressions of the integer divisions in the local space.
  * The integer divisions in this local space are assumed to appear
@@ -798,7 +924,7 @@ static __isl_give isl_aff *isl_aff_substitute_equalities_lifted(
 	if (!aff->ls)
 		goto error;
 
-	total = 1 + isl_dim_total(eq->dim);
+	total = 1 + isl_space_dim(eq->dim, isl_dim_all);
 	n_div = eq->n_div;
 	for (i = 0; i < eq->n_eq; ++i) {
 		j = isl_seq_last_non_zero(eq->eq[i], total + n_div);
@@ -853,9 +979,10 @@ __isl_give isl_aff *isl_aff_gist(__isl_take isl_aff *aff,
 	n_div = isl_local_space_dim(aff->ls, isl_dim_div);
 	if (n_div > 0) {
 		isl_basic_set *bset;
+		isl_local_space *ls;
 		context = isl_set_add_dims(context, isl_dim_set, n_div);
-		bset = isl_basic_set_from_local_space(
-					    isl_aff_get_local_space(aff));
+		ls = isl_aff_get_domain_local_space(aff);
+		bset = isl_basic_set_from_local_space(ls);
 		bset = isl_basic_set_lift(bset);
 		bset = isl_basic_set_flatten(bset);
 		context = isl_set_intersect(context,
@@ -930,34 +1057,6 @@ int isl_aff_is_empty(__isl_keep isl_aff *aff)
 	return 0;
 }
 
-/* Set active[i] to 1 if the dimension at position i is involved
- * in the affine expression.
- */
-static int set_active(__isl_keep isl_aff *aff, int *active)
-{
-	int i, j;
-	unsigned total;
-	unsigned offset;
-
-	if (!aff || !active)
-		return -1;
-
-	total = aff->v->size - 2;
-	for (i = 0; i < total; ++i)
-		active[i] = !isl_int_is_zero(aff->v->el[2 + i]);
-
-	offset = isl_local_space_offset(aff->ls, isl_dim_div) - 1;
-	for (i = aff->ls->div->n_row - 1; i >= 0; --i) {
-		if (!active[offset + i])
-			continue;
-		for (j = 0; j < total; ++j)
-			active[j] |=
-				!isl_int_is_zero(aff->ls->div->row[i][2 + j]);
-	}
-
-	return 0;
-}
-
 /* Check whether the given affine expression has non-zero coefficient
  * for any dimension in the given range or if any of these dimensions
  * appear with non-zero coefficients in any of the integer divisions
@@ -981,9 +1080,8 @@ int isl_aff_involves_dims(__isl_keep isl_aff *aff,
 		isl_die(ctx, isl_error_invalid,
 			"range out of bounds", return -1);
 
-	active = isl_calloc_array(ctx, int,
-				  isl_local_space_dim(aff->ls, isl_dim_all));
-	if (set_active(aff, active) < 0)
+	active = isl_local_space_get_active(aff->ls, aff->v->el + 2);
+	if (!active)
 		goto error;
 
 	first += isl_local_space_offset(aff->ls, type) - 1;
@@ -1008,11 +1106,17 @@ __isl_give isl_aff *isl_aff_drop_dims(__isl_take isl_aff *aff,
 
 	if (!aff)
 		return NULL;
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"cannot drop output/set dimension",
+			return isl_aff_free(aff));
+	if (type == isl_dim_in)
+		type = isl_dim_set;
 	if (n == 0 && !isl_local_space_is_named_or_nested(aff->ls, type))
 		return aff;
 
 	ctx = isl_aff_get_ctx(aff);
-	if (first + n > isl_aff_dim(aff, type))
+	if (first + n > isl_local_space_dim(aff->ls, type))
 		isl_die(ctx, isl_error_invalid, "range out of bounds",
 			return isl_aff_free(aff));
 
@@ -1039,11 +1143,17 @@ __isl_give isl_aff *isl_aff_insert_dims(__isl_take isl_aff *aff,
 
 	if (!aff)
 		return NULL;
+	if (type == isl_dim_out)
+		isl_die(aff->v->ctx, isl_error_invalid,
+			"cannot insert output/set dimensions",
+			return isl_aff_free(aff));
+	if (type == isl_dim_in)
+		type = isl_dim_set;
 	if (n == 0 && !isl_local_space_is_named_or_nested(aff->ls, type))
 		return aff;
 
 	ctx = isl_aff_get_ctx(aff);
-	if (first > isl_aff_dim(aff, type))
+	if (first > isl_local_space_dim(aff->ls, type))
 		isl_die(ctx, isl_error_invalid, "position out of bounds",
 			return isl_aff_free(aff));
 
@@ -1083,20 +1193,9 @@ __isl_give isl_pw_aff *isl_pw_aff_add_dims(__isl_take isl_pw_aff *pwaff,
 	return isl_pw_aff_insert_dims(pwaff, type, pos, n);
 }
 
-__isl_give isl_pw_aff *isl_pw_aff_set_tuple_id(__isl_take isl_pw_aff *pwaff,
-	__isl_take isl_id *id)
-{
-	isl_dim *dim;
-
-	dim = isl_pw_aff_get_dim(pwaff);
-	dim = isl_dim_set_tuple_id(dim, isl_dim_set, id);
-
-	return isl_pw_aff_reset_dim(pwaff, dim);
-}
-
 __isl_give isl_pw_aff *isl_pw_aff_from_aff(__isl_take isl_aff *aff)
 {
-	isl_set *dom = isl_set_universe(isl_aff_get_dim(aff));
+	isl_set *dom = isl_set_universe(isl_aff_get_domain_space(aff));
 	return isl_pw_aff_alloc(dom, aff);
 }
 
@@ -1128,15 +1227,15 @@ static __isl_give isl_set *align_params_pw_pw_set_and(
 {
 	if (!pwaff1 || !pwaff2)
 		goto error;
-	if (isl_dim_match(pwaff1->dim, isl_dim_param,
+	if (isl_space_match(pwaff1->dim, isl_dim_param,
 			  pwaff2->dim, isl_dim_param))
 		return fn(pwaff1, pwaff2);
-	if (!isl_dim_has_named_params(pwaff1->dim) ||
-	    !isl_dim_has_named_params(pwaff2->dim))
+	if (!isl_space_has_named_params(pwaff1->dim) ||
+	    !isl_space_has_named_params(pwaff2->dim))
 		isl_die(isl_pw_aff_get_ctx(pwaff1), isl_error_invalid,
 			"unaligned unnamed parameters", goto error);
-	pwaff1 = isl_pw_aff_align_params(pwaff1, isl_pw_aff_get_dim(pwaff2));
-	pwaff2 = isl_pw_aff_align_params(pwaff2, isl_pw_aff_get_dim(pwaff1));
+	pwaff1 = isl_pw_aff_align_params(pwaff1, isl_pw_aff_get_space(pwaff2));
+	pwaff2 = isl_pw_aff_align_params(pwaff2, isl_pw_aff_get_space(pwaff1));
 	return fn(pwaff1, pwaff2);
 error:
 	isl_pw_aff_free(pwaff1);
@@ -1164,8 +1263,8 @@ static __isl_give isl_pw_aff *pw_aff_union_opt(__isl_take isl_pw_aff *pwaff1,
 	if (!pwaff1 || !pwaff2)
 		goto error;
 
-	ctx = isl_dim_get_ctx(pwaff1->dim);
-	if (!isl_dim_equal(pwaff1->dim, pwaff2->dim))
+	ctx = isl_space_get_ctx(pwaff1->dim);
+	if (!isl_space_is_equal(pwaff1->dim, pwaff2->dim))
 		isl_die(ctx, isl_error_invalid,
 			"arguments should live in same space", goto error);
 
@@ -1180,7 +1279,7 @@ static __isl_give isl_pw_aff *pw_aff_union_opt(__isl_take isl_pw_aff *pwaff1,
 	}
 
 	n = 2 * (pwaff1->n + 1) * (pwaff2->n + 1);
-	res = isl_pw_aff_alloc_(isl_dim_copy(pwaff1->dim), n);
+	res = isl_pw_aff_alloc_size(isl_space_copy(pwaff1->dim), n);
 
 	for (i = 0; i < pwaff1->n; ++i) {
 		set = isl_set_copy(pwaff1->p[i].set);
@@ -1242,7 +1341,8 @@ static __isl_give isl_pw_aff *pw_aff_union_max(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_union_max(__isl_take isl_pw_aff *pwaff1,
 	__isl_take isl_pw_aff *pwaff2)
 {
-	return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_union_max);
+	return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2,
+							&pw_aff_union_max);
 }
 
 /* Compute a piecewise quasi-affine expression with a domain that
@@ -1260,7 +1360,8 @@ static __isl_give isl_pw_aff *pw_aff_union_min(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_union_min(__isl_take isl_pw_aff *pwaff1,
 	__isl_take isl_pw_aff *pwaff2)
 {
-	return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_union_min);
+	return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2,
+							&pw_aff_union_min);
 }
 
 __isl_give isl_pw_aff *isl_pw_aff_union_opt(__isl_take isl_pw_aff *pwaff1,
@@ -1275,18 +1376,16 @@ __isl_give isl_pw_aff *isl_pw_aff_union_opt(__isl_take isl_pw_aff *pwaff1,
 /* Construct a map with as domain the domain of pwaff and
  * one-dimensional range corresponding to the affine expressions.
  */
-__isl_give isl_map *isl_map_from_pw_aff(__isl_take isl_pw_aff *pwaff)
+static __isl_give isl_map *map_from_pw_aff(__isl_take isl_pw_aff *pwaff)
 {
 	int i;
-	isl_dim *dim;
+	isl_space *dim;
 	isl_map *map;
 
 	if (!pwaff)
 		return NULL;
 
-	dim = isl_pw_aff_get_dim(pwaff);
-	dim = isl_dim_from_domain(dim);
-	dim = isl_dim_add(dim, isl_dim_out, 1);
+	dim = isl_pw_aff_get_space(pwaff);
 	map = isl_map_empty(dim);
 
 	for (i = 0; i < pwaff->n; ++i) {
@@ -1305,6 +1404,31 @@ __isl_give isl_map *isl_map_from_pw_aff(__isl_take isl_pw_aff *pwaff)
 	return map;
 }
 
+/* Construct a map with as domain the domain of pwaff and
+ * one-dimensional range corresponding to the affine expressions.
+ */
+__isl_give isl_map *isl_map_from_pw_aff(__isl_take isl_pw_aff *pwaff)
+{
+	if (isl_space_is_set(pwaff->dim))
+		isl_die(isl_pw_aff_get_ctx(pwaff), isl_error_invalid,
+			"space of input is not a map",
+			return isl_pw_aff_free(pwaff));
+	return map_from_pw_aff(pwaff);
+}
+
+/* Construct a one-dimensional set with as parameter domain
+ * the domain of pwaff and the single set dimension
+ * corresponding to the affine expressions.
+ */
+__isl_give isl_set *isl_set_from_pw_aff(__isl_take isl_pw_aff *pwaff)
+{
+	if (!isl_space_is_set(pwaff->dim))
+		isl_die(isl_pw_aff_get_ctx(pwaff), isl_error_invalid,
+			"space of input is not a set",
+			return isl_pw_aff_free(pwaff));
+	return map_from_pw_aff(pwaff);
+}
+
 /* Return a set containing those elements in the domain
  * of pwaff where it is non-negative.
  */
@@ -1316,7 +1440,7 @@ __isl_give isl_set *isl_pw_aff_nonneg_set(__isl_take isl_pw_aff *pwaff)
 	if (!pwaff)
 		return NULL;
 
-	set = isl_set_empty(isl_pw_aff_get_dim(pwaff));
+	set = isl_set_empty(isl_pw_aff_get_domain_space(pwaff));
 
 	for (i = 0; i < pwaff->n; ++i) {
 		isl_basic_set *bset;
@@ -1344,7 +1468,7 @@ __isl_give isl_set *isl_pw_aff_zero_set(__isl_take isl_pw_aff *pwaff)
 	if (!pwaff)
 		return NULL;
 
-	set = isl_set_empty(isl_pw_aff_get_dim(pwaff));
+	set = isl_set_empty(isl_pw_aff_get_domain_space(pwaff));
 
 	for (i = 0; i < pwaff->n; ++i) {
 		isl_basic_set *bset;
@@ -1391,9 +1515,9 @@ static __isl_give isl_set *pw_aff_gte_set(__isl_take isl_pw_aff *pwaff1,
 	pwaff1 = isl_pw_aff_add(pwaff1, isl_pw_aff_neg(pwaff2));
 
 	if (strict) {
-		isl_dim *dim = isl_set_get_dim(set1);
+		isl_space *dim = isl_set_get_space(set1);
 		isl_aff *aff;
-		aff = isl_aff_zero(isl_local_space_from_dim(dim));
+		aff = isl_aff_zero_on_domain(isl_local_space_from_space(dim));
 		aff = isl_aff_add_constant_si(aff, -1);
 		pwaff1 = isl_pw_aff_add(pwaff1, isl_pw_aff_alloc(set1, aff));
 	} else
@@ -1482,7 +1606,7 @@ static __isl_give isl_set *pw_aff_list_set(__isl_take isl_pw_aff_list *list1,
 		isl_die(ctx, isl_error_invalid,
 			"list should contain at least one element", goto error);
 
-	set = isl_set_universe(isl_pw_aff_get_dim(list1->p[0]));
+	set = isl_set_universe(isl_pw_aff_get_domain_space(list1->p[0]));
 	for (i = 0; i < list1->n; ++i)
 		for (j = 0; j < list2->n; ++j) {
 			isl_set *set_ij;
@@ -1701,47 +1825,13 @@ error:
 static __isl_give isl_pw_aff *pw_aff_mul(__isl_take isl_pw_aff *pwaff1,
 	__isl_take isl_pw_aff *pwaff2)
 {
-	int i, j, n;
-	isl_pw_aff *res;
-
-	if (!pwaff1 || !pwaff2)
-		goto error;
-
-	n = pwaff1->n * pwaff2->n;
-	res = isl_pw_aff_alloc_(isl_dim_copy(pwaff1->dim), n);
-
-	for (i = 0; i < pwaff1->n; ++i) {
-		for (j = 0; j < pwaff2->n; ++j) {
-			isl_set *common;
-			isl_aff *prod;
-			common = isl_set_intersect(
-					isl_set_copy(pwaff1->p[i].set),
-					isl_set_copy(pwaff2->p[j].set));
-			if (isl_set_plain_is_empty(common)) {
-				isl_set_free(common);
-				continue;
-			}
-
-			prod = isl_aff_mul(isl_aff_copy(pwaff1->p[i].aff),
-					    isl_aff_copy(pwaff2->p[j].aff));
-
-			res = isl_pw_aff_add_piece(res, common, prod);
-		}
-	}
-
-	isl_pw_aff_free(pwaff1);
-	isl_pw_aff_free(pwaff2);
-	return res;
-error:
-	isl_pw_aff_free(pwaff1);
-	isl_pw_aff_free(pwaff2);
-	return NULL;
+	return isl_pw_aff_on_shared_domain(pwaff1, pwaff2, &isl_aff_mul);
 }
 
 __isl_give isl_pw_aff *isl_pw_aff_mul(__isl_take isl_pw_aff *pwaff1,
 	__isl_take isl_pw_aff *pwaff2)
 {
-	return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_mul);
+	return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_mul);
 }
 
 static __isl_give isl_pw_aff *pw_aff_min(__isl_take isl_pw_aff *pwaff1,
@@ -1757,7 +1847,7 @@ static __isl_give isl_pw_aff *pw_aff_min(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_min(__isl_take isl_pw_aff *pwaff1,
 	__isl_take isl_pw_aff *pwaff2)
 {
-	return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_min);
+	return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_min);
 }
 
 static __isl_give isl_pw_aff *pw_aff_max(__isl_take isl_pw_aff *pwaff1,
@@ -1773,7 +1863,7 @@ static __isl_give isl_pw_aff *pw_aff_max(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_max(__isl_take isl_pw_aff *pwaff1,
 	__isl_take isl_pw_aff *pwaff2)
 {
-	return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_max);
+	return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_max);
 }
 
 static __isl_give isl_pw_aff *pw_aff_list_reduce(
@@ -1819,3 +1909,556 @@ __isl_give isl_pw_aff *isl_pw_aff_list_max(__isl_take isl_pw_aff_list *list)
 {
 	return pw_aff_list_reduce(list, &isl_pw_aff_max);
 }
+
+#undef BASE
+#define BASE aff
+
+#include <isl_multi_templ.c>
+
+__isl_give isl_multi_aff *isl_multi_aff_add(__isl_take isl_multi_aff *maff1,
+	__isl_take isl_multi_aff *maff2)
+{
+	int i;
+	isl_ctx *ctx;
+
+	maff1 = isl_multi_aff_cow(maff1);
+	if (!maff1 || !maff2)
+		goto error;
+
+	ctx = isl_multi_aff_get_ctx(maff1);
+	if (!isl_space_is_equal(maff1->space, maff2->space))
+		isl_die(ctx, isl_error_invalid,
+			"spaces don't match", goto error);
+
+	for (i = 0; i < maff1->n; ++i) {
+		maff1->p[i] = isl_aff_add(maff1->p[i],
+					    isl_aff_copy(maff2->p[i]));
+		if (!maff1->p[i])
+			goto error;
+	}
+
+	isl_multi_aff_free(maff2);
+	return maff1;
+error:
+	isl_multi_aff_free(maff1);
+	isl_multi_aff_free(maff2);
+	return NULL;
+}
+
+/* Exploit the equalities in "eq" to simplify the affine expressions.
+ */
+static __isl_give isl_multi_aff *isl_multi_aff_substitute_equalities(
+	__isl_take isl_multi_aff *maff, __isl_take isl_basic_set *eq)
+{
+	int i;
+
+	maff = isl_multi_aff_cow(maff);
+	if (!maff || !eq)
+		goto error;
+
+	for (i = 0; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_substitute_equalities(maff->p[i],
+						    isl_basic_set_copy(eq));
+		if (!maff->p[i])
+			goto error;
+	}
+
+	isl_basic_set_free(eq);
+	return maff;
+error:
+	isl_basic_set_free(eq);
+	isl_multi_aff_free(maff);
+	return NULL;
+}
+
+__isl_give isl_multi_aff *isl_multi_aff_scale(__isl_take isl_multi_aff *maff,
+	isl_int f)
+{
+	int i;
+
+	maff = isl_multi_aff_cow(maff);
+	if (!maff)
+		return NULL;
+
+	for (i = 0; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_scale(maff->p[i], f);
+		if (!maff->p[i])
+			return isl_multi_aff_free(maff);
+	}
+
+	return maff;
+}
+
+__isl_give isl_multi_aff *isl_multi_aff_add_on_domain(__isl_keep isl_set *dom,
+	__isl_take isl_multi_aff *maff1, __isl_take isl_multi_aff *maff2)
+{
+	maff1 = isl_multi_aff_add(maff1, maff2);
+	maff1 = isl_multi_aff_gist(maff1, isl_set_copy(dom));
+	return maff1;
+}
+
+int isl_multi_aff_is_empty(__isl_keep isl_multi_aff *maff)
+{
+	if (!maff)
+		return -1;
+
+	return 0;
+}
+
+int isl_multi_aff_plain_is_equal(__isl_keep isl_multi_aff *maff1,
+	__isl_keep isl_multi_aff *maff2)
+{
+	int i;
+	int equal;
+
+	if (!maff1 || !maff2)
+		return -1;
+	if (maff1->n != maff2->n)
+		return 0;
+	equal = isl_space_is_equal(maff1->space, maff2->space);
+	if (equal < 0 || !equal)
+		return equal;
+
+	for (i = 0; i < maff1->n; ++i) {
+		equal = isl_aff_plain_is_equal(maff1->p[i], maff2->p[i]);
+		if (equal < 0 || !equal)
+			return equal;
+	}
+
+	return 1;
+}
+
+__isl_give isl_multi_aff *isl_multi_aff_set_dim_name(
+	__isl_take isl_multi_aff *maff,
+	enum isl_dim_type type, unsigned pos, const char *s)
+{
+	int i;
+
+	maff = isl_multi_aff_cow(maff);
+	if (!maff)
+		return NULL;
+
+	maff->space = isl_space_set_dim_name(maff->space, type, pos, s);
+	if (!maff->space)
+		return isl_multi_aff_free(maff);
+	for (i = 0; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_set_dim_name(maff->p[i], type, pos, s);
+		if (!maff->p[i])
+			return isl_multi_aff_free(maff);
+	}
+
+	return maff;
+}
+
+__isl_give isl_multi_aff *isl_multi_aff_drop_dims(__isl_take isl_multi_aff *maff,
+	enum isl_dim_type type, unsigned first, unsigned n)
+{
+	int i;
+
+	maff = isl_multi_aff_cow(maff);
+	if (!maff)
+		return NULL;
+
+	maff->space = isl_space_drop_dims(maff->space, type, first, n);
+	if (!maff->space)
+		return isl_multi_aff_free(maff);
+	for (i = 0; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_drop_dims(maff->p[i], type, first, n);
+		if (!maff->p[i])
+			return isl_multi_aff_free(maff);
+	}
+
+	return maff;
+}
+
+#undef PW
+#define PW isl_pw_multi_aff
+#undef EL
+#define EL isl_multi_aff
+#undef EL_IS_ZERO
+#define EL_IS_ZERO is_empty
+#undef ZERO
+#define ZERO empty
+#undef IS_ZERO
+#define IS_ZERO is_empty
+#undef FIELD
+#define FIELD maff
+
+#define NO_NEG
+#define NO_EVAL
+#define NO_OPT
+#define NO_INVOLVES_DIMS
+#define NO_MOVE_DIMS
+#define NO_INSERT_DIMS
+#define NO_LIFT
+#define NO_MORPH
+
+#include <isl_pw_templ.c>
+
+/* Construct a map mapping the domain the piecewise multi-affine expression
+ * to its range, with each dimension in the range equated to the
+ * corresponding affine expression on its cell.
+ */
+__isl_give isl_map *isl_map_from_pw_multi_aff(__isl_take isl_pw_multi_aff *pma)
+{
+	int i;
+	isl_map *map;
+
+	if (!pma)
+		return NULL;
+
+	map = isl_map_empty(isl_pw_multi_aff_get_space(pma));
+
+	for (i = 0; i < pma->n; ++i) {
+		isl_multi_aff *maff;
+		isl_basic_map *bmap;
+		isl_map *map_i;
+
+		maff = isl_multi_aff_copy(pma->p[i].maff);
+		bmap = isl_basic_map_from_multi_aff(maff);
+		map_i = isl_map_from_basic_map(bmap);
+		map_i = isl_map_intersect_domain(map_i,
+						isl_set_copy(pma->p[i].set));
+		map = isl_map_union_disjoint(map, map_i);
+	}
+
+	isl_pw_multi_aff_free(pma);
+	return map;
+}
+
+__isl_give isl_set *isl_set_from_pw_multi_aff(__isl_take isl_pw_multi_aff *pma)
+{
+	if (!isl_space_is_set(pma->dim))
+		isl_die(isl_pw_multi_aff_get_ctx(pma), isl_error_invalid,
+			"isl_pw_multi_aff cannot be converted into an isl_set",
+			return isl_pw_multi_aff_free(pma));
+
+	return isl_map_from_pw_multi_aff(pma);
+}
+
+/* Try and create an isl_pw_multi_aff that is equivalent to the given isl_map.
+ * This obivously only works if the input "map" is single-valued.
+ * If so, we compute the lexicographic minimum of the image in the form
+ * of an isl_pw_multi_aff.  Since the image is unique, it is equal
+ * to its lexicographic minimum.
+ * If the input is not single-valued, we produce an error.
+ */
+__isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_map(__isl_take isl_map *map)
+{
+	int i;
+	int sv;
+	isl_pw_multi_aff *pma;
+
+	if (!map)
+		return NULL;
+
+	sv = isl_map_is_single_valued(map);
+	if (sv < 0)
+		goto error;
+	if (!sv)
+		isl_die(isl_map_get_ctx(map), isl_error_invalid,
+			"map is not single-valued", goto error);
+	map = isl_map_make_disjoint(map);
+	if (!map)
+		return NULL;
+
+	pma = isl_pw_multi_aff_empty(isl_map_get_space(map));
+
+	for (i = 0; i < map->n; ++i) {
+		isl_pw_multi_aff *pma_i;
+		isl_basic_map *bmap;
+		bmap = isl_basic_map_copy(map->p[i]);
+		pma_i = isl_basic_map_lexmin_pw_multi_aff(bmap);
+		pma = isl_pw_multi_aff_add_disjoint(pma, pma_i);
+	}
+
+	isl_map_free(map);
+	return pma;
+error:
+	isl_map_free(map);
+	return NULL;
+}
+
+__isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_set(__isl_take isl_set *set)
+{
+	return isl_pw_multi_aff_from_map(set);
+}
+
+/* Plug in "subs" for dimension "type", "pos" of "aff".
+ *
+ * Let i be the dimension to replace and let "subs" be of the form
+ *
+ *	f/d
+ *
+ * and "aff" of the form
+ *
+ *	(a i + g)/m
+ *
+ * The result is
+ *
+ *	floor((a f + d g')/(m d))
+ *
+ * where g' is the result of plugging in "subs" in each of the integer
+ * divisions in g.
+ */
+__isl_give isl_aff *isl_aff_substitute(__isl_take isl_aff *aff,
+	enum isl_dim_type type, unsigned pos, __isl_keep isl_aff *subs)
+{
+	isl_ctx *ctx;
+	isl_int v;
+
+	aff = isl_aff_cow(aff);
+	if (!aff || !subs)
+		return isl_aff_free(aff);
+
+	ctx = isl_aff_get_ctx(aff);
+	if (!isl_space_is_equal(aff->ls->dim, subs->ls->dim))
+		isl_die(ctx, isl_error_invalid,
+			"spaces don't match", return isl_aff_free(aff));
+	if (isl_local_space_dim(subs->ls, isl_dim_div) != 0)
+		isl_die(ctx, isl_error_unsupported,
+			"cannot handle divs yet", return isl_aff_free(aff));
+
+	aff->ls = isl_local_space_substitute(aff->ls, type, pos, subs);
+	if (!aff->ls)
+		return isl_aff_free(aff);
+
+	aff->v = isl_vec_cow(aff->v);
+	if (!aff->v)
+		return isl_aff_free(aff);
+
+	pos += isl_local_space_offset(aff->ls, type);
+
+	isl_int_init(v);
+	isl_int_set(v, aff->v->el[1 + pos]);
+	isl_int_set_si(aff->v->el[1 + pos], 0);
+	isl_seq_combine(aff->v->el + 1, subs->v->el[0], aff->v->el + 1,
+			v, subs->v->el + 1, subs->v->size - 1);
+	isl_int_mul(aff->v->el[0], aff->v->el[0], subs->v->el[0]);
+	isl_int_clear(v);
+
+	return aff;
+}
+
+/* Plug in "subs" for dimension "type", "pos" in each of the affine
+ * expressions in "maff".
+ */
+__isl_give isl_multi_aff *isl_multi_aff_substitute(
+	__isl_take isl_multi_aff *maff, enum isl_dim_type type, unsigned pos,
+	__isl_keep isl_aff *subs)
+{
+	int i;
+
+	maff = isl_multi_aff_cow(maff);
+	if (!maff || !subs)
+		return isl_multi_aff_free(maff);
+
+	if (type == isl_dim_in)
+		type = isl_dim_set;
+
+	for (i = 0; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_substitute(maff->p[i], type, pos, subs);
+		if (!maff->p[i])
+			return isl_multi_aff_free(maff);
+	}
+
+	return maff;
+}
+
+/* Plug in "subs" for dimension "type", "pos" of "pma".
+ *
+ * pma is of the form
+ *
+ *	A_i(v) -> M_i(v)
+ *
+ * while subs is of the form
+ *
+ *	v' = B_j(v) -> S_j
+ *
+ * Each pair i,j such that C_ij = A_i \cap B_i is non-empty
+ * has a contribution in the result, in particular
+ *
+ *	C_ij(S_j) -> M_i(S_j)
+ *
+ * Note that plugging in S_j in C_ij may also result in an empty set
+ * and this contribution should simply be discarded.
+ */
+__isl_give isl_pw_multi_aff *isl_pw_multi_aff_substitute(
+	__isl_take isl_pw_multi_aff *pma, enum isl_dim_type type, unsigned pos,
+	__isl_keep isl_pw_aff *subs)
+{
+	int i, j, n;
+	isl_pw_multi_aff *res;
+
+	if (!pma || !subs)
+		return isl_pw_multi_aff_free(pma);
+
+	n = pma->n * subs->n;
+	res = isl_pw_multi_aff_alloc_size(isl_space_copy(pma->dim), n);
+
+	for (i = 0; i < pma->n; ++i) {
+		for (j = 0; j < subs->n; ++j) {
+			isl_set *common;
+			isl_multi_aff *res_ij;
+			common = isl_set_intersect(
+					isl_set_copy(pma->p[i].set),
+					isl_set_copy(subs->p[j].set));
+			common = isl_set_substitute(common,
+					type, pos, subs->p[j].aff);
+			if (isl_set_plain_is_empty(common)) {
+				isl_set_free(common);
+				continue;
+			}
+
+			res_ij = isl_multi_aff_substitute(
+					isl_multi_aff_copy(pma->p[i].maff),
+					type, pos, subs->p[j].aff);
+
+			res = isl_pw_multi_aff_add_piece(res, common, res_ij);
+		}
+	}
+
+	isl_pw_multi_aff_free(pma);
+	return res;
+}
+
+/* Extend the local space of "dst" to include the divs
+ * in the local space of "src".
+ */
+__isl_give isl_aff *isl_aff_align_divs(__isl_take isl_aff *dst,
+	__isl_keep isl_aff *src)
+{
+	isl_ctx *ctx;
+	int *exp1 = NULL;
+	int *exp2 = NULL;
+	isl_mat *div;
+
+	if (!src || !dst)
+		return isl_aff_free(dst);
+
+	ctx = isl_aff_get_ctx(src);
+	if (!isl_space_is_equal(src->ls->dim, dst->ls->dim))
+		isl_die(ctx, isl_error_invalid,
+			"spaces don't match", goto error);
+
+	if (src->ls->div->n_row == 0)
+		return dst;
+
+	exp1 = isl_alloc_array(ctx, int, src->ls->div->n_row);
+	exp2 = isl_alloc_array(ctx, int, dst->ls->div->n_row);
+	if (!exp1 || !exp2)
+		goto error;
+
+	div = isl_merge_divs(src->ls->div, dst->ls->div, exp1, exp2);
+	dst = isl_aff_expand_divs(dst, div, exp2);
+	free(exp1);
+	free(exp2);
+
+	return dst;
+error:
+	free(exp1);
+	free(exp2);
+	return isl_aff_free(dst);
+}
+
+/* Adjust the local spaces of the affine expressions in "maff"
+ * such that they all have the save divs.
+ */
+__isl_give isl_multi_aff *isl_multi_aff_align_divs(
+	__isl_take isl_multi_aff *maff)
+{
+	int i;
+
+	if (!maff)
+		return NULL;
+	if (maff->n == 0)
+		return maff;
+	maff = isl_multi_aff_cow(maff);
+	if (!maff)
+		return NULL;
+
+	for (i = 1; i < maff->n; ++i)
+		maff->p[0] = isl_aff_align_divs(maff->p[0], maff->p[i]);
+	for (i = 1; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_align_divs(maff->p[i], maff->p[0]);
+		if (!maff->p[i])
+			return isl_multi_aff_free(maff);
+	}
+
+	return maff;
+}
+
+__isl_give isl_aff *isl_aff_lift(__isl_take isl_aff *aff)
+{
+	aff = isl_aff_cow(aff);
+	if (!aff)
+		return NULL;
+
+	aff->ls = isl_local_space_lift(aff->ls);
+	if (!aff->ls)
+		return isl_aff_free(aff);
+
+	return aff;
+}
+
+/* Lift "maff" to a space with extra dimensions such that the result
+ * has no more existentially quantified variables.
+ * If "ls" is not NULL, then *ls is assigned the local space that lies
+ * at the basis of the lifting applied to "maff".
+ */
+__isl_give isl_multi_aff *isl_multi_aff_lift(__isl_take isl_multi_aff *maff,
+	__isl_give isl_local_space **ls)
+{
+	int i;
+	isl_space *space;
+	unsigned n_div;
+
+	if (ls)
+		*ls = NULL;
+
+	if (!maff)
+		return NULL;
+
+	if (maff->n == 0) {
+		if (ls) {
+			isl_space *space = isl_multi_aff_get_domain_space(maff);
+			*ls = isl_local_space_from_space(space);
+			if (!*ls)
+				return isl_multi_aff_free(maff);
+		}
+		return maff;
+	}
+
+	maff = isl_multi_aff_cow(maff);
+	maff = isl_multi_aff_align_divs(maff);
+	if (!maff)
+		return NULL;
+
+	n_div = isl_aff_dim(maff->p[0], isl_dim_div);
+	space = isl_multi_aff_get_space(maff);
+	space = isl_space_lift(isl_space_domain(space), n_div);
+	space = isl_space_extend_domain_with_range(space,
+						isl_multi_aff_get_space(maff));
+	if (!space)
+		return isl_multi_aff_free(maff);
+	isl_space_free(maff->space);
+	maff->space = space;
+
+	if (ls) {
+		*ls = isl_aff_get_domain_local_space(maff->p[0]);
+		if (!*ls)
+			return isl_multi_aff_free(maff);
+	}
+
+	for (i = 0; i < maff->n; ++i) {
+		maff->p[i] = isl_aff_lift(maff->p[i]);
+		if (!maff->p[i])
+			goto error;
+	}
+
+	return maff;
+error:
+	if (ls)
+		isl_local_space_free(*ls);
+	return isl_multi_aff_free(maff);
+}