add tile_shift_point_loops option

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

diff --git a/doc/user.pod b/doc/user.pod
index 5864d46..d7d83ab 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -5111,6 +5111,9 @@ A band can be tiled using the following function.
        int isl_options_set_tile_scale_tile_loops(isl_ctx *ctx,
                int val);
        int isl_options_get_tile_scale_tile_loops(isl_ctx *ctx);
+       int isl_options_set_tile_shift_point_loops(isl_ctx *ctx,
+               int val);
+       int isl_options_get_tile_shift_point_loops(isl_ctx *ctx);
 
 The C<isl_band_tile> function tiles the band using the given tile sizes
 inside its schedule.
@@ -5118,6 +5121,8 @@ A new child band is created to represent the point loops and it is
 inserted between the modified band and its children.
 The C<tile_scale_tile_loops> option specifies whether the tile
 loops iterators should be scaled by the tile sizes.
+If the C<tile_shift_point_loops> option is set, then the point loops
+are shifted to start at zero.
 
 A representation of the band can be printed using
 

diff --git a/include/isl/band.h b/include/isl/band.h
index e7bf51c..b0809a8 100644 (file)
--- a/include/isl/band.h
+++ b/include/isl/band.h
@@ -31,6 +31,8 @@ __isl_give isl_union_map *isl_band_get_suffix_schedule(
 
 int isl_options_set_tile_scale_tile_loops(isl_ctx *ctx, int val);
 int isl_options_get_tile_scale_tile_loops(isl_ctx *ctx);
+int isl_options_set_tile_shift_point_loops(isl_ctx *ctx, int val);
+int isl_options_get_tile_shift_point_loops(isl_ctx *ctx);
 
 int isl_band_tile(__isl_keep isl_band *band, __isl_take isl_vec *sizes);
 

diff --git a/isl_band.c b/isl_band.c
index e545a8a..0f8f6c4 100644 (file)
--- a/isl_band.c
+++ b/isl_band.c
@@ -1,11 +1,13 @@
 /*
  * Copyright 2011      INRIA Saclay
+ * Copyright 2012-2013 Ecole Normale Superieure
  *
  * Use of this software is governed by the MIT license
  *
  * Written by Sven Verdoolaege, INRIA Saclay - Ile-de-France,
  * Parc Club Orsay Universite, ZAC des vignes, 4 rue Jacques Monod,
  * 91893 Orsay, France
+ * and Ecole Normale Superieure, 45 rue d'Ulm, 75230 Paris, France
  */
 
 #include <isl_band_private.h>
@@ -445,13 +447,26 @@ error:
  * a child band is created to refer to the point loops.
  * The children of this point loop band are the children
  * of the original band.
+ *
+ * If the scale tile loops option is set, then the tile loops
+ * are scaled by the tile sizes.  If the shift point loops option is set,
+ * then the point loops are shifted to start at zero.
+ * In particular, these options affect the tile and point loop schedules
+ * as follows
+ *
+ *     scale   shift   original        tile            point
+ *
+ *     0       0       i               floor(i/s)      i
+ *     1       0       i               s * floor(i/s)  i
+ *     0       1       i               floor(i/s)      i - s * floor(i/s)
+ *     1       1       i               s * floor(i/s)  i - s * floor(i/s)
  */
 int isl_band_tile(__isl_keep isl_band *band, __isl_take isl_vec *sizes)
 {
        isl_ctx *ctx;
        isl_band *child;
        isl_band_list *list = NULL;
-       isl_union_pw_multi_aff *sched;
+       isl_union_pw_multi_aff *sched = NULL, *child_sched = NULL;
 
        if (!band || !sizes)
                goto error;
@@ -465,7 +480,17 @@ int isl_band_tile(__isl_keep isl_band *band, __isl_take isl_vec *sizes)
 
        sched = isl_union_pw_multi_aff_copy(band->pma);
        sched = isl_union_pw_multi_aff_tile(sched, sizes);
-       if (!sched)
+
+       child_sched = isl_union_pw_multi_aff_copy(child->pma);
+       if (isl_options_get_tile_shift_point_loops(ctx)) {
+               isl_union_pw_multi_aff *scaled;
+               scaled = isl_union_pw_multi_aff_copy(sched);
+               if (!isl_options_get_tile_scale_tile_loops(ctx))
+                       scaled = isl_union_pw_multi_aff_scale_vec(scaled,
+                                                       isl_vec_copy(sizes));
+               child_sched = isl_union_pw_multi_aff_sub(child_sched, scaled);
+       }
+       if (!sched || !child_sched)
                goto error;
 
        child->children = band->children;
@@ -473,10 +498,14 @@ int isl_band_tile(__isl_keep isl_band *band, __isl_take isl_vec *sizes)
        child->parent = band;
        isl_union_pw_multi_aff_free(band->pma);
        band->pma = sched;
+       isl_union_pw_multi_aff_free(child->pma);
+       child->pma = child_sched;
 
        isl_vec_free(sizes);
        return 0;
 error:
+       isl_union_pw_multi_aff_free(sched);
+       isl_union_pw_multi_aff_free(child_sched);
        isl_band_list_free(list);
        isl_vec_free(sizes);
        return -1;

diff --git a/isl_options.c b/isl_options.c
index 1391f5a..4e5946a 100644 (file)
--- a/isl_options.c
+++ b/isl_options.c
@@ -176,6 +176,8 @@ ISL_ARG_CHOICE(struct isl_options, schedule_fuse, 0, "schedule-fuse", fuse,
        ISL_SCHEDULE_FUSE_MAX, "level of fusion during scheduling")
 ISL_ARG_BOOL(struct isl_options, tile_scale_tile_loops, 0,
        "tile-scale-tile-loops", 1, "scale tile loops")
+ISL_ARG_BOOL(struct isl_options, tile_shift_point_loops, 0,
+       "tile-shift-point-loops", 1, "shift point loops to start at zero")
 ISL_ARG_STR(struct isl_options, ast_iterator_type, 0,
        "ast-iterator-type", "type", "int",
        "type used for iterators during printing of AST")
@@ -271,6 +273,11 @@ ISL_CTX_GET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,
        tile_scale_tile_loops)
 
 ISL_CTX_SET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,
+       tile_shift_point_loops)
+ISL_CTX_GET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,
+       tile_shift_point_loops)
+
+ISL_CTX_SET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,
        ast_build_atomic_upper_bound)
 ISL_CTX_GET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,
        ast_build_atomic_upper_bound)

diff --git a/isl_options_private.h b/isl_options_private.h
index 2d5beba..494bd1a 100644 (file)
--- a/isl_options_private.h
+++ b/isl_options_private.h
@@ -58,6 +58,7 @@ struct isl_options {
        int                     schedule_fuse;
 
        int                     tile_scale_tile_loops;
+       int                     tile_shift_point_loops;
 
        char                    *ast_iterator_type;