@@ -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 *
@@ -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>
@@ -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
@@ -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
@@ -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
@@ -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. */
@@ -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