diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-07-21 18:33:35 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2015-07-21 12:33:35 -0600 |
| commit | 324000329be228765b56c2b11d24256a8a30000e (patch) | |
| tree | 69f623cd993a4e5de320d692854414be761b6997 /gcc/graphite-dependences.c | |
| parent | 1f82f1245db9096c1fe53acc763fdfacdba2a440 (diff) | |
| download | gcc-324000329be228765b56c2b11d24256a8a30000e.zip gcc-324000329be228765b56c2b11d24256a8a30000e.tar.gz gcc-324000329be228765b56c2b11d24256a8a30000e.tar.bz2 | |
configure.ac: Add check for new options in isl-0.15.
* configure.ac: Add check for new options in isl-0.15.
* config.in, configure: Rebuilt.
* graphite-blocking.c: Include <isl/constraint.h>
* graphite-interchange.c, graphite-poly.c: Likewise.
* graphhite-scop-detection.c, graphite-sese-to-poly.c: Likewise.
* graphite.c: Likewise.
* graphite-isl-ast-to-gimple.c: Include <isl/constraint.h> and
<isl/union_set.h>.
* graphite-dependences.c: Include <isl/constraint.h>.
(max_number_of_out_dimensions): Returns isl_stat.
(extend_schedule_1): Likewise
(extend_schedule): Corresponding changes.
* graphite-optimize-isl.c: Include <isl/constraint.h> and
<isl/union_set.h>.
(getSingleMap): Change return type of isl_stat.
(optimize_isl): Conditionally use
isl_options_set_schedule_serialize_sccs.
* graphite-poly.h (isl_stat, isl_stat_ok): Define fallbacks
if not HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS.
Co-Authored-By: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
From-SVN: r226050
Diffstat (limited to 'gcc/graphite-dependences.c')
| -rw-r--r-- | gcc/graphite-dependences.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index af18ecb..c3c2090 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see /* Workaround for GMP 5.1.3 bug, see PR56019. */ #include <stddef.h> +#include <isl/constraint.h> #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> @@ -205,7 +206,7 @@ scop_get_transformed_schedule (scop_p scop, vec<poly_bb_p> pbbs) /* Helper function used on each MAP of a isl_union_map. Computes the maximal output dimension. */ -static int +static isl_stat max_number_of_out_dimensions (__isl_take isl_map *map, void *user) { int global_max = *((int *) user); @@ -217,7 +218,7 @@ max_number_of_out_dimensions (__isl_take isl_map *map, void *user) isl_map_free (map); isl_space_free (space); - return 0; + return isl_stat_ok; } /* Extends the output dimension of MAP to MAX dimensions. */ @@ -241,12 +242,12 @@ struct extend_schedule_str { /* Helper function for extend_schedule. */ -static int +static isl_stat extend_schedule_1 (__isl_take isl_map *map, void *user) { struct extend_schedule_str *str = (struct extend_schedule_str *) user; str->umap = isl_union_map_add_map (str->umap, extend_map (map, str->max)); - return 0; + return isl_stat_ok; } /* Return a relation that has uniform output dimensions. */ @@ -255,16 +256,16 @@ __isl_give isl_union_map * extend_schedule (__isl_take isl_union_map *x) { int max = 0; - int res; + isl_stat res; struct extend_schedule_str str; res = isl_union_map_foreach_map (x, max_number_of_out_dimensions, (void *) &max); - gcc_assert (res == 0); + gcc_assert (res == isl_stat_ok); str.max = max; str.umap = isl_union_map_empty (isl_union_map_get_space (x)); res = isl_union_map_foreach_map (x, extend_schedule_1, (void *) &str); - gcc_assert (res == 0); + gcc_assert (res == isl_stat_ok); isl_union_map_free (x); return str.umap; |