add isl_pw_aff_div

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

diff --git a/doc/user.pod b/doc/user.pod
index a2892a9..8aaa179 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -3368,12 +3368,18 @@ Operations include
 
        __isl_give isl_aff *isl_aff_mul(__isl_take isl_aff *aff1,
                __isl_take isl_aff *aff2);
+       __isl_give isl_aff *isl_aff_div(__isl_take isl_aff *aff1,
+               __isl_take isl_aff *aff2);
        __isl_give isl_pw_aff *isl_pw_aff_mul(
                __isl_take isl_pw_aff *pwaff1,
                __isl_take isl_pw_aff *pwaff2);
+       __isl_give isl_pw_aff *isl_pw_aff_div(
+               __isl_take isl_pw_aff *pa1,
+               __isl_take isl_pw_aff *pa2);
 
 When multiplying two affine expressions, at least one of the two needs
-to be a constant.
+to be a constant.  Similarly, when dividing an affine expression by another,
+the second expression needs to be a constant.
 
        #include <isl/aff.h>
        __isl_give isl_basic_set *isl_aff_zero_basic_set(

diff --git a/include/isl/aff.h b/include/isl/aff.h
index 3fdae3c..e657fa8 100644 (file)
--- a/include/isl/aff.h
+++ b/include/isl/aff.h
@@ -72,6 +72,8 @@ __isl_give isl_aff *isl_aff_mod(__isl_take isl_aff *aff, isl_int mod);
 
 __isl_give isl_aff *isl_aff_mul(__isl_take isl_aff *aff1,
        __isl_take isl_aff *aff2);
+__isl_give isl_aff *isl_aff_div(__isl_take isl_aff *aff1,
+       __isl_take isl_aff *aff2);
 __isl_give isl_aff *isl_aff_add(__isl_take isl_aff *aff1,
        __isl_take isl_aff *aff2);
 __isl_give isl_aff *isl_aff_sub(__isl_take isl_aff *aff1,
@@ -166,6 +168,8 @@ __isl_give isl_pw_aff *isl_pw_aff_max(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2);
 __isl_give isl_pw_aff *isl_pw_aff_mul(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2);
+__isl_give isl_pw_aff *isl_pw_aff_div(__isl_take isl_pw_aff *pa1,
+       __isl_take isl_pw_aff *pa2);
 __isl_give isl_pw_aff *isl_pw_aff_add(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2);
 __isl_give isl_pw_aff *isl_pw_aff_sub(__isl_take isl_pw_aff *pwaff1,

diff --git a/isl_aff.c b/isl_aff.c
index 329b33e..5251839 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -2203,6 +2203,46 @@ error:
        return NULL;
 }
 
+/* Divide "aff1" by "aff2", assuming "aff2" is a piecewise constant.
+ */
+__isl_give isl_aff *isl_aff_div(__isl_take isl_aff *aff1,
+       __isl_take isl_aff *aff2)
+{
+       int is_cst;
+       int neg;
+
+       is_cst = isl_aff_is_cst(aff2);
+       if (is_cst < 0)
+               goto error;
+       if (!is_cst)
+               isl_die(isl_aff_get_ctx(aff2), isl_error_invalid,
+                       "second argument should be a constant", goto error);
+
+       if (!aff2)
+               goto error;
+
+       neg = isl_int_is_neg(aff2->v->el[1]);
+       if (neg) {
+               isl_int_neg(aff2->v->el[0], aff2->v->el[0]);
+               isl_int_neg(aff2->v->el[1], aff2->v->el[1]);
+       }
+
+       aff1 = isl_aff_scale(aff1, aff2->v->el[0]);
+       aff1 = isl_aff_scale_down(aff1, aff2->v->el[1]);
+
+       if (neg) {
+               isl_int_neg(aff2->v->el[0], aff2->v->el[0]);
+               isl_int_neg(aff2->v->el[1], aff2->v->el[1]);
+       }
+
+       isl_aff_free(aff2);
+       return aff1;
+error:
+       isl_aff_free(aff1);
+       isl_aff_free(aff2);
+       return NULL;
+}
+
 static __isl_give isl_pw_aff *pw_aff_add(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
@@ -2233,6 +2273,33 @@ __isl_give isl_pw_aff *isl_pw_aff_mul(__isl_take isl_pw_aff *pwaff1,
        return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_mul);
 }
 
+static __isl_give isl_pw_aff *pw_aff_div(__isl_take isl_pw_aff *pa1,
+       __isl_take isl_pw_aff *pa2)
+{
+       return isl_pw_aff_on_shared_domain(pa1, pa2, &isl_aff_div);
+}
+
+/* Divide "pa1" by "pa2", assuming "pa2" is a piecewise constant.
+ */
+__isl_give isl_pw_aff *isl_pw_aff_div(__isl_take isl_pw_aff *pa1,
+       __isl_take isl_pw_aff *pa2)
+{
+       int is_cst;
+
+       is_cst = isl_pw_aff_is_cst(pa2);
+       if (is_cst < 0)
+               goto error;
+       if (!is_cst)
+               isl_die(isl_pw_aff_get_ctx(pa2), isl_error_invalid,
+                       "second argument should be a piecewise constant",
+                       goto error);
+       return isl_pw_aff_align_params_pw_pw_and(pa1, pa2, &pw_aff_div);
+error:
+       isl_pw_aff_free(pa1);
+       isl_pw_aff_free(pa2);
+       return NULL;
+}
+
 static __isl_give isl_pw_aff *pw_aff_min(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {