OSDN Git Service

gcc/cp/
[pf3gnuchains/gcc-fork.git] / gcc / tree-ssa-loop.c
index 240058a..52f5a7f 100644 (file)
@@ -55,8 +55,10 @@ gate_tree_loop (void)
   return flag_tree_loop_optimize != 0;
 }
 
-struct tree_opt_pass pass_tree_loop = 
+struct gimple_opt_pass pass_tree_loop = 
 {
+ {
+  GIMPLE_PASS,
   "loop",                              /* name */
   gate_tree_loop,                      /* gate */
   NULL,                                        /* execute */
@@ -68,8 +70,8 @@ struct tree_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 */
-  0                                    /* letter */
+  TODO_dump_func | TODO_verify_ssa | TODO_ggc_collect  /* todo_flags_finish */
+ }
 };
 
 /* Loop optimizer initialization.  */
@@ -85,8 +87,10 @@ tree_ssa_loop_init (void)
   return 0;
 }
   
-struct tree_opt_pass pass_tree_loop_init = 
+struct gimple_opt_pass pass_tree_loop_init = 
 {
+ {
+  GIMPLE_PASS,
   "loopinit",                          /* name */
   NULL,                                        /* gate */
   tree_ssa_loop_init,                  /* execute */
@@ -98,8 +102,8 @@ struct tree_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                                    /* letter */
+  TODO_dump_func | TODO_verify_loops   /* todo_flags_finish */
+ }
 };
 
 /* Loop invariant motion pass.  */
@@ -120,8 +124,10 @@ gate_tree_ssa_loop_im (void)
   return flag_tree_loop_im != 0;
 }
 
-struct tree_opt_pass pass_lim = 
+struct gimple_opt_pass pass_lim = 
 {
+ {
+  GIMPLE_PASS,
   "lim",                               /* name */
   gate_tree_ssa_loop_im,               /* gate */
   tree_ssa_loop_im,                    /* execute */
@@ -133,8 +139,8 @@ struct tree_opt_pass pass_lim =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func | TODO_verify_loops,  /* todo_flags_finish */
-  0                                    /* letter */
+  TODO_dump_func | TODO_verify_loops   /* todo_flags_finish */
+ }
 };
 
 /* Loop unswitching pass.  */
@@ -154,8 +160,10 @@ gate_tree_ssa_loop_unswitch (void)
   return flag_unswitch_loops != 0;
 }
 
-struct tree_opt_pass pass_tree_unswitch = 
+struct gimple_opt_pass pass_tree_unswitch = 
 {
+ {
+  GIMPLE_PASS,
   "unswitch",                          /* name */
   gate_tree_ssa_loop_unswitch,         /* gate */
   tree_ssa_loop_unswitch,              /* execute */
@@ -168,8 +176,8 @@ struct tree_opt_pass pass_tree_unswitch =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_ggc_collect | TODO_dump_func
-    | TODO_verify_loops,               /* todo_flags_finish */
-  0                                    /* letter */
+    | TODO_verify_loops                        /* todo_flags_finish */
+ }
 };
 
 /* Predictive commoning.  */
@@ -190,8 +198,10 @@ gate_tree_predictive_commoning (void)
   return flag_predictive_commoning != 0;
 }
 
-struct tree_opt_pass pass_predcom = 
+struct gimple_opt_pass pass_predcom = 
 {
+ {
+  GIMPLE_PASS,
   "pcom",                              /* name */
   gate_tree_predictive_commoning,      /* gate */
   run_tree_predictive_commoning,       /* execute */
@@ -204,8 +214,8 @@ struct tree_opt_pass pass_predcom =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_dump_func | TODO_verify_loops
-    | TODO_update_ssa_only_virtuals,   /* todo_flags_finish */
-  0                                    /* letter */
+    | TODO_update_ssa_only_virtuals    /* todo_flags_finish */
+ }
 };
 
 /* Loop autovectorization.  */
@@ -213,17 +223,22 @@ struct tree_opt_pass pass_predcom =
 static unsigned int
 tree_vectorize (void)
 {
+  if (number_of_loops () <= 1)
+    return 0;
+
   return vectorize_loops ();
 }
 
 static bool
 gate_tree_vectorize (void)
 {
-  return flag_tree_vectorize && number_of_loops () > 1;
+  return flag_tree_vectorize;
 }
 
-struct tree_opt_pass pass_vectorize =
+struct gimple_opt_pass pass_vectorize =
 {
+ {
+  GIMPLE_PASS,
   "vect",                               /* name */
   gate_tree_vectorize,                  /* gate */
   tree_vectorize,                       /* execute */
@@ -236,8 +251,8 @@ struct tree_opt_pass pass_vectorize =
   0,                                    /* properties_destroyed */
   TODO_verify_loops,                   /* todo_flags_start */
   TODO_dump_func | TODO_update_ssa
-    | TODO_ggc_collect,                        /* todo_flags_finish */
-  0                                    /* letter */
+    | TODO_ggc_collect                 /* todo_flags_finish */
+ }
 };
 
 /* Loop nest optimizations.  */
@@ -258,8 +273,10 @@ gate_tree_linear_transform (void)
   return flag_tree_loop_linear != 0;
 }
 
-struct tree_opt_pass pass_linear_transform =
+struct gimple_opt_pass pass_linear_transform =
 {
+ {
+  GIMPLE_PASS,
   "ltrans",                            /* name */
   gate_tree_linear_transform,          /* gate */
   tree_linear_transform,                       /* execute */
@@ -272,8 +289,9 @@ struct tree_opt_pass pass_linear_transform =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_dump_func | TODO_verify_loops
-    | TODO_ggc_collect,                        /* todo_flags_finish */
-  0                                    /* letter */    
+    | TODO_update_ssa_only_virtuals
+    | TODO_ggc_collect                 /* todo_flags_finish */
+ }
 };
 
 /* Check the correctness of the data dependence analyzers.  */
@@ -294,8 +312,10 @@ gate_check_data_deps (void)
   return flag_check_data_deps != 0;
 }
 
-struct tree_opt_pass pass_check_data_deps =
+struct gimple_opt_pass pass_check_data_deps =
 {
+ {
+  GIMPLE_PASS,
   "ckdd",                              /* name */
   gate_check_data_deps,                        /* gate */
   check_data_deps,                     /* execute */
@@ -307,8 +327,8 @@ struct tree_opt_pass pass_check_data_deps =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func,                      /* todo_flags_finish */
-  0                                    /* letter */    
+  TODO_dump_func                       /* todo_flags_finish */
+ }
 };
 
 /* Canonical induction variable creation pass.  */
@@ -328,8 +348,10 @@ gate_tree_ssa_loop_ivcanon (void)
   return flag_tree_loop_ivcanon != 0;
 }
 
-struct tree_opt_pass pass_iv_canon =
+struct gimple_opt_pass pass_iv_canon =
 {
+ {
+  GIMPLE_PASS,
   "ivcanon",                           /* name */
   gate_tree_ssa_loop_ivcanon,          /* gate */
   tree_ssa_loop_ivcanon,               /* execute */
@@ -341,8 +363,8 @@ struct tree_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                                    /* letter */
+  TODO_dump_func | TODO_verify_loops   /* todo_flags_finish */
+ }
 };
 
 /* Propagation of constants using scev.  */
@@ -353,8 +375,10 @@ gate_scev_const_prop (void)
   return flag_tree_scev_cprop;
 }
 
-struct tree_opt_pass pass_scev_cprop =
+struct gimple_opt_pass pass_scev_cprop =
 {
+ {
+  GIMPLE_PASS,
   "sccp",                              /* name */
   gate_scev_const_prop,                        /* gate */
   scev_const_prop,                     /* execute */
@@ -367,9 +391,9 @@ struct tree_opt_pass pass_scev_cprop =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_dump_func | TODO_cleanup_cfg
-    | TODO_update_ssa_only_virtuals,
+    | TODO_update_ssa_only_virtuals
                                        /* todo_flags_finish */
-  0                                    /* letter */
+ }
 };
 
 /* Remove empty loops.  */
@@ -383,8 +407,10 @@ tree_ssa_empty_loop (void)
   return remove_empty_loops ();
 }
 
-struct tree_opt_pass pass_empty_loop =
+struct gimple_opt_pass pass_empty_loop =
 {
+ {
+  GIMPLE_PASS,
   "empty",                             /* name */
   NULL,                                        /* gate */
   tree_ssa_empty_loop,                 /* execute */
@@ -397,8 +423,8 @@ struct tree_opt_pass pass_empty_loop =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_dump_func | TODO_verify_loops 
-    | TODO_ggc_collect,                        /* todo_flags_finish */
-  0                                    /* letter */
+    | TODO_ggc_collect                 /* todo_flags_finish */
+ }
 };
 
 /* Record bounds on numbers of iterations of loops.  */
@@ -414,8 +440,10 @@ tree_ssa_loop_bounds (void)
   return 0;
 }
 
-struct tree_opt_pass pass_record_bounds =
+struct gimple_opt_pass pass_record_bounds =
 {
+ {
+  GIMPLE_PASS,
   NULL,                                        /* name */
   NULL,                                        /* gate */
   tree_ssa_loop_bounds,                        /* execute */
@@ -427,8 +455,8 @@ struct tree_opt_pass pass_record_bounds =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  0,                                   /* todo_flags_finish */
-  0                                    /* letter */
+  0                                    /* todo_flags_finish */
+ }
 };
 
 /* Complete unrolling of loops.  */
@@ -441,7 +469,7 @@ tree_complete_unroll (void)
 
   return tree_unroll_loops_completely (flag_unroll_loops
                                       || flag_peel_loops
-                                      || optimize >= 3);
+                                      || optimize >= 3, true);
 }
 
 static bool
@@ -450,8 +478,10 @@ gate_tree_complete_unroll (void)
   return true;
 }
 
-struct tree_opt_pass pass_complete_unroll =
+struct gimple_opt_pass pass_complete_unroll =
 {
+ {
+  GIMPLE_PASS,
   "cunroll",                           /* name */
   gate_tree_complete_unroll,           /* gate */
   tree_complete_unroll,                        /* execute */
@@ -464,8 +494,55 @@ struct tree_opt_pass pass_complete_unroll =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_dump_func | TODO_verify_loops
-    | TODO_ggc_collect,                        /* todo_flags_finish */
-  0                                    /* letter */
+    | TODO_ggc_collect                 /* todo_flags_finish */
+ }
+};
+
+/* Complete unrolling of inner loops.  */
+
+static unsigned int
+tree_complete_unroll_inner (void)
+{
+  unsigned ret = 0;
+
+  loop_optimizer_init (LOOPS_NORMAL
+                      | LOOPS_HAVE_RECORDED_EXITS);
+  if (number_of_loops () > 1)
+    {
+      scev_initialize ();
+      ret = tree_unroll_loops_completely (optimize >= 3, false);
+      free_numbers_of_iterations_estimates ();
+      scev_finalize ();
+    }
+  loop_optimizer_finalize ();
+
+  return ret;
+}
+
+static bool
+gate_tree_complete_unroll_inner (void)
+{
+  return optimize >= 2;
+}
+
+struct gimple_opt_pass pass_complete_unrolli =
+{
+ {
+  GIMPLE_PASS,
+  "cunrolli",                          /* name */
+  gate_tree_complete_unroll_inner,     /* gate */
+  tree_complete_unroll_inner,          /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  TV_COMPLETE_UNROLL,                  /* 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_ggc_collect                         /* todo_flags_finish */
+ }
 };
 
 /* Parallelization.  */
@@ -473,7 +550,7 @@ struct tree_opt_pass pass_complete_unroll =
 static bool
 gate_tree_parallelize_loops (void)
 {
-  return flag_tree_parallelize_loops != 1;
+  return flag_tree_parallelize_loops > 1;
 }
 
 static unsigned
@@ -487,8 +564,10 @@ tree_parallelize_loops (void)
   return 0;
 }
 
-struct tree_opt_pass pass_parallelize_loops =
+struct gimple_opt_pass pass_parallelize_loops =
 {
+ {
+  GIMPLE_PASS,
   "parloops",                          /* name */
   gate_tree_parallelize_loops,         /* gate */
   tree_parallelize_loops,                      /* execute */
@@ -500,8 +579,8 @@ struct tree_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                                    /* letter */    
+  TODO_dump_func | TODO_verify_loops   /* todo_flags_finish */
+ }
 };
 
 /* Prefetching.  */
@@ -521,8 +600,10 @@ gate_tree_ssa_loop_prefetch (void)
   return flag_prefetch_loop_arrays != 0;
 }
 
-struct tree_opt_pass pass_loop_prefetch =
+struct gimple_opt_pass pass_loop_prefetch =
 {
+ {
+  GIMPLE_PASS,
   "aprefetch",                         /* name */
   gate_tree_ssa_loop_prefetch,         /* gate */
   tree_ssa_loop_prefetch,              /* execute */
@@ -534,8 +615,8 @@ struct tree_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                                    /* letter */
+  TODO_dump_func | TODO_verify_loops   /* todo_flags_finish */
+ }
 };
 
 /* Induction variable optimizations.  */
@@ -556,8 +637,10 @@ gate_tree_ssa_loop_ivopts (void)
   return flag_ivopts != 0;
 }
 
-struct tree_opt_pass pass_iv_optimize =
+struct gimple_opt_pass pass_iv_optimize =
 {
+ {
+  GIMPLE_PASS,
   "ivopts",                            /* name */
   gate_tree_ssa_loop_ivopts,           /* gate */
   tree_ssa_loop_ivopts,                        /* execute */
@@ -570,8 +653,8 @@ struct tree_opt_pass pass_iv_optimize =
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
   TODO_dump_func | TODO_verify_loops
-  | TODO_update_ssa | TODO_ggc_collect,        /* todo_flags_finish */
-  0                                    /* letter */
+  | TODO_update_ssa | TODO_ggc_collect /* todo_flags_finish */
+ }
 };
 
 /* Loop optimizer finalization.  */
@@ -585,8 +668,10 @@ tree_ssa_loop_done (void)
   return 0;
 }
   
-struct tree_opt_pass pass_tree_loop_done = 
+struct gimple_opt_pass pass_tree_loop_done = 
 {
+ {
+  GIMPLE_PASS,
   "loopdone",                          /* name */
   NULL,                                        /* gate */
   tree_ssa_loop_done,                  /* execute */
@@ -598,6 +683,6 @@ struct tree_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 */
-  0                                    /* letter */
+  TODO_cleanup_cfg | TODO_dump_func    /* todo_flags_finish */
+ }
 };