From 01bdcc80e25866fcd982075617f62a53c18659a3 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Tue, 29 Sep 2015 22:20:14 +0000 Subject: [PATCH] Make compute_deps, extend_schedule static No functional changes intended. Passes make check and bootstrap. gcc/ChangeLog: 2015-09-29 Aditya Kumar * graphite-dependences.c (scop_get_dependences): Moved in down in order to be visible to its caller. * graphite-poly.h: Removed compute_deps, and extend_schedule. From-SVN: r228269 --- gcc/ChangeLog | 6 ++++ gcc/graphite-dependences.c | 62 +++++++++++++++++++------------------- gcc/graphite-poly.h | 16 ---------- 3 files changed, 37 insertions(+), 47 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f9858f129ea..8fc1ce77fd9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-09-29 Aditya Kumar + + * graphite-dependences.c (scop_get_dependences): Moved in down + in order to be visible to its caller. + * graphite-poly.h: Removed compute_deps, and extend_schedule. + 2015-09-29 Sebastian Pop Aditya Kumar diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index 85f16f3933b..e39394a8053 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -47,35 +47,6 @@ along with GCC; see the file COPYING3. If not see #include "graphite-poly.h" -isl_union_map * -scop_get_dependences (scop_p scop) -{ - isl_union_map *dependences; - - if (!scop->must_raw) - compute_deps (scop, SCOP_BBS (scop), - &scop->must_raw, &scop->may_raw, - &scop->must_raw_no_source, &scop->may_raw_no_source, - &scop->must_war, &scop->may_war, - &scop->must_war_no_source, &scop->may_war_no_source, - &scop->must_waw, &scop->may_waw, - &scop->must_waw_no_source, &scop->may_waw_no_source); - - dependences = isl_union_map_copy (scop->must_raw); - dependences = isl_union_map_union (dependences, - isl_union_map_copy (scop->must_war)); - dependences = isl_union_map_union (dependences, - isl_union_map_copy (scop->must_waw)); - dependences = isl_union_map_union (dependences, - isl_union_map_copy (scop->may_raw)); - dependences = isl_union_map_union (dependences, - isl_union_map_copy (scop->may_war)); - dependences = isl_union_map_union (dependences, - isl_union_map_copy (scop->may_waw)); - - return dependences; -} - /* Add the constraints from the set S to the domain of MAP. */ static isl_map * @@ -252,7 +223,7 @@ extend_schedule_1 (__isl_take isl_map *map, void *user) /* Return a relation that has uniform output dimensions. */ -__isl_give isl_union_map * +static __isl_give isl_union_map * extend_schedule (__isl_take isl_union_map *x) { int max = 0; @@ -519,7 +490,7 @@ subtract_commutative_associative_deps (scop_p scop, /* Compute the original data dependences in SCOP for all the reads and writes in PBBS. */ -void +static void compute_deps (scop_p scop, vec pbbs, isl_union_map **must_raw, isl_union_map **may_raw, @@ -595,6 +566,35 @@ transform_is_safe (scop_p scop, isl_union_map *transform) return res; } +isl_union_map * +scop_get_dependences (scop_p scop) +{ + isl_union_map *dependences; + + if (!scop->must_raw) + compute_deps (scop, SCOP_BBS (scop), + &scop->must_raw, &scop->may_raw, + &scop->must_raw_no_source, &scop->may_raw_no_source, + &scop->must_war, &scop->may_war, + &scop->must_war_no_source, &scop->may_war_no_source, + &scop->must_waw, &scop->may_waw, + &scop->must_waw_no_source, &scop->may_waw_no_source); + + dependences = isl_union_map_copy (scop->must_raw); + dependences = isl_union_map_union (dependences, + isl_union_map_copy (scop->must_war)); + dependences = isl_union_map_union (dependences, + isl_union_map_copy (scop->must_waw)); + dependences = isl_union_map_union (dependences, + isl_union_map_copy (scop->may_raw)); + dependences = isl_union_map_union (dependences, + isl_union_map_copy (scop->may_war)); + dependences = isl_union_map_union (dependences, + isl_union_map_copy (scop->may_waw)); + + return dependences; +} + /* Return true when the SCOP transformed schedule is correct. */ bool diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h index 3bd22f05ae8..b2dbd367bb9 100644 --- a/gcc/graphite-poly.h +++ b/gcc/graphite-poly.h @@ -456,22 +456,6 @@ scop_set_nb_params (scop_p scop, graphite_dim_t nb_params) } bool graphite_legal_transform (scop_p); -__isl_give isl_union_map *extend_schedule (__isl_take isl_union_map *); - -void -compute_deps (scop_p scop, vec 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 * scop_get_dependences (scop_p scop); -- 2.30.2