diff options
author | Richard Biener <rguenther@suse.de> | 2017-02-13 08:54:02 +0000 |
---|---|---|
committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-02-13 08:54:02 +0000 |
commit | f877b3adba2d9442752721d87c96f93beccd4c40 (patch) | |
tree | 4a2ee5ee6c3f117960b3f1a517bbaa4fb3747ef6 /gcc/graphite-dependences.c | |
parent | c0d46793e8e05b2e68395512383f688eeea8dae2 (diff) | |
download | gcc-f877b3adba2d9442752721d87c96f93beccd4c40.zip gcc-f877b3adba2d9442752721d87c96f93beccd4c40.tar.gz gcc-f877b3adba2d9442752721d87c96f93beccd4c40.tar.bz2 |
isl.m4: Remove support for ISL 0.14.
2017-02-13 Richard Biener <rguenther@suse.de>
config/
* isl.m4: Remove support for ISL 0.14.
* configure: Re-generate.
gcc/
* configure.ac (HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS):
Remove.
* configure: Re-generate.
* config.in: Likewise.
* graphite-dependences.c: Simplify as if
HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS was defined.
* graphite-isl-ast-to-gimple.c: Likewise.
* graphite-optimize-isl.c: Likewise.
* graphite-poly.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* graphite.h: Likewise.
* toplev.c: Include isl/version.h and use isl_version () for
printing the ISL version.
* doc/install.texi: Update ISL requirement.
From-SVN: r245382
Diffstat (limited to 'gcc/graphite-dependences.c')
-rw-r--r-- | gcc/graphite-dependences.c | 152 |
1 files changed, 0 insertions, 152 deletions
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index 2dc5ccc..4ed9d00 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -168,28 +168,6 @@ scop_get_may_writes (scop_p scop) return isl_union_map_coalesce (res); } -#ifndef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS -/* Returns all the original schedules in SCOP. */ - -static isl_union_map * -scop_get_original_schedule (scop_p scop, vec<poly_bb_p> pbbs) -{ - int i; - poly_bb_p pbb; - isl_space *space = isl_set_get_space (scop->param_context); - isl_union_map *res = isl_union_map_empty (space); - - FOR_EACH_VEC_ELT (pbbs, i, pbb) - { - res = isl_union_map_add_map - (res, constrain_domain (isl_map_copy (pbb->schedule), - isl_set_copy (pbb->domain))); - } - - return isl_union_map_coalesce (res); -} -#endif - /* Helper function used on each MAP of a isl_union_map. Computes the maximal output dimension. */ @@ -311,7 +289,6 @@ carries_deps (__isl_keep isl_union_map *schedule, return res; } -#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS /* Compute the dependence relations for the SCOP: RAW are read after write dependences, WAR are write after read dependences, @@ -398,133 +375,4 @@ scop_get_dependences (scop_p scop) scop->dependence = dependences; } -#else - -/* Compute the original data dependences in SCOP for all the reads and - writes in PBBS. */ - -static void -compute_deps (scop_p scop, vec<poly_bb_p> pbbs, - isl_union_map **must_raw, - isl_union_map **may_raw, - isl_union_map **must_raw_no_source, - isl_union_map **may_raw_no_source, - isl_union_map **must_war, - isl_union_map **may_war, - isl_union_map **must_war_no_source, - isl_union_map **may_war_no_source, - isl_union_map **must_waw, - isl_union_map **may_waw, - isl_union_map **must_waw_no_source, - isl_union_map **may_waw_no_source) -{ - isl_union_map *reads = scop_get_reads (scop); - isl_union_map *must_writes = scop_get_must_writes (scop); - isl_union_map *may_writes = scop_get_may_writes (scop); - isl_union_map *all_writes = isl_union_map_union - (isl_union_map_copy (must_writes), isl_union_map_copy (may_writes)); - all_writes = isl_union_map_coalesce (all_writes); - - isl_space *space = isl_union_map_get_space (all_writes); - isl_union_map *empty = isl_union_map_empty (space); - isl_union_map *original = scop_get_original_schedule (scop, pbbs); - - if (dump_file) - { - fprintf (dump_file, "\n--- Documentation for datarefs dump: ---\n"); - fprintf (dump_file, "Statements on the iteration domain are mapped to" - " array references.\n"); - fprintf (dump_file, " To read the following data references:\n\n"); - fprintf (dump_file, " S_5[i0] -> [106] : i0 >= 0 and i0 <= 3\n"); - fprintf (dump_file, " S_8[i0] -> [1, i0] : i0 >= 0 and i0 <= 3\n\n"); - - fprintf (dump_file, " S_5[i0] is the dynamic instance of statement" - " bb_5 in a loop that accesses all iterations 0 <= i0 <= 3.\n"); - fprintf (dump_file, " [1, i0] is a 'memref' with alias set 1" - " and first subscript access i0.\n"); - fprintf (dump_file, " [106] is a 'scalar reference' which is the sum of" - " SSA_NAME_VERSION 6" - " and --param graphite-max-arrays-per-scop=100\n"); - fprintf (dump_file, "-----------------------\n\n"); - - fprintf (dump_file, "data references (\n"); - fprintf (dump_file, " reads: "); - print_isl_union_map (dump_file, reads); - fprintf (dump_file, " must_writes: "); - print_isl_union_map (dump_file, must_writes); - fprintf (dump_file, " may_writes: "); - print_isl_union_map (dump_file, may_writes); - fprintf (dump_file, " all_writes: "); - print_isl_union_map (dump_file, all_writes); - fprintf (dump_file, ")\n"); - } - - isl_union_map_compute_flow (isl_union_map_copy (reads), - isl_union_map_copy (must_writes), - isl_union_map_copy (may_writes), - isl_union_map_copy (original), - must_raw, may_raw, must_raw_no_source, - may_raw_no_source); - isl_union_map_compute_flow (isl_union_map_copy (all_writes), - reads, empty, - isl_union_map_copy (original), - must_war, may_war, must_war_no_source, - may_war_no_source); - isl_union_map_compute_flow (all_writes, must_writes, may_writes, - original, - must_waw, may_waw, must_waw_no_source, - may_waw_no_source); -} - -isl_union_map * -scop_get_dependences (scop_p scop) -{ - if (scop->dependence) - return scop->dependence; - - /* The original dependence relations: - RAW are read after write dependences, - WAR are write after read dependences, - WAW are write after write dependences. */ - isl_union_map *must_raw = NULL, *may_raw = NULL, *must_raw_no_source = NULL, - *may_raw_no_source = NULL, *must_war = NULL, *may_war = NULL, - *must_war_no_source = NULL, *may_war_no_source = NULL, *must_waw = NULL, - *may_waw = NULL, *must_waw_no_source = NULL, *may_waw_no_source = NULL; - - compute_deps (scop, scop->pbbs, - &must_raw, &may_raw, - &must_raw_no_source, &may_raw_no_source, - &must_war, &may_war, - &must_war_no_source, &may_war_no_source, - &must_waw, &may_waw, - &must_waw_no_source, &may_waw_no_source); - - isl_union_map *dependences = must_raw; - dependences = isl_union_map_union (dependences, must_war); - dependences = isl_union_map_union (dependences, must_waw); - dependences = isl_union_map_union (dependences, may_raw); - dependences = isl_union_map_union (dependences, may_war); - dependences = isl_union_map_union (dependences, may_waw); - dependences = isl_union_map_coalesce (dependences); - - if (dump_file) - { - fprintf (dump_file, "data dependences (\n"); - print_isl_union_map (dump_file, dependences); - fprintf (dump_file, ")\n"); - } - - isl_union_map_free (must_raw_no_source); - isl_union_map_free (may_raw_no_source); - isl_union_map_free (must_war_no_source); - isl_union_map_free (may_war_no_source); - isl_union_map_free (must_waw_no_source); - isl_union_map_free (may_waw_no_source); - - scop->dependence = dependences; - return dependences; -} - -#endif /* HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS */ - #endif /* HAVE_isl */ |