add isl_pw_aff_list_*_set

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

diff --git a/doc/user.pod b/doc/user.pod
index 0ef1e1e..1df5af9 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -2578,12 +2578,33 @@ to be a constant.
                __isl_take isl_pw_aff *pwaff1,
                __isl_take isl_pw_aff *pwaff2);
 
+       __isl_give isl_set *isl_pw_aff_list_eq_set(
+               __isl_take isl_pw_aff_list *list1,
+               __isl_take isl_pw_aff_list *list2);
+       __isl_give isl_set *isl_pw_aff_list_ne_set(
+               __isl_take isl_pw_aff_list *list1,
+               __isl_take isl_pw_aff_list *list2);
+       __isl_give isl_set *isl_pw_aff_list_le_set(
+               __isl_take isl_pw_aff_list *list1,
+               __isl_take isl_pw_aff_list *list2);
+       __isl_give isl_set *isl_pw_aff_list_lt_set(
+               __isl_take isl_pw_aff_list *list1,
+               __isl_take isl_pw_aff_list *list2);
+       __isl_give isl_set *isl_pw_aff_list_ge_set(
+               __isl_take isl_pw_aff_list *list1,
+               __isl_take isl_pw_aff_list *list2);
+       __isl_give isl_set *isl_pw_aff_list_gt_set(
+               __isl_take isl_pw_aff_list *list1,
+               __isl_take isl_pw_aff_list *list2);
+
 The function C<isl_aff_ge_basic_set> returns a basic set
 containing those elements in the shared space
 of C<aff1> and C<aff2> where C<aff1> is greater than or equal to C<aff2>.
 The function C<isl_aff_ge_set> returns a set
 containing those elements in the shared domain
 of C<pwaff1> and C<pwaff2> where C<pwaff1> is greater than or equal to C<pwaff2>.
+The functions operating on C<isl_pw_aff_list> apply the corresponding
+C<isl_pw_aff> function to each pair of elements in the two lists.
 
        #include <isl/aff.h>
        __isl_give isl_set *isl_pw_aff_nonneg_set(

diff --git a/include/isl/aff.h b/include/isl/aff.h
index 2fd1c0b..d981341 100644 (file)
--- a/include/isl/aff.h
+++ b/include/isl/aff.h
@@ -6,6 +6,7 @@
 #include <isl/printer.h>
 #include <isl/set_type.h>
 #include <isl/aff_type.h>
+#include <isl/list.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -173,6 +174,19 @@ __isl_give isl_printer *isl_printer_print_pw_aff(__isl_take isl_printer *p,
        __isl_keep isl_pw_aff *pwaff);
 void isl_pw_aff_dump(__isl_keep isl_pw_aff *pwaff);
 
+__isl_give isl_set *isl_pw_aff_list_eq_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2);
+__isl_give isl_set *isl_pw_aff_list_ne_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2);
+__isl_give isl_set *isl_pw_aff_list_le_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2);
+__isl_give isl_set *isl_pw_aff_list_lt_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2);
+__isl_give isl_set *isl_pw_aff_list_ge_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2);
+__isl_give isl_set *isl_pw_aff_list_gt_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2);
+
 #if defined(__cplusplus)
 }
 #endif

diff --git a/isl_aff.c b/isl_aff.c
index 99ea33e..dc87ad9 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -16,6 +16,7 @@
 #include <isl_dim_private.h>
 #include <isl_local_space_private.h>
 #include <isl_mat_private.h>
+#include <isl_list_private.h>
 #include <isl/constraint.h>
 #include <isl/seq.h>
 #include <isl/set.h>
@@ -1359,6 +1360,91 @@ __isl_give isl_set *isl_pw_aff_lt_set(__isl_take isl_pw_aff *pwaff1,
 }
 
 /* Return a set containing those elements in the shared domain
+ * of the elements of list1 and list2 where each element in list1
+ * has the relation specified by "fn" with each element in list2.
+ */
+static __isl_give isl_set *pw_aff_list_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2,
+       __isl_give isl_set *(*fn)(__isl_take isl_pw_aff *pwaff1,
+                                   __isl_take isl_pw_aff *pwaff2))
+{
+       int i, j;
+       isl_ctx *ctx;
+       isl_set *set;
+
+       if (!list1 || !list2)
+               goto error;
+
+       ctx = isl_pw_aff_list_get_ctx(list1);
+       if (list1->n < 1 || list2->n < 1)
+               isl_die(ctx, isl_error_invalid,
+                       "list should contain at least one element", goto error);
+
+       set = isl_set_universe(isl_pw_aff_get_dim(list1->p[0]));
+       for (i = 0; i < list1->n; ++i)
+               for (j = 0; j < list2->n; ++j) {
+                       isl_set *set_ij;
+
+                       set_ij = fn(isl_pw_aff_copy(list1->p[i]),
+                                   isl_pw_aff_copy(list2->p[j]));
+                       set = isl_set_intersect(set, set_ij);
+               }
+
+       isl_pw_aff_list_free(list1);
+       isl_pw_aff_list_free(list2);
+       return set;
+error:
+       isl_pw_aff_list_free(list1);
+       isl_pw_aff_list_free(list2);
+       return NULL;
+}
+
+/* Return a set containing those elements in the shared domain
+ * of the elements of list1 and list2 where each element in list1
+ * is equal to each element in list2.
+ */
+__isl_give isl_set *isl_pw_aff_list_eq_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2)
+{
+       return pw_aff_list_set(list1, list2, &isl_pw_aff_eq_set);
+}
+
+__isl_give isl_set *isl_pw_aff_list_ne_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2)
+{
+       return pw_aff_list_set(list1, list2, &isl_pw_aff_ne_set);
+}
+
+/* Return a set containing those elements in the shared domain
+ * of the elements of list1 and list2 where each element in list1
+ * is less than or equal to each element in list2.
+ */
+__isl_give isl_set *isl_pw_aff_list_le_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2)
+{
+       return pw_aff_list_set(list1, list2, &isl_pw_aff_le_set);
+}
+
+__isl_give isl_set *isl_pw_aff_list_lt_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2)
+{
+       return pw_aff_list_set(list1, list2, &isl_pw_aff_lt_set);
+}
+
+__isl_give isl_set *isl_pw_aff_list_ge_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2)
+{
+       return pw_aff_list_set(list1, list2, &isl_pw_aff_ge_set);
+}
+
+__isl_give isl_set *isl_pw_aff_list_gt_set(__isl_take isl_pw_aff_list *list1,
+       __isl_take isl_pw_aff_list *list2)
+{
+       return pw_aff_list_set(list1, list2, &isl_pw_aff_gt_set);
+}
+
+
+/* Return a set containing those elements in the shared domain
  * of pwaff1 and pwaff2 where pwaff1 is not equal to pwaff2.
  */
 static __isl_give isl_set *pw_aff_ne_set(__isl_take isl_pw_aff *pwaff1,