X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-ssa-loop.c;h=1a9c2be73768590109fb8905ea49d15ee432964e;hb=1678dcdf749fdcf7cc7225d26ed6f44e0b71330d;hp=aed2a4dcc8a37794b60f60a9a54500c2ed88c82f;hpb=8c4c00c181e6df4f0a9afc76e4c9edbbc1c2fd41;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c index aed2a4dcc8a..1a9c2be7376 100644 --- a/gcc/tree-ssa-loop.c +++ b/gcc/tree-ssa-loop.c @@ -1,18 +1,19 @@ /* Loop optimizations over tree-ssa. - Copyright (C) 2003, 2005, 2006, 2007 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 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 COPYING3. If not see . */ @@ -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,16 +34,8 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "tree-inline.h" #include "tree-scalar-evolution.h" - -/* Initializes the loop structures. */ - -static void -tree_loop_optimizer_init (void) -{ - loop_optimizer_init (LOOPS_NORMAL - | LOOPS_HAVE_RECORDED_EXITS); - rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa); -} +#include "diagnostic-core.h" +#include "tree-vectorizer.h" /* The loop superpass. */ @@ -55,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 */ @@ -68,8 +60,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_verify_ssa | TODO_ggc_collect /* todo_flags_finish */ + } }; /* Loop optimizer initialization. */ @@ -77,16 +69,21 @@ struct tree_opt_pass pass_tree_loop = static unsigned int tree_ssa_loop_init (void) { - tree_loop_optimizer_init (); + 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 (); 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 +95,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 */ + 0 /* todo_flags_finish */ + } }; /* Loop invariant motion pass. */ @@ -110,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 @@ -120,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 */ @@ -133,8 +131,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 */ + 0 /* todo_flags_finish */ + } }; /* Loop unswitching pass. */ @@ -154,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 */ @@ -167,9 +167,8 @@ struct tree_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 */ - 0 /* letter */ + TODO_ggc_collect /* todo_flags_finish */ + } }; /* Predictive commoning. */ @@ -180,8 +179,7 @@ run_tree_predictive_commoning (void) if (!current_loops) return 0; - tree_predictive_commoning (); - return 0; + return tree_predictive_commoning (); } static bool @@ -190,8 +188,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 */ @@ -203,9 +203,8 @@ struct tree_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 */ - 0 /* letter */ + TODO_update_ssa_only_virtuals /* todo_flags_finish */ + } }; /* Loop autovectorization. */ @@ -213,17 +212,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 */ @@ -234,46 +238,77 @@ 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_ggc_collect, /* todo_flags_finish */ - 0 /* letter */ + 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) -{ - return flag_tree_loop_linear != 0; +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 tree_opt_pass pass_linear_transform = +struct gimple_opt_pass pass_graphite = { - "ltrans", /* name */ - gate_tree_linear_transform, /* gate */ - tree_linear_transform, /* execute */ + { + GIMPLE_PASS, + "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_ggc_collect, /* todo_flags_finish */ - 0 /* letter */ + 0 /* todo_flags_finish */ + } +}; + +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. */ @@ -294,8 +329,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 +344,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 */ + 0 /* todo_flags_finish */ + } }; /* Canonical induction variable creation pass. */ @@ -328,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 */ @@ -341,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. */ @@ -353,8 +392,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 */ @@ -366,95 +407,116 @@ struct tree_opt_pass pass_scev_cprop = 0, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func | TODO_cleanup_cfg - | 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 unsigned int -tree_ssa_empty_loop (void) +tree_ssa_loop_bounds (void) { if (number_of_loops () <= 1) return 0; - return remove_empty_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_ggc_collect, /* todo_flags_finish */ - 0 /* letter */ + 0 /* todo_flags_finish */ + } }; -/* Record bounds on numbers of iterations of loops. */ +/* Complete unrolling of loops. */ static unsigned int -tree_ssa_loop_bounds (void) +tree_complete_unroll (void) { if (number_of_loops () <= 1) return 0; - estimate_numbers_of_iterations (); - scev_reset (); - return 0; + 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 unsigned int -tree_complete_unroll (void) +tree_complete_unroll_inner (void) { - if (number_of_loops () <= 1) - return 0; + unsigned ret = 0; - return tree_unroll_loops_completely (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 */ @@ -463,9 +525,47 @@ struct tree_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 */ - 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. */ @@ -482,11 +582,13 @@ 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 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 */ @@ -498,8 +600,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 */ + 0 /* todo_flags_finish */ + } }; /* Induction variable optimizations. */ @@ -520,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 */ @@ -533,9 +637,8 @@ 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_ggc_collect, /* todo_flags_finish */ - 0 /* letter */ + TODO_update_ssa | TODO_ggc_collect /* todo_flags_finish */ + } }; /* Loop optimizer finalization. */ @@ -548,9 +651,11 @@ tree_ssa_loop_done (void) 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 */ @@ -562,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 */ + } };