isl_pw_templ.c: rename align_params_pw_pw_and to include PW

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

diff --git a/isl_aff.c b/isl_aff.c
index 6533468..3379d01 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -862,6 +862,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
@@ -1159,17 +1182,6 @@ __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_space *dim;
-
-       dim = isl_pw_aff_get_space(pwaff);
-       dim = isl_space_set_tuple_id(dim, isl_dim_in, id);
-
-       return isl_pw_aff_reset_space(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_domain_space(aff));
@@ -1318,7 +1330,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
@@ -1336,7 +1349,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,
@@ -1840,7 +1854,7 @@ error:
 __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,
@@ -1856,7 +1870,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,
@@ -1872,7 +1886,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(