From cf98f0f49bbb11f483d131e52a0261023820e85b Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Tue, 24 Nov 2015 17:57:45 +0000 Subject: [PATCH] move all declarations to a same .h file Co-Authored-By: Sebastian Pop From-SVN: r230825 --- gcc/ChangeLog | 15 +++++++++++++++ gcc/graphite-dependences.c | 2 +- gcc/graphite-isl-ast-to-gimple.c | 3 +-- gcc/graphite-isl-ast-to-gimple.h | 26 -------------------------- gcc/graphite-optimize-isl.c | 2 +- gcc/graphite-poly.c | 2 +- gcc/graphite-scop-detection.c | 3 +-- gcc/graphite-scop-detection.h | 29 ----------------------------- gcc/graphite-sese-to-poly.c | 2 +- gcc/graphite.c | 4 +--- gcc/{graphite-poly.h => graphite.h} | 7 ++++++- 11 files changed, 28 insertions(+), 67 deletions(-) delete mode 100644 gcc/graphite-isl-ast-to-gimple.h delete mode 100644 gcc/graphite-scop-detection.h rename gcc/{graphite-poly.h => graphite.h} (98%) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d61154fdb50..8221d0b8d7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2015-11-23 Aditya Kumar + Sebastian Pop + + * graphite-dependences.c: Only include graphite.h. + * graphite-isl-ast-to-gimple.c: Same. + * graphite-optimize-isl.c: Same. + * graphite-poly.c: Same. + * graphite-scop-detection.c: Same. + * graphite-sese-to-poly.c: Same. + * graphite.c: Same. + * graphite-isl-ast-to-gimple.h: Move to graphite.h. + * graphite-poly.h: Same. + * graphite-scop-detection.h: Same. + * graphite.h: New. + 2015-11-24 Pierre-Marie de Rodat * dwarf2out.c (gen_decl_die): Generate DW_TAG_imported_* instead of diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index 3f4e5ea8fe6..fcc771b9658 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -45,7 +45,7 @@ along with GCC; see the file COPYING3. If not see #include #include -#include "graphite-poly.h" +#include "graphite.h" /* Add the constraints from the set S to the domain of MAP. */ diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index 1d986f85905..58cccce70b3 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -70,8 +70,7 @@ extern "C" { } #endif -#include "graphite-poly.h" -#include "graphite-isl-ast-to-gimple.h" +#include "graphite.h" #include diff --git a/gcc/graphite-isl-ast-to-gimple.h b/gcc/graphite-isl-ast-to-gimple.h deleted file mode 100644 index dc8a93409e4..00000000000 --- a/gcc/graphite-isl-ast-to-gimple.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Translation of ISL AST to Gimple. - Copyright (C) 2014-2015 Free Software Foundation, Inc. - Contributed by Roman Gareev . - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING3. If not see -. */ - -#ifndef GCC_GRAPHITE_ISL_AST_TO_GIMPLE_H -#define GCC_GRAPHITE_ISL_AST_TO_GIMPLE_H - -extern bool graphite_regenerate_ast_isl (scop_p); - -#endif diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c index 559afc481b2..8727e39e4c6 100644 --- a/gcc/graphite-optimize-isl.c +++ b/gcc/graphite-optimize-isl.c @@ -52,7 +52,7 @@ along with GCC; see the file COPYING3. If not see #include #endif -#include "graphite-poly.h" +#include "graphite.h" #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index c783fc31e02..a51aefe574c 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -57,7 +57,7 @@ extern "C" { } #endif -#include "graphite-poly.h" +#include "graphite.h" #define OPENSCOP_MAX_STRING 256 diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index 60bb0499f08..1f8fc76f3f8 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -54,8 +54,7 @@ along with GCC; see the file COPYING3. If not see #include #include -#include "graphite-poly.h" -#include "graphite-scop-detection.h" +#include "graphite.h" class debug_printer { diff --git a/gcc/graphite-scop-detection.h b/gcc/graphite-scop-detection.h deleted file mode 100644 index 45117963e11..00000000000 --- a/gcc/graphite-scop-detection.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Detection of Static Control Parts (SCoP) for Graphite. - Copyright (C) 2009-2015 Free Software Foundation, Inc. - Contributed by Sebastian Pop and - Tobias Grosser . - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING3. If not see -. */ - -#ifndef GCC_GRAPHITE_SCOP_DETECTION_H -#define GCC_GRAPHITE_SCOP_DETECTION_H - -extern void build_scops (vec *); -extern void dot_all_scops (vec); -extern void dot_scop (scop_p); - -#endif /* GCC_GRAPHITE_SCOP_DETECTION_H */ diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index ec7248b4417..e6802434137 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -65,7 +65,7 @@ extern "C" { } #endif -#include "graphite-poly.h" +#include "graphite.h" /* Assigns to RES the value of the INTEGER_CST T. */ diff --git a/gcc/graphite.c b/gcc/graphite.c index ef7e64daf2f..ee1d2117114 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -59,9 +59,7 @@ along with GCC; see the file COPYING3. If not see #include #include -#include "graphite-poly.h" -#include "graphite-scop-detection.h" -#include "graphite-isl-ast-to-gimple.h" +#include "graphite.h" /* Print global statistics to FILE. */ diff --git a/gcc/graphite-poly.h b/gcc/graphite.h similarity index 98% rename from gcc/graphite-poly.h rename to gcc/graphite.h index d396d3f7d64..30272bbc46c 100644 --- a/gcc/graphite-poly.h +++ b/gcc/graphite.h @@ -461,6 +461,11 @@ carries_deps (__isl_keep isl_union_map *schedule, __isl_keep isl_union_map *deps, int depth); -bool build_poly_scop (scop_p); +extern bool build_poly_scop (scop_p); +extern bool graphite_regenerate_ast_isl (scop_p); + +extern void build_scops (vec *); +extern void dot_all_scops (vec); +extern void dot_scop (scop_p); #endif -- 2.30.2