From: Sven Verdoolaege <skimo@kotnet.org>
Date: Fri, 19 Apr 2013 09:42:09 +0000 (+0200)
Subject: isl_ast_build_get_stride_constraint: combine multiple strides
X-Git-Tag: isl-0.12~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76f70092def01ccaa3ab579457d2e1f1a7f63243;p=platform%2Fupstream%2Fisl.git

isl_ast_build_get_stride_constraint: combine multiple strides

If we find multiple constraints from which can derive a stride,
then we would only keep the stride information from the last
of these constraints.  We now combine multiple strides into
a single stride.  Note that this may not have any effect in practice
because multiple strides are usually already combined into one
at the level of the constraints of a basic set.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---

diff --git a/isl_ast_build.c b/isl_ast_build.c
index 6b2a1bf..fe14b50 100644
--- a/isl_ast_build.c
+++ b/isl_ast_build.c
@@ -1017,6 +1017,30 @@ __isl_give isl_id *isl_ast_build_get_iterator_id(
 
 /* Set the stride and offset of the current dimension to the given
  * value and expression.
+ *
+ * If we had already found a stride before, then the two strides
+ * are combined into a single stride.
+ *
+ * In particular, if the new stride information is of the form
+ *
+ *	i = f + s (...)
+ *
+ * and the old stride information is of the form
+ *
+ *	i = f2 + s2 (...)
+ *
+ * then we compute the extended gcd of s and s2
+ *
+ *	a s + b s2 = g,
+ *
+ * with g = gcd(s,s2), multiply the first equation with t1 = b s2/g
+ * and the second with t2 = a s1/g.
+ * This results in
+ *
+ *	i = (b s2 + a s1)/g i = t1 f + t2 f2 + (s s2)/g (...)
+ *
+ * so that t1 f + t2 f2 is the combined offset and (s s2)/g = lcm(s,s2)
+ * is the combined stride.
  */
 static __isl_give isl_ast_build *set_stride(__isl_take isl_ast_build *build,
 	isl_int stride, __isl_take isl_aff *offset)
@@ -1028,6 +1052,35 @@ static __isl_give isl_ast_build *set_stride(__isl_take isl_ast_build *build,
 		goto error;
 
 	pos = build->depth;
+
+	if (isl_ast_build_has_stride(build, pos)) {
+		isl_int stride2, a, b, g;
+		isl_aff *offset2;
+
+		isl_int_init(stride2);
+		isl_int_init(a);
+		isl_int_init(b);
+		isl_int_init(g);
+
+		isl_vec_get_element(build->strides, pos, &stride2);
+		isl_int_gcdext(g, a, b, stride, stride2);
+		isl_int_mul(a, a, stride);
+		isl_int_divexact(a, a, g);
+		isl_int_divexact(stride2, stride2, g);
+		isl_int_mul(b, b, stride2);
+		isl_int_mul(stride, stride, stride2);
+
+		offset2 = isl_multi_aff_get_aff(build->offsets, pos);
+		offset2 = isl_aff_scale(offset2, a);
+		offset = isl_aff_scale(offset, b);
+		offset = isl_aff_add(offset, offset2);
+
+		isl_int_clear(stride2);
+		isl_int_clear(a);
+		isl_int_clear(b);
+		isl_int_clear(g);
+	}
+
 	build->strides = isl_vec_set_element(build->strides, pos, stride);
 	build->offsets = isl_multi_aff_set_aff(build->offsets, pos, offset);
 	if (!build->strides || !build->offsets)