X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-ssa-loop.c;h=1a9c2be73768590109fb8905ea49d15ee432964e;hb=1678dcdf749fdcf7cc7225d26ed6f44e0b71330d;hp=591890ccfd579a9477d82792098e7c7f2f0c02da;hpb=48e1416a24d50cacbb2a5e06a9ee61dd8cbee313;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index 591890ccfd5..1a9c2be7376 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -1,5 +1,6 @@
 /* Loop optimizations over tree-ssa.
-   Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -22,12 +23,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "rtl.h"
 #include "tm_p.h"
-#include "hard-reg-set.h"
 #include "basic-block.h"
 #include "output.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "tree-pass.h"
@@ -36,7 +34,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "tree-inline.h"
 #include "tree-scalar-evolution.h"
-#include "toplev.h"
+#include "diagnostic-core.h"
 #include "tree-vectorizer.h"
 
 /* The loop superpass.  */
@@ -62,7 +60,7 @@ struct gimple_opt_pass pass_tree_loop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   TODO_ggc_collect,			/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa | TODO_ggc_collect	/* todo_flags_finish */
+  TODO_verify_ssa | TODO_ggc_collect	/* todo_flags_finish */
  }
 };
 
@@ -97,7 +95,7 @@ struct gimple_opt_pass pass_tree_loop_init =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops	/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -109,8 +107,7 @@ tree_ssa_loop_im (void)
   if (number_of_loops () <= 1)
     return 0;
 
-  tree_ssa_lim ();
-  return 0;
+  return tree_ssa_lim ();
 }
 
 static bool
@@ -134,7 +131,7 @@ struct gimple_opt_pass pass_lim =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops	/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -170,8 +167,7 @@ struct gimple_opt_pass pass_tree_unswitch =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_ggc_collect | TODO_dump_func
-    | TODO_verify_loops		 	/* todo_flags_finish */
+  TODO_ggc_collect                  	/* todo_flags_finish */
  }
 };
 
@@ -183,8 +179,7 @@ run_tree_predictive_commoning (void)
   if (!current_loops)
     return 0;
 
-  tree_predictive_commoning ();
-  return 0;
+  return tree_predictive_commoning ();
 }
 
 static bool
@@ -208,8 +203,7 @@ struct gimple_opt_pass pass_predcom =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops
-    | TODO_update_ssa_only_virtuals	/* todo_flags_finish */
+  TODO_update_ssa_only_virtuals 	/* todo_flags_finish */
  }
 };
 
@@ -244,76 +238,60 @@ struct gimple_opt_pass pass_vectorize =
   PROP_cfg | PROP_ssa,                  /* properties_required */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
-  TODO_verify_loops,			/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa
+  0,					/* todo_flags_start */
+  TODO_update_ssa
     | TODO_ggc_collect			/* todo_flags_finish */
  }
 };
 
-/* Loop nest optimizations.  */
+/* GRAPHITE optimizations.  */
 
 static unsigned int
-tree_linear_transform (void)
+graphite_transforms (void)
 {
-  if (number_of_loops () <= 1)
+  if (!current_loops)
     return 0;
 
-  linear_transform_loops ();
+  graphite_transform_loops ();
+
   return 0;
 }
 
 static bool
-gate_tree_linear_transform (void)
+gate_graphite_transforms (void)
 {
-  return flag_tree_loop_linear != 0;
+  /* Enable -fgraphite pass if any one of the graphite optimization flags
+     is turned on.  */
+  if (flag_loop_block
+      || flag_loop_interchange
+      || flag_loop_strip_mine
+      || flag_graphite_identity
+      || flag_loop_parallelize_all
+      || flag_loop_flatten)
+    flag_graphite = 1;
+
+  return flag_graphite != 0;
 }
 
-struct gimple_opt_pass pass_linear_transform =
+struct gimple_opt_pass pass_graphite =
 {
  {
   GIMPLE_PASS,
-  "ltrans",				/* name */
-  gate_tree_linear_transform,		/* gate */
-  tree_linear_transform,       		/* execute */
+  "graphite0",				/* name */
+  gate_graphite_transforms,		/* gate */
+  NULL,					/* execute */
   NULL,					/* sub */
   NULL,					/* next */
   0,					/* static_pass_number */
-  TV_TREE_LINEAR_TRANSFORM,  		/* tv_id */
+  TV_GRAPHITE,				/* tv_id */
   PROP_cfg | PROP_ssa,			/* properties_required */
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops
-    | TODO_update_ssa_only_virtuals
-    | TODO_ggc_collect			/* todo_flags_finish */
+  0					/* todo_flags_finish */
  }
 };
 
-/* GRAPHITE optimizations.  */
-
-static unsigned int
-graphite_transforms (void)
-{
-  if (!current_loops)
-    return 0;
-
-  graphite_transform_loops ();
-
-  return 0;
-}
-
-static bool
-gate_graphite_transforms (void)
-{
-  /* Enable -fgraphite pass if any one of the graphite optimization flags
-     is turned on.  */
-  if (flag_loop_block || flag_loop_interchange || flag_loop_strip_mine
-      || flag_graphite_identity || flag_loop_parallelize_all)
-    flag_graphite = 1;
-
-  return flag_graphite != 0;
-}
-
 struct gimple_opt_pass pass_graphite_transforms =
 {
  {
@@ -329,7 +307,7 @@ struct gimple_opt_pass pass_graphite_transforms =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_verify_loops			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -366,7 +344,7 @@ struct gimple_opt_pass pass_check_data_deps =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func                	/* todo_flags_finish */
+  0                             	/* todo_flags_finish */
  }
 };
 
@@ -402,7 +380,7 @@ struct gimple_opt_pass pass_iv_canon =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops	/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -429,7 +407,7 @@ struct gimple_opt_pass pass_scev_cprop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_cleanup_cfg
+  TODO_cleanup_cfg
     | TODO_update_ssa_only_virtuals
 					/* todo_flags_finish */
  }
@@ -443,7 +421,7 @@ tree_ssa_loop_bounds (void)
   if (number_of_loops () <= 1)
     return 0;
 
-  estimate_numbers_of_iterations ();
+  estimate_numbers_of_iterations (true);
   scev_reset ();
   return 0;
 }
@@ -501,8 +479,7 @@ struct gimple_opt_pass pass_complete_unroll =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops
-    | TODO_ggc_collect			/* todo_flags_finish */
+  TODO_ggc_collect			/* todo_flags_finish */
  }
 };
 
@@ -548,7 +525,7 @@ struct gimple_opt_pass pass_complete_unrolli =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops
+  TODO_verify_flow
     | TODO_ggc_collect 			/* todo_flags_finish */
  }
 };
@@ -587,7 +564,7 @@ struct gimple_opt_pass pass_parallelize_loops =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops	/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -605,7 +582,7 @@ tree_ssa_loop_prefetch (void)
 static bool
 gate_tree_ssa_loop_prefetch (void)
 {
-  return flag_prefetch_loop_arrays != 0;
+  return flag_prefetch_loop_arrays > 0;
 }
 
 struct gimple_opt_pass pass_loop_prefetch =
@@ -623,7 +600,7 @@ struct gimple_opt_pass pass_loop_prefetch =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops	/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -660,8 +637,7 @@ struct gimple_opt_pass pass_iv_optimize =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops
-  | TODO_update_ssa | TODO_ggc_collect	/* todo_flags_finish */
+  TODO_update_ssa | TODO_ggc_collect	/* todo_flags_finish */
  }
 };
 
@@ -691,6 +667,7 @@ struct gimple_opt_pass pass_tree_loop_done =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_cleanup_cfg | TODO_dump_func	/* todo_flags_finish */
+  TODO_cleanup_cfg
+    | TODO_verify_flow			/* todo_flags_finish */
  }
 };