X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ftree-ssa-loop.c;h=1a9c2be73768590109fb8905ea49d15ee432964e;hp=a735084803e2bfe9b25dff0c44442e59709aa7ee;hb=927a01eba66c97c810b74e48669832863c8b846d;hpb=3f5be5f47c8ea7c064a4e573ad5a98cc364f59ae diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c index a735084803e..1a9c2be7376 100644 --- a/gcc/tree-ssa-loop.c +++ b/gcc/tree-ssa-loop.c @@ -1,34 +1,31 @@ /* Loop optimizations over tree-ssa. - Copyright (C) 2003, 2005 Free Software Foundation, Inc. - + Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. + This file is part of GCC. - + GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any +Free Software Foundation; either version 3, or (at your option) any later version. - + GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" #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" @@ -37,28 +34,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA #include "flags.h" #include "tree-inline.h" #include "tree-scalar-evolution.h" - -/* The loop tree currently optimized. */ - -struct loops *current_loops = NULL; - -/* Initializes the loop structures. */ - -static struct loops * -tree_loop_optimizer_init (void) -{ - struct loops *loops; - - loops = loop_optimizer_init (LOOPS_NORMAL - | LOOPS_HAVE_MARKED_SINGLE_EXITS); - - if (!loops) - return NULL; - - rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa); - - return loops; -} +#include "diagnostic-core.h" +#include "tree-vectorizer.h" /* The loop superpass. */ @@ -68,8 +45,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 */ @@ -81,24 +60,30 @@ 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_verify_ssa | TODO_ggc_collect /* todo_flags_finish */ + } }; /* Loop optimizer initialization. */ -static void +static unsigned int tree_ssa_loop_init (void) { - current_loops = tree_loop_optimizer_init (); - if (!current_loops) - return; + loop_optimizer_init (LOOPS_NORMAL + | LOOPS_HAVE_RECORDED_EXITS); + rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa); + + if (number_of_loops () <= 1) + return 0; - scev_initialize (current_loops); + scev_initialize (); + 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 */ @@ -110,19 +95,19 @@ 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 */ + 0 /* todo_flags_finish */ + } }; /* Loop invariant motion pass. */ -static void +static unsigned int tree_ssa_loop_im (void) { - if (!current_loops) - return; + if (number_of_loops () <= 1) + return 0; - tree_ssa_lim (current_loops); + return tree_ssa_lim (); } static bool @@ -131,8 +116,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 */ @@ -144,19 +131,19 @@ 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 */ + 0 /* todo_flags_finish */ + } }; /* Loop unswitching pass. */ -static void +static unsigned int tree_ssa_loop_unswitch (void) { - if (!current_loops) - return; + if (number_of_loops () <= 1) + return 0; - tree_ssa_unswitch_loops (current_loops); + return tree_ssa_unswitch_loops (); } static bool @@ -165,8 +152,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 */ @@ -178,26 +167,67 @@ struct tree_opt_pass pass_tree_unswitch = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ - 0 /* letter */ + TODO_ggc_collect /* todo_flags_finish */ + } +}; + +/* Predictive commoning. */ + +static unsigned +run_tree_predictive_commoning (void) +{ + if (!current_loops) + return 0; + + return tree_predictive_commoning (); +} + +static bool +gate_tree_predictive_commoning (void) +{ + return flag_predictive_commoning != 0; +} + +struct gimple_opt_pass pass_predcom = +{ + { + GIMPLE_PASS, + "pcom", /* name */ + gate_tree_predictive_commoning, /* gate */ + run_tree_predictive_commoning, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_PREDCOM, /* tv_id */ + PROP_cfg, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + TODO_update_ssa_only_virtuals /* todo_flags_finish */ + } }; /* Loop autovectorization. */ -static void +static unsigned int tree_vectorize (void) { - vectorize_loops (current_loops); + if (number_of_loops () <= 1) + return 0; + + return vectorize_loops (); } static bool gate_tree_vectorize (void) { - return flag_tree_vectorize && current_loops; + 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 */ @@ -208,54 +238,125 @@ struct tree_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, /* todo_flags_finish */ - 0 /* letter */ + 0, /* todo_flags_start */ + TODO_update_ssa + | TODO_ggc_collect /* todo_flags_finish */ + } }; -/* Loop nest optimizations. */ +/* GRAPHITE optimizations. */ -static void -tree_linear_transform (void) +static unsigned int +graphite_transforms (void) { if (!current_loops) - return; + 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_loop_flatten) + flag_graphite = 1; + + return flag_graphite != 0; +} + +struct gimple_opt_pass pass_graphite = +{ + { + GIMPLE_PASS, + "graphite0", /* name */ + gate_graphite_transforms, /* gate */ + NULL, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_GRAPHITE, /* tv_id */ + PROP_cfg | PROP_ssa, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0 /* todo_flags_finish */ + } +}; - linear_transform_loops (current_loops); +struct gimple_opt_pass pass_graphite_transforms = +{ + { + GIMPLE_PASS, + "graphite", /* name */ + gate_graphite_transforms, /* gate */ + graphite_transforms, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_GRAPHITE_TRANSFORMS, /* tv_id */ + PROP_cfg | PROP_ssa, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0 /* todo_flags_finish */ + } +}; + +/* Check the correctness of the data dependence analyzers. */ + +static unsigned int +check_data_deps (void) +{ + if (number_of_loops () <= 1) + return 0; + + tree_check_data_deps (); + return 0; } static bool -gate_tree_linear_transform (void) +gate_check_data_deps (void) { - return flag_tree_loop_linear != 0; + return flag_check_data_deps != 0; } -struct tree_opt_pass pass_linear_transform = +struct gimple_opt_pass pass_check_data_deps = { - "ltrans", /* name */ - gate_tree_linear_transform, /* gate */ - tree_linear_transform, /* execute */ + { + GIMPLE_PASS, + "ckdd", /* name */ + gate_check_data_deps, /* gate */ + check_data_deps, /* execute */ NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - TV_TREE_LINEAR_TRANSFORM, /* tv_id */ + TV_CHECK_DATA_DEPS, /* 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 */ + 0 /* todo_flags_finish */ + } }; /* Canonical induction variable creation pass. */ -static void +static unsigned int tree_ssa_loop_ivcanon (void) { - if (!current_loops) - return; + if (number_of_loops () <= 1) + return 0; - canonicalize_induction_variables (current_loops); + return canonicalize_induction_variables (); } static bool @@ -264,8 +365,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 */ @@ -277,8 +380,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 */ + 0 /* todo_flags_finish */ + } }; /* Propagation of constants using scev. */ @@ -286,11 +389,13 @@ struct tree_opt_pass pass_iv_canon = static bool gate_scev_const_prop (void) { - return true; + 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 */ @@ -302,93 +407,116 @@ struct tree_opt_pass pass_scev_cprop = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func | TODO_update_ssa_only_virtuals, + TODO_cleanup_cfg + | TODO_update_ssa_only_virtuals /* todo_flags_finish */ - 0 /* letter */ + } }; -/* Remove empty loops. */ +/* Record bounds on numbers of iterations of loops. */ -static void -tree_ssa_empty_loop (void) +static unsigned int +tree_ssa_loop_bounds (void) { - if (!current_loops) - return; + if (number_of_loops () <= 1) + return 0; - remove_empty_loops (current_loops); + estimate_numbers_of_iterations (true); + scev_reset (); + return 0; } -struct tree_opt_pass pass_empty_loop = +struct gimple_opt_pass pass_record_bounds = { - "empty", /* name */ + { + GIMPLE_PASS, + "*record_bounds", /* name */ NULL, /* gate */ - tree_ssa_empty_loop, /* execute */ + tree_ssa_loop_bounds, /* execute */ NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - TV_COMPLETE_UNROLL, /* tv_id */ + TV_TREE_LOOP_BOUNDS, /* 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 */ + 0 /* todo_flags_finish */ + } }; -/* Record bounds on numbers of iterations of loops. */ +/* Complete unrolling of loops. */ -static void -tree_ssa_loop_bounds (void) +static unsigned int +tree_complete_unroll (void) { - if (!current_loops) - return; + if (number_of_loops () <= 1) + return 0; - estimate_numbers_of_iterations (current_loops); - scev_reset (); + return tree_unroll_loops_completely (flag_unroll_loops + || flag_peel_loops + || optimize >= 3, true); } -struct tree_opt_pass pass_record_bounds = +static bool +gate_tree_complete_unroll (void) { - NULL, /* name */ - NULL, /* gate */ - tree_ssa_loop_bounds, /* execute */ + return true; +} + +struct gimple_opt_pass pass_complete_unroll = +{ + { + GIMPLE_PASS, + "cunroll", /* name */ + gate_tree_complete_unroll, /* gate */ + tree_complete_unroll, /* execute */ NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - TV_TREE_LOOP_BOUNDS, /* tv_id */ + TV_COMPLETE_UNROLL, /* tv_id */ PROP_cfg | PROP_ssa, /* properties_required */ 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - 0, /* todo_flags_finish */ - 0 /* letter */ + TODO_ggc_collect /* todo_flags_finish */ + } }; -/* Complete unrolling of loops. */ +/* Complete unrolling of inner loops. */ -static void -tree_complete_unroll (void) +static unsigned int +tree_complete_unroll_inner (void) { - if (!current_loops) - return; + unsigned ret = 0; - tree_unroll_loops_completely (current_loops, - flag_unroll_loops - || flag_peel_loops - || optimize >= 3); + 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 (void) +gate_tree_complete_unroll_inner (void) { - return true; + return optimize >= 2; } -struct tree_opt_pass pass_complete_unroll = +struct gimple_opt_pass pass_complete_unrolli = { - "cunroll", /* name */ - gate_tree_complete_unroll, /* gate */ - tree_complete_unroll, /* execute */ + { + GIMPLE_PASS, + "cunrolli", /* name */ + gate_tree_complete_unroll_inner, /* gate */ + tree_complete_unroll_inner, /* execute */ NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ @@ -397,19 +525,95 @@ struct tree_opt_pass pass_complete_unroll = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func | TODO_verify_loops, /* todo_flags_finish */ - 0 /* letter */ + TODO_verify_flow + | TODO_ggc_collect /* todo_flags_finish */ + } +}; + +/* Parallelization. */ + +static bool +gate_tree_parallelize_loops (void) +{ + return flag_tree_parallelize_loops > 1; +} + +static unsigned +tree_parallelize_loops (void) +{ + if (number_of_loops () <= 1) + return 0; + + if (parallelize_loops ()) + return TODO_cleanup_cfg | TODO_rebuild_alias; + return 0; +} + +struct gimple_opt_pass pass_parallelize_loops = +{ + { + GIMPLE_PASS, + "parloops", /* name */ + gate_tree_parallelize_loops, /* gate */ + tree_parallelize_loops, /* execute */ + NULL, /* sub */ + NULL, /* next */ + 0, /* static_pass_number */ + TV_TREE_PARALLELIZE_LOOPS, /* tv_id */ + PROP_cfg | PROP_ssa, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0 /* todo_flags_finish */ + } +}; + +/* Prefetching. */ + +static unsigned int +tree_ssa_loop_prefetch (void) +{ + if (number_of_loops () <= 1) + return 0; + + return tree_ssa_prefetch_arrays (); +} + +static bool +gate_tree_ssa_loop_prefetch (void) +{ + return flag_prefetch_loop_arrays > 0; +} + +struct gimple_opt_pass pass_loop_prefetch = +{ + { + GIMPLE_PASS, + "aprefetch", /* 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 */ + 0 /* todo_flags_finish */ + } }; /* Induction variable optimizations. */ -static void +static unsigned int tree_ssa_loop_ivopts (void) { - if (!current_loops) - return; + if (number_of_loops () <= 1) + return 0; - tree_ssa_iv_optimize (current_loops); + tree_ssa_iv_optimize (); + return 0; } static bool @@ -418,8 +622,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 */ @@ -431,28 +637,25 @@ struct tree_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_flags_finish */ - 0 /* letter */ + TODO_update_ssa | TODO_ggc_collect /* todo_flags_finish */ + } }; /* Loop optimizer finalization. */ -static void +static unsigned int tree_ssa_loop_done (void) { - if (!current_loops) - return; - - free_numbers_of_iterations_estimates (current_loops); + free_numbers_of_iterations_estimates (); scev_finalize (); - loop_optimizer_finalize (current_loops); - current_loops = NULL; + loop_optimizer_finalize (); + 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 */ @@ -464,6 +667,7 @@ 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_verify_flow /* todo_flags_finish */ + } };