X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-ssa-loop.c;h=0aab6d3a2d3d69da0954dc621c9ac31767890c14;hb=b20cb873ccf058adcb0687cfac98445ee8132ab6;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..0aab6d3a2d3 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, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. @@ -36,16 +36,7 @@ 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 "tree-vectorizer.h" /* The loop superpass. */ @@ -55,8 +46,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 +61,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. */ @@ -77,7 +70,10 @@ 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; @@ -85,8 +81,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 +96,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 +118,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 +133,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 +154,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 +170,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 +192,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 +208,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 +217,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 +245,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 +267,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 +283,53 @@ 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 */ + } +}; + +/* 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_graphite = 1; + + return flag_graphite != 0; +} + +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 */ + TODO_verify_loops /* todo_flags_finish */ + } }; /* Check the correctness of the data dependence analyzers. */ @@ -294,8 +350,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 +365,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 +386,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 +401,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 +413,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,38 +429,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. */ - -static unsigned int -tree_ssa_empty_loop (void) -{ - if (number_of_loops () <= 1) - return 0; - - return remove_empty_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_ggc_collect, /* todo_flags_finish */ - 0 /* letter */ + } }; /* Record bounds on numbers of iterations of loops. */ @@ -414,8 +447,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 +462,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 +476,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 +485,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 +501,93 @@ 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. */ + +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 */ + TODO_dump_func | TODO_verify_loops /* todo_flags_finish */ + } }; /* Prefetching. */ @@ -485,8 +607,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 */ @@ -498,8 +622,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. */ @@ -520,8 +644,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 */ @@ -534,8 +660,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. */ @@ -549,8 +675,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 */ @@ -562,6 +690,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 */ + } };