From 616e2b4a9a5ca9f362f80c4a95a84353e342abe7 Mon Sep 17 00:00:00 2001
From: Sebastian Pop <s.pop@samsung.com>
Date: Thu, 17 Dec 2015 17:52:17 +0000
Subject: [PATCH] move all isl include files to graphite.h

	* graphite-dependences.c: Move all isl include files to...
	* graphite-isl-ast-to-gimple.c: Same.
	* graphite-optimize-isl.c: Same.
	* graphite-poly.c: Same.
	* graphite-scop-detection.c: Same.
	* graphite.c: Same.
	* graphite.h: ... here.

From-SVN: r231783
---
 gcc/ChangeLog                    | 10 ++++++++++
 gcc/graphite-dependences.c       |  9 ---------
 gcc/graphite-isl-ast-to-gimple.c | 12 ------------
 gcc/graphite-optimize-isl.c      | 17 -----------------
 gcc/graphite-poly.c              | 14 --------------
 gcc/graphite-scop-detection.c    |  6 ------
 gcc/graphite.c                   |  7 -------
 gcc/graphite.h                   | 20 ++++++++++++++++++--
 8 files changed, 28 insertions(+), 67 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e5c967e629..8f1abee63cc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2015-12-17  Sebastian Pop  <s.pop@samsung.com>
+
+	* graphite-dependences.c: Move all isl include files to...
+	* graphite-isl-ast-to-gimple.c: Same.
+	* graphite-optimize-isl.c: Same.
+	* graphite-poly.c: Same.
+	* graphite-scop-detection.c: Same.
+	* graphite.c: Same.
+	* graphite.h: ... here.
+
 2015-12-17  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
 
 	* config/avr/avr.h (MOVE_MAX): Set value to 1.
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index 407a11e3c1b..46869d7b374 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -37,17 +37,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "cfgloop.h"
 #include "tree-data-ref.h"
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/flow.h>
-#include <isl/constraint.h>
-
 #include "graphite.h"
 
-
 /* Add the constraints from the set S to the domain of MAP.  */
 
 static isl_map *
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 0043bf44f34..612a4c1e9d2 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -53,18 +53,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-pretty-print.h"
 #include "cfganal.h"
 #include "value-prof.h"
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/union_set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/ast_build.h>
-#include <isl/val_gmp.h>
-#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
-#include <isl/schedule_node.h>
-#endif
-
 #include "graphite.h"
 
 #include <map>
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 1d9449b5ca9..9626e960b88 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -37,23 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-data-ref.h"
 #include "params.h"
 #include "dumpfile.h"
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/union_set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/schedule.h>
-#include <isl/band.h>
-#include <isl/aff.h>
-#include <isl/options.h>
-#include <isl/ctx.h>
-#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
-/* isl 0.15 or later.  */
-#include <isl/schedule_node.h>
-#include <isl/ast_build.h>
-#endif
-
 #include "graphite.h"
 
 #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 1f50ff8c6c7..d188341af96 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -40,22 +40,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "pretty-print.h"
 #include "gimple-pretty-print.h"
 #include "tree-dump.h"
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-#include <isl/constraint.h>
-#include <isl/ilp.h>
-#include <isl/aff.h>
-#include <isl/val.h>
-#include <isl/val_gmp.h>
-
 #include "graphite.h"
 
-#define OPENSCOP_MAX_STRING 256
-
-
 /* Print to STDERR the GMP value VAL.  */
 
 DEBUG_FUNCTION void
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index baff5d46874..edd7968dfad 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -48,12 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "tree-ssa-propagate.h"
 #include "gimple-pretty-print.h"
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/union_map.h>
-
 #include "graphite.h"
 
 class debug_printer
diff --git a/gcc/graphite.c b/gcc/graphite.c
index 83aa88b3284..1bb47e21101 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -52,13 +52,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "dbgcnt.h"
 #include "tree-parloops.h"
 #include "tree-cfgcleanup.h"
-
-#include <isl/constraint.h>
-#include <isl/set.h>
-#include <isl/map.h>
-#include <isl/options.h>
-#include <isl/union_map.h>
-
 #include "graphite.h"
 
 /* Print global statistics to FILE.  */
diff --git a/gcc/graphite.h b/gcc/graphite.h
index 929c399d593..2565da704cf 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -23,10 +23,26 @@ along with GCC; see the file COPYING3.  If not see
 #define GCC_GRAPHITE_POLY_H
 
 #include "sese.h"
+#include <isl/options.h>
+#include <isl/ctx.h>
+#include <isl/val_gmp.h>
+#include <isl/set.h>
+#include <isl/union_set.h>
+#include <isl/map.h>
+#include <isl/union_map.h>
+#include <isl/aff.h>
+#include <isl/constraint.h>
+#include <isl/flow.h>
+#include <isl/ilp.h>
 #include <isl/schedule.h>
+#include <isl/ast_build.h>
 
-#ifndef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
-  /* isl 0.14.  */
+#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
+/* isl 0.15 or later.  */
+#include <isl/schedule_node.h>
+
+#else
+/* isl 0.14 or 0.13.  */
 # define isl_stat int
 # define isl_stat_ok 0
 #endif
-- 
2.30.2