X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_dim_map.c;h=37da3d4be22c9fc439e176d1bd5285a3281e6661;hb=a44c37f3013dc5fce377f4ba52fe26e8b1bdda68;hp=6ab97a239bb3487c09d8cd26e5fcc97af90d38c9;hpb=188293a434a55aaf3160ced1c0e883162df5d1a1;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_dim_map.c b/isl_dim_map.c
index 6ab97a2..37da3d4 100644
--- a/isl_dim_map.c
+++ b/isl_dim_map.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2008-2009 Katholieke Universiteit Leuven
- * Copyright 2010      INRIA Saclay
+ * Copyright 2010-2011 INRIA Saclay
  *
  * Use of this software is governed by the GNU LGPLv2.1 license
  *
@@ -11,14 +11,19 @@
  */
 
 #include <isl_map_private.h>
-#include <isl_dim_private.h>
+#include <isl_space_private.h>
 #include <isl_dim_map.h>
 #include <isl_reordering.h>
 
+struct isl_dim_map_entry {
+	int pos;
+	int sgn;
+};
+
 /* Maps dst positions to src positions */
 struct isl_dim_map {
 	unsigned len;
-	int pos[1];
+	struct isl_dim_map_entry m[1];
 };
 
 __isl_give isl_dim_map *isl_dim_map_alloc(isl_ctx *ctx, unsigned len)
@@ -26,18 +31,37 @@ __isl_give isl_dim_map *isl_dim_map_alloc(isl_ctx *ctx, unsigned len)
 	int i;
 	struct isl_dim_map *dim_map;
 	dim_map = isl_alloc(ctx, struct isl_dim_map,
-				sizeof(struct isl_dim_map) + len * sizeof(int));
+	    sizeof(struct isl_dim_map) + len * sizeof(struct isl_dim_map_entry));
 	if (!dim_map)
 		return NULL;
 	dim_map->len = 1 + len;
-	dim_map->pos[0] = 0;
+	dim_map->m[0].pos = 0;
+	dim_map->m[0].sgn = 1;
 	for (i = 0; i < len; ++i)
-		dim_map->pos[1 + i] = -1;
+		dim_map->m[1 + i].sgn = 0;
 	return dim_map;
 }
 
+void isl_dim_map_range(__isl_keep isl_dim_map *dim_map,
+	unsigned dst_pos, unsigned dst_stride,
+	unsigned src_pos, unsigned src_stride,
+	unsigned n, int sign)
+{
+	int i;
+
+	if (!dim_map)
+		return;
+
+	for (i = 0; i < n; ++i) {
+		unsigned d = 1 + dst_pos + dst_stride * i;
+		unsigned s = 1 + src_pos + src_stride * i;
+		dim_map->m[d].pos = s;
+		dim_map->m[d].sgn = sign;
+	}
+}
+
 void isl_dim_map_dim_range(__isl_keep isl_dim_map *dim_map,
-	struct isl_dim *dim, enum isl_dim_type type,
+	__isl_keep isl_space *dim, enum isl_dim_type type,
 	unsigned first, unsigned n, unsigned dst_pos)
 {
 	int i;
@@ -46,16 +70,18 @@ void isl_dim_map_dim_range(__isl_keep isl_dim_map *dim_map,
 	if (!dim_map || !dim)
 		return;
 	
-	src_pos = 1 + isl_dim_offset(dim, type);
-	for (i = 0; i < n; ++i)
-		dim_map->pos[1 + dst_pos + i] = src_pos + first + i;
+	src_pos = 1 + isl_space_offset(dim, type);
+	for (i = 0; i < n; ++i) {
+		dim_map->m[1 + dst_pos + i].pos = src_pos + first + i;
+		dim_map->m[1 + dst_pos + i].sgn = 1;
+	}
 }
 
-void isl_dim_map_dim(__isl_keep isl_dim_map *dim_map, __isl_keep isl_dim *dim,
+void isl_dim_map_dim(__isl_keep isl_dim_map *dim_map, __isl_keep isl_space *dim,
 	enum isl_dim_type type, unsigned dst_pos)
 {
 	isl_dim_map_dim_range(dim_map, dim, type,
-			      0, isl_dim_size(dim, type), dst_pos);
+			      0, isl_space_dim(dim, type), dst_pos);
 }
 
 void isl_dim_map_div(__isl_keep isl_dim_map *dim_map,
@@ -67,9 +93,11 @@ void isl_dim_map_div(__isl_keep isl_dim_map *dim_map,
 	if (!dim_map || !bmap)
 		return;
 	
-	src_pos = 1 + isl_dim_total(bmap->dim);
-	for (i = 0; i < bmap->n_div; ++i)
-		dim_map->pos[1 + dst_pos + i] = src_pos + i;
+	src_pos = 1 + isl_space_dim(bmap->dim, isl_dim_all);
+	for (i = 0; i < bmap->n_div; ++i) {
+		dim_map->m[1 + dst_pos + i].pos = src_pos + i;
+		dim_map->m[1 + dst_pos + i].sgn = 1;
+	}
 }
 
 void isl_dim_map_dump(struct isl_dim_map *dim_map)
@@ -77,7 +105,8 @@ void isl_dim_map_dump(struct isl_dim_map *dim_map)
 	int i;
 
 	for (i = 0; i < dim_map->len; ++i)
-		fprintf(stderr, "%d -> %d; ", i, dim_map->pos[i]);
+		fprintf(stderr, "%d -> %d * %d; ", i,
+			dim_map->m[i].sgn, dim_map->m[i].pos);
 	fprintf(stderr, "\n");
 }
 
@@ -87,10 +116,12 @@ static void copy_constraint_dim_map(isl_int *dst, isl_int *src,
 	int i;
 
 	for (i = 0; i < dim_map->len; ++i) {
-		if (dim_map->pos[i] < 0)
+		if (dim_map->m[i].sgn == 0)
 			isl_int_set_si(dst[i], 0);
+		else if (dim_map->m[i].sgn > 0)
+			isl_int_set(dst[i], src[dim_map->m[i].pos]);
 		else
-			isl_int_set(dst[i], src[dim_map->pos[i]]);
+			isl_int_neg(dst[i], src[dim_map->m[i].pos]);
 	}
 }
 
@@ -142,6 +173,13 @@ error:
 	return NULL;
 }
 
+__isl_give isl_basic_set *isl_basic_set_add_constraints_dim_map(
+	__isl_take isl_basic_set *dst, __isl_take isl_basic_set *src,
+	__isl_take isl_dim_map *dim_map)
+{
+	return isl_basic_map_add_constraints_dim_map(dst, src, dim_map);
+}
+
 /* Extend the given dim_map with mappings for the divs in bmap.
  */
 __isl_give isl_dim_map *isl_dim_map_extend(__isl_keep isl_dim_map *dim_map,
@@ -158,9 +196,11 @@ __isl_give isl_dim_map *isl_dim_map_extend(__isl_keep isl_dim_map *dim_map,
 		return NULL;
 
 	for (i = 0; i < dim_map->len; ++i)
-		res->pos[i] = dim_map->pos[i];
-	for (i = 0; i < bmap->n_div; ++i)
-		res->pos[dim_map->len + i] = offset + i;
+		res->m[i] = dim_map->m[i];
+	for (i = 0; i < bmap->n_div; ++i) {
+		res->m[dim_map->len + i].pos = offset + i;
+		res->m[dim_map->len + i].sgn = 1;
+	}
 
 	return res;
 }
@@ -179,13 +219,15 @@ __isl_give isl_dim_map *isl_dim_map_from_reordering(
 	if (!exp)
 		return NULL;
 
-	ctx = isl_dim_get_ctx(exp->dim);
-	dim_map = isl_dim_map_alloc(ctx, isl_dim_total(exp->dim));
+	ctx = isl_space_get_ctx(exp->dim);
+	dim_map = isl_dim_map_alloc(ctx, isl_space_dim(exp->dim, isl_dim_all));
 	if (!dim_map)
 		return NULL;
 
-	for (i = 0; i < exp->len; ++i)
-		dim_map->pos[1 + exp->pos[i]] = 1 + i;
+	for (i = 0; i < exp->len; ++i) {
+		dim_map->m[1 + exp->pos[i]].pos = 1 + i;
+		dim_map->m[1 + exp->pos[i]].sgn = 1;
+	}
 
 	return dim_map;
 }