X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ftree-ssa-loop.c;h=475f31e3ba855f0b6be96f40974e45076a08a3c5;hp=55cce5548e6e1a4baf236618ef71eb3c994813a0;hb=4c641bf8e55764bc6f1ea1ece9b8fe703475c671;hpb=dec41e985c71854a2c59159966a63a2c3455b079 diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c index 55cce5548e6..475f31e3ba8 100644 --- a/gcc/tree-ssa-loop.c +++ b/gcc/tree-ssa-loop.c @@ -1,5 +1,5 @@ /* Loop optimizations over tree-ssa. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -15,8 +15,8 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #include "config.h" #include "system.h" @@ -40,30 +40,22 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* The loop tree currently optimized. */ -struct loops *current_loops; +struct loops *current_loops = NULL; -/* Initializes the loop structures. DUMP is the file to that the details - about the analysis should be dumped. */ +/* Initializes the loop structures. */ static struct loops * -tree_loop_optimizer_init (FILE *dump) +tree_loop_optimizer_init (void) { - struct loops *loops = loop_optimizer_init (dump); + struct loops *loops; + + loops = loop_optimizer_init (LOOPS_NORMAL + | LOOPS_HAVE_MARKED_SINGLE_EXITS); if (!loops) return NULL; - /* Creation of preheaders may create redundant phi nodes if the loop is - entered by more than one edge, but the initial value of the induction - variable is the same on all of them. */ - kill_redundant_phi_nodes (); - rewrite_into_ssa (false); - bitmap_clear (vars_to_rename); - - rewrite_into_loop_closed_ssa (); -#ifdef ENABLE_CHECKING - verify_loop_closed_ssa (); -#endif + rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa); return loops; } @@ -71,15 +63,15 @@ tree_loop_optimizer_init (FILE *dump) /* The loop superpass. */ static bool -gate_loop (void) +gate_tree_loop (void) { return flag_tree_loop_optimize != 0; } -struct tree_opt_pass pass_loop = +struct tree_opt_pass pass_tree_loop = { "loop", /* name */ - gate_loop, /* gate */ + gate_tree_loop, /* gate */ NULL, /* execute */ NULL, /* sub */ NULL, /* next */ @@ -89,25 +81,24 @@ struct tree_opt_pass pass_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_dump_func | TODO_verify_ssa | TODO_ggc_collect, /* todo_flags_finish */ + 0 /* letter */ }; /* Loop optimizer initialization. */ -static void +static unsigned int tree_ssa_loop_init (void) { - current_loops = tree_loop_optimizer_init (dump_file); + current_loops = tree_loop_optimizer_init (); if (!current_loops) - return; - - /* Find the loops that are exited just through a single edge. */ - mark_single_exit_loops (current_loops); + return 0; scev_initialize (current_loops); + return 0; } -struct tree_opt_pass pass_loop_init = +struct tree_opt_pass pass_tree_loop_init = { "loopinit", /* name */ NULL, /* gate */ @@ -115,23 +106,25 @@ struct tree_opt_pass pass_loop_init = NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - 0, /* tv_id */ + TV_TREE_LOOP_INIT, /* tv_id */ PROP_cfg, /* properties_required */ 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ + 0 /* letter */ }; /* Loop invariant motion pass. */ -static void +static unsigned int tree_ssa_loop_im (void) { if (!current_loops) - return; + return 0; tree_ssa_lim (current_loops); + return 0; } static bool @@ -153,25 +146,57 @@ struct tree_opt_pass pass_lim = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ + 0 /* letter */ }; -/* Loop autovectorization. */ +/* Loop unswitching pass. */ -static void -tree_vectorize (void) +static unsigned int +tree_ssa_loop_unswitch (void) { if (!current_loops) - return; + return 0; - bitmap_clear (vars_to_rename); + return tree_ssa_unswitch_loops (current_loops); +} + +static bool +gate_tree_ssa_loop_unswitch (void) +{ + return flag_unswitch_loops != 0; +} + +struct tree_opt_pass pass_tree_unswitch = +{ + "unswitch", /* name */ + gate_tree_ssa_loop_unswitch, /* gate */ + tree_ssa_loop_unswitch, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_TREE_LOOP_UNSWITCH, /* tv_id */ + PROP_cfg, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ + 0 /* letter */ +}; + +/* Loop autovectorization. */ + +static unsigned int +tree_vectorize (void) +{ vectorize_loops (current_loops); + return 0; } static bool gate_tree_vectorize (void) { - return flag_tree_vectorize != 0; + return flag_tree_vectorize && current_loops; } struct tree_opt_pass pass_vectorize = @@ -186,19 +211,55 @@ struct tree_opt_pass pass_vectorize = PROP_cfg | PROP_ssa, /* properties_required */ 0, /* properties_provided */ 0, /* properties_destroyed */ - 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_verify_loops, /* todo_flags_start */ + TODO_dump_func | TODO_update_ssa, /* todo_flags_finish */ + 0 /* letter */ +}; + +/* Loop nest optimizations. */ + +static unsigned int +tree_linear_transform (void) +{ + if (!current_loops) + return 0; + + linear_transform_loops (current_loops); + return 0; +} + +static bool +gate_tree_linear_transform (void) +{ + return flag_tree_loop_linear != 0; +} + +struct tree_opt_pass pass_linear_transform = +{ + "ltrans", /* name */ + gate_tree_linear_transform, /* gate */ + tree_linear_transform, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_TREE_LINEAR_TRANSFORM, /* 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_flags_finish */ + 0 /* letter */ }; /* Canonical induction variable creation pass. */ -static void +static unsigned int tree_ssa_loop_ivcanon (void) { if (!current_loops) - return; + return 0; - canonicalize_induction_variables (current_loops); + return canonicalize_induction_variables (current_loops); } static bool @@ -220,24 +281,113 @@ struct tree_opt_pass pass_iv_canon = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ + 0 /* letter */ +}; + +/* Propagation of constants using scev. */ + +static bool +gate_scev_const_prop (void) +{ + return true; +} + +struct tree_opt_pass pass_scev_cprop = +{ + "sccp", /* name */ + gate_scev_const_prop, /* gate */ + scev_const_prop, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_SCEV_CONST, /* tv_id */ + PROP_cfg | PROP_ssa, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + TODO_dump_func | TODO_cleanup_cfg + | TODO_update_ssa_only_virtuals, + /* todo_flags_finish */ + 0 /* letter */ +}; + +/* Remove empty loops. */ + +static unsigned int +tree_ssa_empty_loop (void) +{ + if (!current_loops) + return 0; + + return remove_empty_loops (current_loops); +} + +struct tree_opt_pass pass_empty_loop = +{ + "empty", /* name */ + NULL, /* gate */ + tree_ssa_empty_loop, /* 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_flags_finish */ + 0 /* letter */ +}; + +/* Record bounds on numbers of iterations of loops. */ + +static unsigned int +tree_ssa_loop_bounds (void) +{ + if (!current_loops) + return 0; + + estimate_numbers_of_iterations (current_loops); + scev_reset (); + return 0; +} + +struct tree_opt_pass pass_record_bounds = +{ + NULL, /* name */ + NULL, /* gate */ + tree_ssa_loop_bounds, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_TREE_LOOP_BOUNDS, /* tv_id */ + PROP_cfg | PROP_ssa, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ + 0 /* letter */ }; /* Complete unrolling of loops. */ -static void +static unsigned int tree_complete_unroll (void) { if (!current_loops) - return; + return 0; - tree_unroll_loops_completely (current_loops); + return tree_unroll_loops_completely (current_loops, + flag_unroll_loops + || flag_peel_loops + || optimize >= 3); } static bool gate_tree_complete_unroll (void) { - return flag_unroll_loops != 0; + return true; } struct tree_opt_pass pass_complete_unroll = @@ -253,18 +403,54 @@ struct tree_opt_pass pass_complete_unroll = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ + 0 /* letter */ +}; + +/* Prefetching. */ + +static unsigned int +tree_ssa_loop_prefetch (void) +{ + if (!current_loops) + return 0; + + return tree_ssa_prefetch_arrays (current_loops); +} + +static bool +gate_tree_ssa_loop_prefetch (void) +{ + return flag_prefetch_loop_arrays != 0; +} + +struct tree_opt_pass pass_loop_prefetch = +{ + "prefetch", /* name */ + gate_tree_ssa_loop_prefetch, /* gate */ + tree_ssa_loop_prefetch, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_TREE_PREFETCH, /* 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_flags_finish */ + 0 /* letter */ }; /* Induction variable optimizations. */ -static void +static unsigned int tree_ssa_loop_ivopts (void) { if (!current_loops) - return; + return 0; tree_ssa_iv_optimize (current_loops); + return 0; } static bool @@ -286,30 +472,28 @@ struct tree_opt_pass pass_iv_optimize = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_dump_func + | TODO_verify_loops + | TODO_update_ssa, /* todo_flags_finish */ + 0 /* letter */ }; /* Loop optimizer finalization. */ -static void +static unsigned int tree_ssa_loop_done (void) { if (!current_loops) - return; - -#ifdef ENABLE_CHECKING - verify_loop_closed_ssa (); -#endif + return 0; free_numbers_of_iterations_estimates (current_loops); scev_finalize (); - loop_optimizer_finalize (current_loops, - (dump_flags & TDF_DETAILS ? dump_file : NULL)); + loop_optimizer_finalize (current_loops); current_loops = NULL; - cleanup_tree_cfg (); + return 0; } -struct tree_opt_pass pass_loop_done = +struct tree_opt_pass pass_tree_loop_done = { "loopdone", /* name */ NULL, /* gate */ @@ -317,11 +501,11 @@ struct tree_opt_pass pass_loop_done = NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - 0, /* tv_id */ + TV_TREE_LOOP_FINI, /* tv_id */ PROP_cfg, /* properties_required */ 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ + TODO_cleanup_cfg | TODO_dump_func, /* todo_flags_finish */ + 0 /* letter */ }; -