Merge branch 'maint'

[platform/upstream/isl.git] / isl_aff.c

diff --git a/isl_aff.c b/isl_aff.c
index fd8d8ca..846556d 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -1040,10 +1040,13 @@ __isl_give isl_aff *isl_aff_gist_params(__isl_take isl_aff *aff,
 __isl_give isl_basic_set *isl_aff_nonneg_basic_set(__isl_take isl_aff *aff)
 {
        isl_constraint *ineq;
+       isl_basic_set *bset;
 
        ineq = isl_inequality_from_aff(aff);
 
-       return isl_basic_set_from_constraint(ineq);
+       bset = isl_basic_set_from_constraint(ineq);
+       bset = isl_basic_set_simplify(bset);
+       return bset;
 }
 
 /* Return a basic set containing those elements in the space
@@ -1052,10 +1055,13 @@ __isl_give isl_basic_set *isl_aff_nonneg_basic_set(__isl_take isl_aff *aff)
 __isl_give isl_basic_set *isl_aff_zero_basic_set(__isl_take isl_aff *aff)
 {
        isl_constraint *ineq;
+       isl_basic_set *bset;
 
        ineq = isl_equality_from_aff(aff);
 
-       return isl_basic_set_from_constraint(ineq);
+       bset = isl_basic_set_from_constraint(ineq);
+       bset = isl_basic_set_simplify(bset);
+       return bset;
 }
 
 /* Return a basic set containing those elements in the shared space
@@ -1173,6 +1179,30 @@ __isl_give isl_aff *isl_aff_drop_dims(__isl_take isl_aff *aff,
        return aff;
 }
 
+/* Project the domain of the affine expression onto its parameter space.
+ * The affine expression may not involve any of the domain dimensions.
+ */
+__isl_give isl_aff *isl_aff_project_domain_on_params(__isl_take isl_aff *aff)
+{
+       isl_space *space;
+       unsigned n;
+       int involves;
+
+       n = isl_aff_dim(aff, isl_dim_in);
+       involves = isl_aff_involves_dims(aff, isl_dim_in, 0, n);
+       if (involves < 0)
+               return isl_aff_free(aff);
+       if (involves)
+               isl_die(isl_aff_get_ctx(aff), isl_error_invalid,
+                   "affine expression involves some of the domain dimensions",
+                   return isl_aff_free(aff));
+       aff = isl_aff_drop_dims(aff, isl_dim_in, 0, n);
+       space = isl_aff_get_domain_space(aff);
+       space = isl_space_params(space);
+       aff = isl_aff_reset_domain_space(aff, space);
+       return aff;
+}
+
 __isl_give isl_aff *isl_aff_insert_dims(__isl_take isl_aff *aff,
        enum isl_dim_type type, unsigned first, unsigned n)
 {
@@ -1501,9 +1531,11 @@ __isl_give isl_set *isl_pw_aff_nonneg_set(__isl_take isl_pw_aff *pwaff)
 }
 
 /* Return a set containing those elements in the domain
- * of pwaff where it is zero.
+ * of pwaff where it is zero (if complement is 0) or not zero
+ * (if complement is 1).
  */
-__isl_give isl_set *isl_pw_aff_zero_set(__isl_take isl_pw_aff *pwaff)
+static __isl_give isl_set *pw_aff_zero_set(__isl_take isl_pw_aff *pwaff,
+       int complement)
 {
        int i;
        isl_set *set;
@@ -1515,11 +1547,15 @@ __isl_give isl_set *isl_pw_aff_zero_set(__isl_take isl_pw_aff *pwaff)
 
        for (i = 0; i < pwaff->n; ++i) {
                isl_basic_set *bset;
-               isl_set *set_i;
+               isl_set *set_i, *zero;
 
                bset = isl_aff_zero_basic_set(isl_aff_copy(pwaff->p[i].aff));
-               set_i = isl_set_from_basic_set(bset);
-               set_i = isl_set_intersect(set_i, isl_set_copy(pwaff->p[i].set));
+               zero = isl_set_from_basic_set(bset);
+               set_i = isl_set_copy(pwaff->p[i].set);
+               if (complement)
+                       set_i = isl_set_subtract(set_i, zero);
+               else
+                       set_i = isl_set_intersect(set_i, zero);
                set = isl_set_union_disjoint(set, set_i);
        }
 
@@ -1529,11 +1565,19 @@ __isl_give isl_set *isl_pw_aff_zero_set(__isl_take isl_pw_aff *pwaff)
 }
 
 /* Return a set containing those elements in the domain
+ * of pwaff where it is zero.
+ */
+__isl_give isl_set *isl_pw_aff_zero_set(__isl_take isl_pw_aff *pwaff)
+{
+       return pw_aff_zero_set(pwaff, 0);
+}
+
+/* Return a set containing those elements in the domain
  * of pwaff where it is not zero.
  */
 __isl_give isl_set *isl_pw_aff_non_zero_set(__isl_take isl_pw_aff *pwaff)
 {
-       return isl_set_complement(isl_pw_aff_zero_set(pwaff));
+       return pw_aff_zero_set(pwaff, 1);
 }
 
 /* Return a set containing those elements in the shared domain
@@ -2123,6 +2167,16 @@ __isl_give isl_multi_aff *isl_multi_aff_drop_dims(__isl_take isl_multi_aff *maff
        maff->space = isl_space_drop_dims(maff->space, type, first, n);
        if (!maff->space)
                return isl_multi_aff_free(maff);
+
+       if (type == isl_dim_out) {
+               for (i = 0; i < n; ++i)
+                       isl_aff_free(maff->p[first + i]);
+               for (i = first; i + n < maff->n; ++i)
+                       maff->p[i] = maff->p[i + n];
+               maff->n -= n;
+               return 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])