From 9c358739d7507b19f6834486a4a42ce37c8a90cb Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Mon, 13 Jul 2015 15:41:54 +0000 Subject: [PATCH] omega.h: Don't include config.h... * omega.h: Don't include config.h, don't include params.h again if omega.h has already been included. * graphite-poly.h: Include sese.h. * graphite.c: Don't include sese.h, remove needless includes and minimize includes outside #ifdef HAVE_isl block. * graphite-blocking.c: Don't include sese.h, remove needless includes, and wrap entire file in #ifdef HAVE_isl * graphite-dependences.c: Likewise. * graphite-interchange.c: Likewise. * graphite-isl-ast-to-gimple.c: Likewise. * graphite-optimize-isl.c: Likewise. * graphite-poly.c: Likewise. * graphite-scop-detection.c: Likewise. * graphite-sese-to-poly.c: Likewise. From-SVN: r225741 --- gcc/ChangeLog | 17 +++++++++++++++++ gcc/graphite-blocking.c | 11 ----------- gcc/graphite-dependences.c | 13 ++----------- gcc/graphite-interchange.c | 13 ++----------- gcc/graphite-isl-ast-to-gimple.c | 12 ++---------- gcc/graphite-optimize-isl.c | 13 +------------ gcc/graphite-poly.c | 15 ++------------- gcc/graphite-poly.h | 2 ++ gcc/graphite-scop-detection.c | 13 ++----------- gcc/graphite-sese-to-poly.c | 23 ++--------------------- gcc/graphite.c | 20 ++++++-------------- gcc/omega.h | 4 ++-- 12 files changed, 40 insertions(+), 116 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f600ce3db0c..3e66a1d2569 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2015-07-13 Andrew MacLeod + + * omega.h: Don't include config.h, don't include params.h again if + omega.h has already been included. + * graphite-poly.h: Include sese.h. + * graphite.c: Don't include sese.h, remove needless includes and + minimize includes outside #ifdef HAVE_isl block. + * graphite-blocking.c: Don't include sese.h, remove needless includes, + and wrap entire file in #ifdef HAVE_isl + * graphite-dependences.c: Likewise. + * graphite-interchange.c: Likewise. + * graphite-isl-ast-to-gimple.c: Likewise. + * graphite-optimize-isl.c: Likewise. + * graphite-poly.c: Likewise. + * graphite-scop-detection.c: Likewise. + * graphite-sese-to-poly.c: Likewise. + 2015-07-13 Tom de Vries * omp-low.c (build_receiver_ref): Mark *.omp_data_i as non-trapping. diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c index 9ee733e83b0..73d7c59748c 100644 --- a/gcc/graphite-blocking.c +++ b/gcc/graphite-blocking.c @@ -31,32 +31,21 @@ along with GCC; see the file COPYING3. If not see #include #include #include -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "dominance.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop.h" #include "dumpfile.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" -#include "sese.h" - -#ifdef HAVE_isl #include "graphite-poly.h" - /* Strip mines with a factor STRIDE the scattering (time) dimension around PBB at depth TIME_DEPTH. diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index 79b69a79cb1..50fe73efd00 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -30,31 +30,22 @@ along with GCC; see the file COPYING3. If not see #include #include #include -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop.h" #include "tree-pass.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" -#include "tree-scalar-evolution.h" -#include "sese.h" - -#ifdef HAVE_isl #include "graphite-poly.h" + isl_union_map * scop_get_dependences (scop_p scop) { @@ -632,4 +623,4 @@ graphite_legal_transform (scop_p scop) return res; } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c index 0f0580b0332..aee51a8fa05 100644 --- a/gcc/graphite-interchange.c +++ b/gcc/graphite-interchange.c @@ -42,31 +42,22 @@ extern "C" { #if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) } #endif -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop.h" #include "dumpfile.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" -#include "tree-scalar-evolution.h" -#include "sese.h" - -#ifdef HAVE_isl #include "graphite-poly.h" + /* XXX isl rewrite following comment */ /* Builds a linear expression, of dimension DIM, representing PDR's memory access: @@ -657,5 +648,5 @@ scop_do_interchange (scop_p scop) } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index e9da6801409..b32781a5b78 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -37,33 +37,25 @@ extern "C" { #if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) } #endif -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop.h" #include "tree-pass.h" #include "cfgloop.h" #include "tree-data-ref.h" -#include "sese.h" +#include "graphite-poly.h" #include "tree-ssa-loop-manip.h" #include "tree-scalar-evolution.h" #include "gimple-ssa.h" #include "tree-into-ssa.h" #include - -#ifdef HAVE_isl -#include "graphite-poly.h" #include "graphite-isl-ast-to-gimple.h" /* This flag is set when an error occurred during the translation of @@ -1094,4 +1086,4 @@ graphite_regenerate_ast_isl (scop_p scop) return !graphite_regenerate_error; } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c index 3be82b502c0..f4904017efd 100644 --- a/gcc/graphite-optimize-isl.c +++ b/gcc/graphite-optimize-isl.c @@ -31,29 +31,18 @@ along with GCC; see the file COPYING3. If not see #include #include #include -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop.h" -#include "dumpfile.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" -#include "tree-scalar-evolution.h" -#include "sese.h" - -#ifdef HAVE_isl #include "graphite-poly.h" static isl_union_set * @@ -623,4 +612,4 @@ optimize_isl (scop_p scop) return true; } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index d62b2afe21e..bcd08d8c5d6 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -41,31 +41,20 @@ extern "C" { #if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) } #endif -#endif #include "system.h" #include "coretypes.h" -#include "diagnostic-core.h" -#include "alias.h" #include "backend.h" +#include "diagnostic-core.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop.h" -#include "dumpfile.h" #include "gimple-pretty-print.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" -#include "tree-scalar-evolution.h" -#include "sese.h" - -#ifdef HAVE_isl #include "graphite-poly.h" #define OPENSCOP_MAX_STRING 256 @@ -1206,5 +1195,5 @@ reverse_loop_for_pbbs (scop_p scop, vec pbbs, int depth) } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h index afc0121f611..7ffd18eb495 100644 --- a/gcc/graphite-poly.h +++ b/gcc/graphite-poly.h @@ -22,6 +22,8 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_GRAPHITE_POLY_H #define GCC_GRAPHITE_POLY_H +#include "sese.h" + typedef struct poly_dr *poly_dr_p; typedef struct poly_bb *poly_bb_p; diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index 46a55347eeb..47e0da046e1 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -28,20 +28,15 @@ along with GCC; see the file COPYING3. If not see #include #include #include -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" #include "ssa.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-ssa-loop-manip.h" #include "tree-ssa-loop-niter.h" @@ -49,15 +44,11 @@ along with GCC; see the file COPYING3. If not see #include "tree-into-ssa.h" #include "tree-ssa.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" #include "tree-scalar-evolution.h" #include "tree-pass.h" -#include "sese.h" -#include "tree-ssa-propagate.h" - -#ifdef HAVE_isl #include "graphite-poly.h" +#include "tree-ssa-propagate.h" #include "graphite-scop-detection.h" /* Forward declarations. */ @@ -1637,4 +1628,4 @@ dot_scop (scop_p scop) #endif } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 6ab44d9d195..506424799e5 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -39,20 +39,15 @@ extern "C" { #if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus) } #endif -#endif #include "system.h" #include "coretypes.h" -#include "alias.h" #include "backend.h" #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "rtl.h" #include "ssa.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "gimplify.h" #include "gimplify-me.h" @@ -63,25 +58,11 @@ extern "C" { #include "tree-into-ssa.h" #include "tree-pass.h" #include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" #include "tree-scalar-evolution.h" #include "domwalk.h" -#include "sese.h" -#include "tree-ssa-propagate.h" - -#ifdef HAVE_isl -#include "flags.h" -#include "insn-config.h" -#include "expmed.h" -#include "dojump.h" -#include "explow.h" -#include "calls.h" -#include "emit-rtl.h" -#include "varasm.h" -#include "stmt.h" -#include "expr.h" #include "graphite-poly.h" +#include "tree-ssa-propagate.h" #include "graphite-sese-to-poly.h" @@ -3187,4 +3168,4 @@ build_poly_scop (scop_p scop) representation. */ POLY_SCOP_P (scop) = true; } -#endif +#endif /* HAVE_isl */ diff --git a/gcc/graphite.c b/gcc/graphite.c index 7a3536b8ea8..a81ef6aba68 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -46,33 +46,25 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" -#include "diagnostic-core.h" -#include "alias.h" #include "backend.h" +#include "diagnostic-core.h" +#include "cfgloop.h" +#include "tree-pass.h" + +#ifdef HAVE_isl #include "cfghooks.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" #include "fold-const.h" -#include "internal-fn.h" #include "gimple-iterator.h" #include "tree-cfg.h" #include "tree-ssa-loop.h" -#include "tree-dump.h" -#include "cfgloop.h" -#include "tree-chrec.h" #include "tree-data-ref.h" #include "tree-scalar-evolution.h" -#include "sese.h" +#include "graphite-poly.h" #include "dbgcnt.h" #include "tree-parloops.h" -#include "tree-pass.h" #include "tree-cfgcleanup.h" - -#ifdef HAVE_isl - -#include "graphite-poly.h" #include "graphite-scop-detection.h" #include "graphite-isl-ast-to-gimple.h" #include "graphite-sese-to-poly.h" diff --git a/gcc/omega.h b/gcc/omega.h index 052fb638fd6..33361b86363 100644 --- a/gcc/omega.h +++ b/gcc/omega.h @@ -24,12 +24,12 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ -#include "config.h" -#include "params.h" #ifndef GCC_OMEGA_H #define GCC_OMEGA_H +#include "params.h" + #define OMEGA_MAX_VARS PARAM_VALUE (PARAM_OMEGA_MAX_VARS) #define OMEGA_MAX_GEQS PARAM_VALUE (PARAM_OMEGA_MAX_GEQS) #define OMEGA_MAX_EQS PARAM_VALUE (PARAM_OMEGA_MAX_EQS) -- 2.30.2