add isl_set_indicator_function

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

diff --git a/isl_flow.c b/isl_flow.c
index 08b173b..2678f0f 100644 (file)
--- a/isl_flow.c
+++ b/isl_flow.c
@@ -32,14 +32,22 @@ struct isl_labeled_map {
  * - n_must + n_may (<= max_source) sources
  * - a function for determining the relative order of sources and sink
  * The must sources are placed before the may sources.
+ *
+ * domain_map is an auxiliary map that maps the sink access relation
+ * to the domain of this access relation.
+ *
+ * restrict_sources is a callback that (if not NULL) will be called
+ * right before any lexicographical maximization.
  */
 struct isl_access_info {
-       struct isl_labeled_map  sink;
-       isl_access_level_before level_before;
-       int                     max_source;
-       int                     n_must;
-       int                     n_may;
-       struct isl_labeled_map  source[1];
+       isl_map                         *domain_map;
+       struct isl_labeled_map          sink;
+       isl_access_level_before         level_before;
+       isl_access_restrict_sources     restrict_sources;
+       int                             max_source;
+       int                             n_must;
+       int                             n_may;
+       struct isl_labeled_map          source[1];
 };
 
 /* A structure containing the output of dependence analysis:
@@ -69,7 +77,7 @@ __isl_give isl_access_info *isl_access_info_alloc(__isl_take isl_map *sink,
        ctx = isl_map_get_ctx(sink);
        isl_assert(ctx, max_source >= 0, goto error);
 
-       acc = isl_alloc(ctx, struct isl_access_info,
+       acc = isl_calloc(ctx, struct isl_access_info,
                        sizeof(struct isl_access_info) +
                        (max_source - 1) * sizeof(struct isl_labeled_map));
        if (!acc)
@@ -96,6 +104,7 @@ void isl_access_info_free(__isl_take isl_access_info *acc)
 
        if (!acc)
                return;
+       isl_map_free(acc->domain_map);
        isl_map_free(acc->sink.map);
        for (i = 0; i < acc->n_must + acc->n_may; ++i)
                isl_map_free(acc->source[i].map);
@@ -107,6 +116,15 @@ isl_ctx *isl_access_info_get_ctx(__isl_keep isl_access_info *acc)
        return acc ? isl_map_get_ctx(acc->sink.map) : NULL;
 }
 
+__isl_give isl_access_info *isl_access_info_set_restrict_sources(
+       __isl_take isl_access_info *acc, isl_access_restrict_sources fn)
+{
+       if (!acc)
+               return NULL;
+       acc->restrict_sources = fn;
+       return acc;
+}
+
 /* Add another source to an isl_access_info structure, making
  * sure the "must" sources are placed before the "may" sources.
  * This function may be called at most max_source times on a
@@ -400,6 +418,32 @@ static __isl_give isl_map *after_at_level(__isl_take isl_space *dim, int level)
        return isl_map_from_basic_map(bmap);
 }
 
+/* Check if the user has set acc->restrict_sources and if so
+ * intersect the range of "dep" with the result of a call to this function.
+ *
+ * Since the user expects a mapping from sink iterations to source iterations,
+ * whereas the domain of "dep" is a wrapped map, mapping sink iterations
+ * to accessed array elements, we first need to project out the accessed
+ * sink array elements by applying acc->domain_map.
+ */
+static __isl_give isl_map *restrict_sources(__isl_take isl_map *dep,
+       struct isl_access_info *acc, int source)
+{
+       isl_map *source_map;
+       isl_set *param;
+
+       if (!acc->restrict_sources)
+               return dep;
+
+       source_map = isl_map_copy(dep);
+       source_map = isl_map_apply_domain(source_map,
+                                           isl_map_copy(acc->domain_map));
+       param = acc->restrict_sources(source_map, acc->sink.data,
+                                   acc->source[source].data);
+       dep = isl_map_intersect_range(dep, param);
+       return dep;
+}
+
 /* Compute the last iteration of must source j that precedes the sink
  * at the given level for sink iterations in set_C.
  * The subset of set_C for which no such iteration can be found is returned
@@ -421,6 +465,7 @@ static struct isl_map *last_source(struct isl_access_info *acc,
        dep_map = isl_map_apply_range(read_map, write_map);
        after = after_at_level(isl_map_get_space(dep_map), level);
        dep_map = isl_map_intersect(dep_map, after);
+       dep_map = restrict_sources(dep_map, acc, j);
        result = isl_map_partial_lexmax(dep_map, set_C, empty);
        result = isl_map_reverse(result);
 
@@ -462,6 +507,7 @@ static struct isl_map *last_later_source(struct isl_access_info *acc,
        dep_map = isl_map_intersect(dep_map, after_write);
        before_read = after_at_level(isl_map_get_space(dep_map), before_level);
        dep_map = isl_map_intersect(dep_map, before_read);
+       dep_map = restrict_sources(dep_map, acc, k);
        result = isl_map_partial_lexmax(dep_map, set_C, empty);
        result = isl_map_reverse(result);
 
@@ -891,12 +937,11 @@ __isl_give isl_flow *isl_access_info_compute_flow(__isl_take isl_access_info *ac
 {
        int j;
        struct isl_flow *res = NULL;
-       isl_map *domain_map = NULL;
 
        if (!acc)
                return NULL;
 
-       domain_map = isl_map_domain_map(isl_map_copy(acc->sink.map));
+       acc->domain_map = isl_map_domain_map(isl_map_copy(acc->sink.map));
        acc->sink.map = isl_map_range_map(acc->sink.map);
        if (!acc->sink.map)
                goto error;
@@ -912,18 +957,16 @@ __isl_give isl_flow *isl_access_info_compute_flow(__isl_take isl_access_info *ac
 
        for (j = 0; j < res->n_source; ++j) {
                res->dep[j].map = isl_map_apply_range(res->dep[j].map,
-                                       isl_map_copy(domain_map));
+                                       isl_map_copy(acc->domain_map));
                if (!res->dep[j].map)
                        goto error;
        }
        if (!res->must_no_source || !res->may_no_source)
                goto error;
 
-       isl_map_free(domain_map);
        isl_access_info_free(acc);
        return res;
 error:
-       isl_map_free(domain_map);
        isl_access_info_free(acc);
        isl_flow_free(res);
        return NULL;