add isl_local_space

Local spaces should hopefully replaced the duplicate functionality
in basic sets and quasi-polynomials.
In a later commit, we will start by using it in affine expressions.

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

diff --git a/Makefile.am b/Makefile.am
index f9f17bb..9e66564 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,8 @@ libisl_la_SOURCES = \
        isl_ilp.c \
        isl_input.c \
        isl_list.c \
+       isl_local_space_private.h \
+       isl_local_space.c \
        isl_lp.c \
        isl_lp_piplib.h \
        isl_map.c \
@@ -190,6 +192,7 @@ pkginclude_HEADERS = \
        include/isl/int.h \
        include/isl/hash.h \
        include/isl/list.h \
+       include/isl/local_space.h \
        include/isl/lp.h \
        include/isl/mat.h \
        include/isl/map.h \

diff --git a/doc/user.pod b/doc/user.pod
index d8f1be4..a0b3547 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -559,6 +559,45 @@ specifications using the following functions.
 Note that if dimensions are added or removed from a space, then
 the name and the internal structure are lost.
 
+=head2 Local Spaces
+
+A local space is essentially a dimension specification with
+zero or more existentially quantified variables.
+The local space of a basic set or relation can be obtained
+using the following functions.
+
+       #include <isl/set.h>
+       __isl_give isl_local_space *isl_basic_set_get_local_space(
+               __isl_keep isl_basic_set *bset);
+
+       #include <isl/map.h>
+       __isl_give isl_local_space *isl_basic_map_get_local_space(
+               __isl_keep isl_basic_map *bmap);
+
+A new local space can be created from a dimension specification using
+
+       #include <isl/local_space.h>
+       __isl_give isl_local_space *isl_local_space_from_dim(
+               __isl_take isl_dim *dim);
+
+They can be inspected, copied and freed using the following functions.
+
+       #include <isl/local_space.h>
+       isl_ctx *isl_local_space_get_ctx(
+               __isl_keep isl_local_space *ls);
+       int isl_local_space_dim(__isl_keep isl_local_space *ls,
+               enum isl_dim_type type);
+       const char *isl_local_space_get_dim_name(
+               __isl_keep isl_local_space *ls,
+               enum isl_dim_type type, unsigned pos);
+       __isl_give isl_dim *isl_local_space_get_dim(
+               __isl_keep isl_local_space *ls);
+       __isl_give isl_div *isl_local_space_get_div(
+               __isl_keep isl_local_space *ls, int pos);
+       __isl_give isl_local_space *isl_local_space_copy(
+               __isl_keep isl_local_space *ls);
+       void *isl_local_space_free(__isl_take isl_local_space *ls);
+
 =head2 Input and Output
 
 C<isl> supports its own input/output format, which is similar

diff --git a/include/isl/local_space.h b/include/isl/local_space.h
new file mode 100644 (file)
index 0000000..24c02b5
--- /dev/null
+++ b/include/isl/local_space.h
@@ -0,0 +1,38 @@
+#ifndef ISL_LOCAL_SPACE_H
+#define ISL_LOCAL_SPACE_H
+
+#include <isl/div.h>
+#include <isl/printer.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+struct isl_local_space;
+typedef struct isl_local_space isl_local_space;
+
+isl_ctx *isl_local_space_get_ctx(__isl_keep isl_local_space *ls);
+
+__isl_give isl_local_space *isl_local_space_from_dim(__isl_take isl_dim *dim);
+
+__isl_give isl_local_space *isl_local_space_copy(
+       __isl_keep isl_local_space *ls);
+void *isl_local_space_free(__isl_take isl_local_space *ls);
+
+int isl_local_space_dim(__isl_keep isl_local_space *ls,
+       enum isl_dim_type type);
+const char *isl_local_space_get_dim_name(__isl_keep isl_local_space *ls,
+       enum isl_dim_type type, unsigned pos);
+__isl_give isl_dim *isl_local_space_get_dim(__isl_keep isl_local_space *ls);
+__isl_give isl_div *isl_local_space_get_div(__isl_keep isl_local_space *ls,
+       int pos);
+
+__isl_give isl_printer *isl_printer_print_local_space(__isl_take isl_printer *p,
+       __isl_keep isl_local_space *ls);
+void isl_local_space_dump(__isl_keep isl_local_space *ls);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif

diff --git a/include/isl/map.h b/include/isl/map.h
index 7802f4e..530152a 100644 (file)
--- a/include/isl/map.h
+++ b/include/isl/map.h
@@ -20,6 +20,7 @@
 #include <isl/vec.h>
 #include <isl/mat.h>
 #include <isl/printer.h>
+#include <isl/local_space.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -72,6 +73,9 @@ __isl_give isl_dim *isl_map_get_dim(__isl_keep isl_map *map);
 
 struct isl_div *isl_basic_map_div(struct isl_basic_map *bmap, int pos);
 
+__isl_give isl_local_space *isl_basic_map_get_local_space(
+       __isl_keep isl_basic_map *bmap);
+
 __isl_give isl_basic_map *isl_basic_map_set_tuple_name(
        __isl_take isl_basic_map *bmap, enum isl_dim_type type, const char *s);
 const char *isl_basic_map_get_tuple_name(__isl_keep isl_basic_map *bmap,

diff --git a/include/isl/set.h b/include/isl/set.h
index 7f9402a..e50a77c 100644 (file)
--- a/include/isl/set.h
+++ b/include/isl/set.h
@@ -13,6 +13,7 @@
 #include <isl/map.h>
 #include <isl/list.h>
 #include <isl/point.h>
+#include <isl/local_space.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -37,6 +38,9 @@ __isl_give isl_set *isl_set_reset_dim(__isl_take isl_set *set,
 
 struct isl_div *isl_basic_set_div(struct isl_basic_set *bset, int pos);
 
+__isl_give isl_local_space *isl_basic_set_get_local_space(
+       __isl_keep isl_basic_set *bset);
+
 const char *isl_basic_set_get_tuple_name(__isl_keep isl_basic_set *bset);
 const char *isl_set_get_tuple_name(__isl_keep isl_set *set);
 __isl_give isl_set *isl_set_set_tuple_name(__isl_take isl_set *set,

diff --git a/isl_local_space.c b/isl_local_space.c
new file mode 100644 (file)
index 0000000..a2d6fca
--- /dev/null
+++ b/isl_local_space.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2011      INRIA Saclay
+ *
+ * Use of this software is governed by the GNU LGPLv2.1 license
+ *
+ * Written by Sven Verdoolaege, INRIA Saclay - Ile-de-France,
+ * Parc Club Orsay Universite, ZAC des vignes, 4 rue Jacques Monod,
+ * 91893 Orsay, France
+ */
+
+#include <isl_map_private.h>
+#include <isl_local_space_private.h>
+#include <isl_dim_private.h>
+#include <isl_mat_private.h>
+#include <isl/seq.h>
+
+isl_ctx *isl_local_space_get_ctx(__isl_keep isl_local_space *ls)
+{
+       return ls ? ls->dim->ctx : NULL;
+}
+
+__isl_give isl_local_space *isl_local_space_alloc_div(__isl_take isl_dim *dim,
+       __isl_take isl_mat *div)
+{
+       isl_ctx *ctx;
+       isl_local_space *ls = NULL;
+
+       if (!dim)
+               goto error;
+
+       ctx = isl_dim_get_ctx(dim);
+       ls = isl_calloc_type(ctx, struct isl_local_space);
+       if (!ls)
+               goto error;
+
+       ls->ref = 1;
+       ls->dim = dim;
+       ls->div = div;
+
+       return ls;
+error:
+       isl_dim_free(dim);
+       isl_local_space_free(ls);
+       return NULL;
+}
+
+__isl_give isl_local_space *isl_local_space_alloc(__isl_take isl_dim *dim,
+       unsigned n_div)
+{
+       isl_ctx *ctx;
+       isl_mat *div;
+       unsigned total;
+
+       if (!dim)
+               return NULL;
+
+       total = isl_dim_total(dim);
+
+       ctx = isl_dim_get_ctx(dim);
+       div = isl_mat_alloc(ctx, n_div, 1 + 1 + total + n_div);
+       return isl_local_space_alloc_div(dim, div);
+}
+
+__isl_give isl_local_space *isl_local_space_from_dim(__isl_take isl_dim *dim)
+{
+       return isl_local_space_alloc(dim, 0);
+}
+
+__isl_give isl_local_space *isl_local_space_copy(__isl_keep isl_local_space *ls)
+{
+       if (!ls)
+               return NULL;
+
+       ls->ref++;
+       return ls;
+}
+
+__isl_give isl_local_space *isl_local_space_dup(__isl_keep isl_local_space *ls)
+{
+       isl_local_space *dup;
+
+       if (!ls)
+               return NULL;
+
+       return isl_local_space_alloc_div(isl_dim_copy(ls->dim),
+                                        isl_mat_copy(ls->div));
+
+}
+
+__isl_give isl_local_space *isl_local_space_cow(__isl_take isl_local_space *ls)
+{
+       if (!ls)
+               return NULL;
+
+       if (ls->ref == 1)
+               return ls;
+       ls->ref--;
+       return isl_local_space_dup(ls);
+}
+
+void *isl_local_space_free(__isl_take isl_local_space *ls)
+{
+       if (!ls)
+               return NULL;
+
+       if (--ls->ref > 0)
+               return NULL;
+
+       isl_dim_free(ls->dim);
+       isl_mat_free(ls->div);
+
+       free(ls);
+
+       return NULL;
+}
+
+int isl_local_space_dim(__isl_keep isl_local_space *ls,
+       enum isl_dim_type type)
+{
+       if (!ls)
+               return 0;
+       if (type == isl_dim_div)
+               return ls->div->n_row;
+       if (type == isl_dim_all)
+               return isl_dim_size(ls->dim, isl_dim_all) + ls->div->n_row;
+       return isl_dim_size(ls->dim, type);
+}
+
+unsigned isl_local_space_offset(__isl_keep isl_local_space *ls,
+       enum isl_dim_type type)
+{
+       isl_dim *dim;
+
+       if (!ls)
+               return 0;
+
+       dim = ls->dim;
+       switch (type) {
+       case isl_dim_cst:       return 0;
+       case isl_dim_param:     return 1;
+       case isl_dim_in:        return 1 + dim->nparam;
+       case isl_dim_out:       return 1 + dim->nparam + dim->n_in;
+       case isl_dim_div:       return 1 + dim->nparam + dim->n_in + dim->n_out;
+       default:                return 0;
+       }
+}
+
+const char *isl_local_space_get_dim_name(__isl_keep isl_local_space *ls,
+       enum isl_dim_type type, unsigned pos)
+{
+       return ls ? isl_dim_get_name(ls->dim, type, pos) : NULL;
+}
+
+__isl_give isl_div *isl_local_space_get_div(__isl_keep isl_local_space *ls,
+       int pos)
+{
+       isl_basic_map *bmap;
+
+       if (!ls)
+               return NULL;
+
+       if (pos < 0 || pos >= ls->div->n_row)
+               isl_die(isl_local_space_get_ctx(ls), isl_error_invalid,
+                       "index out of bounds", return NULL);
+
+       bmap = isl_basic_map_from_local_space(isl_local_space_copy(ls));
+       return isl_basic_map_div(bmap, pos);
+}
+
+__isl_give isl_dim *isl_local_space_get_dim(__isl_keep isl_local_space *ls)
+{
+       if (!ls)
+               return NULL;
+
+       return isl_dim_copy(ls->dim);
+}
+
+__isl_give isl_local_space *isl_local_space_add_div(
+       __isl_take isl_local_space *ls, __isl_take isl_vec *div)
+{
+       ls = isl_local_space_cow(ls);
+       if (!ls || !div)
+               goto error;
+
+       if (ls->div->n_col != div->size)
+               isl_die(isl_local_space_get_ctx(ls), isl_error_invalid,
+                       "incompatible dimensions", goto error);
+
+       ls->div = isl_mat_add_zero_cols(ls->div, 1);
+       ls->div = isl_mat_add_rows(ls->div, 1);
+       if (!ls->div)
+               goto error;
+
+       isl_seq_cpy(ls->div->row[ls->div->n_row - 1], div->el, div->size);
+       isl_int_set_si(ls->div->row[ls->div->n_row - 1][div->size], 0);
+
+       isl_vec_free(div);
+       return ls;
+error:
+       isl_local_space_free(ls);
+       isl_vec_free(div);
+       return NULL;
+}
+
+__isl_give isl_local_space *isl_local_space_replace_divs(
+       __isl_take isl_local_space *ls, __isl_take isl_mat *div)
+{
+       ls = isl_local_space_cow(ls);
+
+       if (!ls || !div)
+               goto error;
+
+       isl_mat_free(ls->div);
+       ls->div = div;
+       return ls;
+error:
+       isl_mat_free(div);
+       isl_local_space_free(ls);
+       return NULL;
+}

diff --git a/isl_local_space_private.h b/isl_local_space_private.h
new file mode 100644 (file)
index 0000000..b77d091
--- /dev/null
+++ b/isl_local_space_private.h
@@ -0,0 +1,27 @@
+#ifndef ISL_LOCAL_SPACE_PRIVATE_H
+#define ISL_LOCAL_SPACE_PRIVATE_H
+
+#include <isl/div.h>
+#include <isl/mat.h>
+#include <isl/local_space.h>
+
+struct isl_local_space {
+       int ref;
+
+       isl_dim *dim;
+       isl_mat *div;
+};
+
+__isl_give isl_local_space *isl_local_space_alloc(__isl_take isl_dim *dim,
+       unsigned n_div);
+
+__isl_give isl_local_space *isl_local_space_add_div(
+       __isl_take isl_local_space *ls, __isl_take isl_vec *div);
+
+unsigned isl_local_space_offset(__isl_keep isl_local_space *ls,
+       enum isl_dim_type type);
+
+__isl_give isl_local_space *isl_local_space_replace_divs(
+       __isl_take isl_local_space *ls, __isl_take isl_mat *div);
+
+#endif

diff --git a/isl_map.c b/isl_map.c
index 70af1c8..d64f231 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -29,6 +29,7 @@
 #include <isl/vec.h>
 #include <isl_mat_private.h>
 #include <isl_dim_map.h>
+#include <isl_local_space_private.h>
 
 static unsigned n(struct isl_dim *dim, enum isl_dim_type type)
 {
@@ -253,6 +254,72 @@ struct isl_dim *isl_basic_set_get_dim(struct isl_basic_set *bset)
        return isl_dim_copy(bset->dim);
 }
 
+__isl_give isl_local_space *isl_basic_map_get_local_space(
+       __isl_keep isl_basic_map *bmap)
+{
+       int i;
+       isl_local_space *ls;
+       unsigned total;
+
+       if (!bmap)
+               return NULL;
+
+       total = isl_basic_map_total_dim(bmap);
+       ls = isl_local_space_alloc(isl_dim_copy(bmap->dim), bmap->n_div);
+       if (!ls)
+               return NULL;
+
+       for (i = 0; i < bmap->n_div; ++i)
+               isl_seq_cpy(ls->div->row[i], bmap->div[i], 2 + total);
+
+       return ls;
+}
+
+__isl_give isl_local_space *isl_basic_set_get_local_space(
+       __isl_keep isl_basic_set *bset)
+{
+       return isl_basic_map_get_local_space(bset);
+}
+
+__isl_give isl_basic_map *isl_basic_map_from_local_space(
+       __isl_take isl_local_space *ls)
+{
+       int i;
+       int n_div;
+       isl_basic_map *bmap;
+
+       if (!ls)
+               return NULL;
+
+       n_div = isl_local_space_dim(ls, isl_dim_div);
+       bmap = isl_basic_map_alloc_dim(isl_local_space_get_dim(ls),
+                                       n_div, 0, 2 * n_div);
+
+       for (i = 0; i < n_div; ++i)
+               if (isl_basic_map_alloc_div(bmap) < 0)
+                       goto error;
+
+       for (i = 0; i < n_div; ++i) {
+               isl_seq_cpy(bmap->div[i], ls->div->row[i], ls->div->n_col);
+               if (isl_basic_map_add_div_constraints(bmap, i) < 0)
+                       goto error;
+       }
+                                       
+       isl_local_space_free(ls);
+       bmap = isl_basic_map_finalize(bmap);
+       return bmap;
+error:
+       isl_local_space_free(ls);
+       isl_basic_map_free(bmap);
+       return NULL;
+}
+
+__isl_give isl_basic_set *isl_basic_set_from_local_space(
+       __isl_take isl_local_space *ls)
+{
+       return isl_basic_map_from_local_space(ls);
+}
+
 struct isl_dim *isl_map_get_dim(struct isl_map *map)
 {
        if (!map)

diff --git a/isl_map_private.h b/isl_map_private.h
index 7dbd67d..a2d9089 100644 (file)
--- a/isl_map_private.h
+++ b/isl_map_private.h
@@ -293,4 +293,9 @@ int isl_basic_set_add_div_constraints_var(__isl_keep isl_basic_set *bset,
 int isl_basic_map_is_div_constraint(__isl_keep isl_basic_map *bmap,
        isl_int *constraint, unsigned div);
 
+__isl_give isl_basic_set *isl_basic_set_from_local_space(
+       __isl_take isl_local_space *ls);
+__isl_give isl_basic_map *isl_basic_map_from_local_space(
+       __isl_take isl_local_space *ls);
+
 #endif

diff --git a/isl_output.c b/isl_output.c
index 274582e..f736745 100644 (file)
--- a/isl_output.c
+++ b/isl_output.c
@@ -22,6 +22,7 @@
 #include <isl_mat_private.h>
 #include <isl/union_map.h>
 #include <isl/constraint.h>
+#include <isl_local_space_private.h>
 
 static const char *s_to[2] = { " -> ", " \\to " };
 static const char *s_and[2] = { " and ", " \\wedge " };
@@ -2116,3 +2117,61 @@ void isl_constraint_dump(__isl_keep isl_constraint *c)
 
        isl_printer_free(printer);
 }
+
+__isl_give isl_printer *isl_printer_print_local_space(__isl_take isl_printer *p,
+       __isl_keep isl_local_space *ls)
+{
+       unsigned total;
+       unsigned n_div;
+
+       if (!ls)
+               goto error;
+
+       total = isl_local_space_dim(ls, isl_dim_all);
+       if (isl_local_space_dim(ls, isl_dim_param) > 0) {
+               p = print_tuple(ls->dim, p, isl_dim_param, 0, 0, NULL);
+               p = isl_printer_print_str(p, " -> ");
+       }
+       p = isl_printer_print_str(p, "{ ");
+       p = print_tuple(ls->dim, p, isl_dim_in, 0, 0, NULL);
+       p = isl_printer_print_str(p, " -> ");
+       p = print_tuple(ls->dim, p, isl_dim_out, 0, 0, NULL);
+       n_div = isl_local_space_dim(ls, isl_dim_div);
+       if (n_div > 0) {
+               int i;
+               p = isl_printer_print_str(p, " : ");
+               p = isl_printer_print_str(p, s_open_exists[0]);
+               for (i = 0; i < n_div; ++i) {
+                       if (i)
+                               p = isl_printer_print_str(p, ", ");
+                       p = print_name(ls->dim, p, isl_dim_div, i, 0, 0);
+                       if (isl_int_is_zero(ls->div->row[i][0]))
+                               continue;
+                       p = isl_printer_print_str(p, " = [(");
+                       p = print_affine_of_len(ls->dim, ls->div, p,
+                                           ls->div->row[i] + 1, 1 + total, 0);
+                       p = isl_printer_print_str(p, ")/");
+                       p = isl_printer_print_isl_int(p, ls->div->row[i][0]);
+                       p = isl_printer_print_str(p, "]");
+               }
+       }
+       p = isl_printer_print_str(p, " }");
+       return p;
+error:
+       isl_printer_free(p);
+       return NULL;
+}
+
+void isl_local_space_dump(__isl_keep isl_local_space *ls)
+{
+       isl_printer *printer;
+
+       if (!ls)
+               return;
+
+       printer = isl_printer_to_file(isl_local_space_get_ctx(ls), stderr);
+       printer = isl_printer_print_local_space(printer, ls);
+       printer = isl_printer_end_line(printer);
+
+       isl_printer_free(printer);
+}