ipa-cp.c (ipcp_cloning_candidate_p): Use opt_for_fn.

[gcc.git] / gcc / graphite.c

diff --git a/gcc/graphite.c b/gcc/graphite.c
index 42a4457e66fed79d97361575cde8145b5a5fd13d..59d5a136cfc104527b4b3f1a3190b50e845ec02a 100644 (file)
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -39,11 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/map.h>
 #include <isl/options.h>
 #include <isl/union_map.h>
-#ifdef HAVE_cloog
-#include <cloog/cloog.h>
-#include <cloog/isl/domain.h>
-#include <cloog/isl/cloog.h>
-#endif
 #endif
 
 #include "system.h"
@@ -87,13 +82,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "graphite-scop-detection.h"
 #include "graphite-isl-ast-to-gimple.h"
 #include "graphite-sese-to-poly.h"
-#include "graphite-htab.h"
-
-#ifdef HAVE_cloog
-#include "graphite-clast-to-gimple.h"
-
-CloogState *cloog_state;
-#endif
 
 /* Print global statistics to FILE.  */
 
@@ -244,10 +232,6 @@ graphite_initialize (isl_ctx *ctx)
   recompute_all_dominators ();
   initialize_original_copy_tables ();
 
-#ifdef HAVE_cloog
-  cloog_state = cloog_isl_state_malloc (ctx);
-#endif
-
   if (dump_file && dump_flags)
     dump_function_to_file (current_function_decl, dump_file, dump_flags);
 
@@ -269,9 +253,6 @@ graphite_finalize (bool need_cfg_cleanup_p)
       tree_estimate_probability ();
     }
 
-#ifdef HAVE_cloog
-  cloog_state_free (cloog_state);
-#endif
   free_original_copy_tables ();
 
   if (dump_file && dump_flags)
@@ -311,37 +292,16 @@ graphite_transform_loops (void)
       print_global_statistics (dump_file);
     }
 
-  bb_pbb_htab_type bb_pbb_mapping (10);
-
-#ifndef HAVE_cloog
-  if(flag_graphite_code_gen == FGRAPHITE_CODE_GEN_CLOOG)
-    {
-      flag_graphite_code_gen = FGRAPHITE_CODE_GEN_ISL;
-      printf ("The CLooG code generator cannot be used (CLooG is not "
-             "available). The ISL code generator was chosen.\n");
-    }
-#endif
-
   FOR_EACH_VEC_ELT (scops, i, scop)
     if (dbg_cnt (graphite_scop))
       {
        scop->ctx = ctx;
        build_poly_scop (scop);
 
-#ifdef HAVE_cloog
-       if (POLY_SCOP_P (scop)
-           && apply_poly_transforms (scop)
-           && (((flag_graphite_code_gen == FGRAPHITE_CODE_GEN_ISL)
-           && graphite_regenerate_ast_isl (scop))
-           || ((flag_graphite_code_gen == FGRAPHITE_CODE_GEN_CLOOG)
-           && graphite_regenerate_ast_cloog (scop, &bb_pbb_mapping))))
-         need_cfg_cleanup_p = true;
-#else
        if (POLY_SCOP_P (scop)
            && apply_poly_transforms (scop)
            && graphite_regenerate_ast_isl (scop))
          need_cfg_cleanup_p = true;
-#endif
 
       }
 
@@ -383,7 +343,8 @@ gate_graphite_transforms (void)
       || flag_loop_strip_mine
       || flag_graphite_identity
       || flag_loop_parallelize_all
-      || flag_loop_optimize_isl)
+      || flag_loop_optimize_isl
+      || flag_loop_unroll_jam)
     flag_graphite = 1;
 
   return flag_graphite != 0;