X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Floop-unroll.c;h=68512d02a5a796139c3ebb6c51cbe4400522874d;hb=46a05807dbfaf4275c87970c5522ef2ceec99945;hp=1d1eb4d48654b01469d9bced1ebca4d291e5e5d7;hpb=375bb675bbe7f76b0633c10f2429ac9a4b7a480f;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c index 1d1eb4d4865..68512d02a5a 100644 --- a/gcc/loop-unroll.c +++ b/gcc/loop-unroll.c @@ -1,5 +1,5 @@ /* Loop unrolling and peeling. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -24,6 +24,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "tm.h" #include "rtl.h" #include "hard-reg-set.h" +#include "obstack.h" #include "basic-block.h" #include "cfgloop.h" #include "cfglayout.h" @@ -84,13 +85,16 @@ struct iv_to_split XEXP (XEXP (single_set, loc[0]), loc[1]). */ }; +DEF_VEC_P(rtx); +DEF_VEC_ALLOC_P(rtx,heap); + /* Information about accumulators to expand. */ struct var_to_expand { rtx insn; /* The insn in that the variable expansion occurs. */ - rtx reg; /* The accumulator which is expanded. */ - varray_type var_expansions; /* The copies of the accumulator which is expanded. */ + rtx reg; /* The accumulator which is expanded. */ + VEC(rtx,heap) *var_expansions; /* The copies of the accumulator which is expanded. */ enum rtx_code op; /* The type of the accumulation - addition, subtraction or multiplication. */ int expansion_count; /* Count the number of expansions generated so far. */ @@ -371,6 +375,7 @@ decide_peel_once_rolling (struct loop *loop, int flags ATTRIBUTE_UNUSED) /* Check number of iterations. */ if (!desc->simple_p || desc->assumptions + || desc->infinite || !desc->const_iter || desc->niter != 0) { @@ -440,7 +445,8 @@ decide_peel_completely (struct loop *loop, int flags ATTRIBUTE_UNUSED) /* Check number of iterations. */ if (!desc->simple_p || desc->assumptions - || !desc->const_iter) + || !desc->const_iter + || desc->infinite) { if (dump_file) fprintf (dump_file, @@ -494,6 +500,8 @@ peel_loop_completely (struct loops *loops, struct loop *loop) if (npeel) { + bool ok; + wont_exit = sbitmap_alloc (npeel + 1); sbitmap_ones (wont_exit); RESET_BIT (wont_exit, 0); @@ -507,11 +515,12 @@ peel_loop_completely (struct loops *loops, struct loop *loop) opt_info = analyze_insns_in_loop (loop); opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), - loops, npeel, - wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), + loops, npeel, + wont_exit, desc->out_edge, + remove_edges, &n_remove_edges, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); free (wont_exit); @@ -669,6 +678,7 @@ unroll_loop_constant_iterations (struct loops *loops, struct loop *loop) struct niter_desc *desc = get_simple_loop_desc (loop); bool exit_at_end = loop_exit_at_end_p (loop); struct opt_info *opt_info = NULL; + bool ok; niter = desc->niter; @@ -703,12 +713,12 @@ unroll_loop_constant_iterations (struct loops *loops, struct loop *loop) if (exit_mod) { opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), + ok = duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), loops, exit_mod, wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); if (opt_info && exit_mod > 1) apply_opt_in_copies (opt_info, exit_mod, false, false); @@ -739,11 +749,12 @@ unroll_loop_constant_iterations (struct loops *loops, struct loop *loop) RESET_BIT (wont_exit, 1); opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), - loops, exit_mod + 1, - wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), + loops, exit_mod + 1, + wont_exit, desc->out_edge, + remove_edges, &n_remove_edges, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); if (opt_info && exit_mod > 0) apply_opt_in_copies (opt_info, exit_mod + 1, false, false); @@ -762,11 +773,12 @@ unroll_loop_constant_iterations (struct loops *loops, struct loop *loop) /* Now unroll the loop. */ opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_latch_edge (loop), - loops, max_unroll, - wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_latch_edge (loop), + loops, max_unroll, + wont_exit, desc->out_edge, + remove_edges, &n_remove_edges, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); if (opt_info) { @@ -934,6 +946,7 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) struct niter_desc *desc = get_simple_loop_desc (loop); bool exit_at_end = loop_exit_at_end_p (loop); struct opt_info *opt_info = NULL; + bool ok; if (flag_split_ivs_in_unroller || flag_variable_expansion_in_unroller) @@ -1012,11 +1025,12 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) && !desc->noloop_assumptions) SET_BIT (wont_exit, 1); ezc_swtch = loop_preheader_edge (loop)->src; - if (!duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), - loops, 1, - wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), + loops, 1, + wont_exit, desc->out_edge, + remove_edges, &n_remove_edges, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); /* Record the place where switch will be built for preconditioning. */ swtch = loop_split_edge_with (loop_preheader_edge (loop), @@ -1028,11 +1042,12 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) sbitmap_zero (wont_exit); if (i != n_peel - 1 || !last_may_exit) SET_BIT (wont_exit, 1); - if (!duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), - loops, 1, - wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), + loops, 1, + wont_exit, desc->out_edge, + remove_edges, &n_remove_edges, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); /* Create item for switch. */ j = n_peel - i - (extra_zero_check ? 0 : 1); @@ -1040,13 +1055,14 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) preheader = loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX); branch_code = compare_and_jump_seq (copy_rtx (niter), GEN_INT (j), EQ, - block_label (preheader), p, NULL_RTX); + block_label (preheader), p, + NULL_RTX); - swtch = loop_split_edge_with (EDGE_PRED (swtch, 0), branch_code); + swtch = loop_split_edge_with (single_pred_edge (swtch), branch_code); set_immediate_dominator (CDI_DOMINATORS, preheader, swtch); - EDGE_SUCC (swtch, 0)->probability = REG_BR_PROB_BASE - p; + single_pred_edge (swtch)->probability = REG_BR_PROB_BASE - p; e = make_edge (swtch, preheader, - EDGE_SUCC (swtch, 0)->flags & EDGE_IRREDUCIBLE_LOOP); + single_succ_edge (swtch)->flags & EDGE_IRREDUCIBLE_LOOP); e->probability = p; } @@ -1057,13 +1073,14 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) swtch = ezc_swtch; preheader = loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX); branch_code = compare_and_jump_seq (copy_rtx (niter), const0_rtx, EQ, - block_label (preheader), p, NULL_RTX); + block_label (preheader), p, + NULL_RTX); - swtch = loop_split_edge_with (EDGE_SUCC (swtch, 0), branch_code); + swtch = loop_split_edge_with (single_succ_edge (swtch), branch_code); set_immediate_dominator (CDI_DOMINATORS, preheader, swtch); - EDGE_SUCC (swtch, 0)->probability = REG_BR_PROB_BASE - p; + single_succ_edge (swtch)->probability = REG_BR_PROB_BASE - p; e = make_edge (swtch, preheader, - EDGE_SUCC (swtch, 0)->flags & EDGE_IRREDUCIBLE_LOOP); + single_succ_edge (swtch)->flags & EDGE_IRREDUCIBLE_LOOP); e->probability = p; } @@ -1076,11 +1093,12 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) RESET_BIT (wont_exit, may_exit_copy); opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_latch_edge (loop), - loops, max_unroll, - wont_exit, desc->out_edge, remove_edges, &n_remove_edges, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_latch_edge (loop), + loops, max_unroll, + wont_exit, desc->out_edge, + remove_edges, &n_remove_edges, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); if (opt_info) { @@ -1093,7 +1111,8 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) if (exit_at_end) { basic_block exit_block = desc->in_edge->src->rbi->copy; - /* Find a new in and out edge; they are in the last copy we have made. */ + /* Find a new in and out edge; they are in the last copy we have + made. */ if (EDGE_SUCC (exit_block, 0)->dest == desc->out_edge->dest) { @@ -1118,7 +1137,8 @@ unroll_loop_runtime_iterations (struct loops *loops, struct loop *loop) the correct new number of iterations is this: */ gcc_assert (!desc->const_iter); desc->niter_expr = - simplify_gen_binary (UDIV, desc->mode, old_niter, GEN_INT (max_unroll + 1)); + simplify_gen_binary (UDIV, desc->mode, old_niter, + GEN_INT (max_unroll + 1)); desc->niter_max /= max_unroll + 1; if (exit_at_end) { @@ -1241,6 +1261,7 @@ peel_loop_simple (struct loops *loops, struct loop *loop) unsigned npeel = loop->lpt_decision.times; struct niter_desc *desc = get_simple_loop_desc (loop); struct opt_info *opt_info = NULL; + bool ok; if (flag_split_ivs_in_unroller && npeel > 1) opt_info = analyze_insns_in_loop (loop); @@ -1250,10 +1271,11 @@ peel_loop_simple (struct loops *loops, struct loop *loop) opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), - loops, npeel, wont_exit, NULL, NULL, NULL, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_preheader_edge (loop), + loops, npeel, wont_exit, + NULL, NULL, + NULL, DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); free (wont_exit); @@ -1386,6 +1408,7 @@ unroll_loop_stupid (struct loops *loops, struct loop *loop) unsigned nunroll = loop->lpt_decision.times; struct niter_desc *desc = get_simple_loop_desc (loop); struct opt_info *opt_info = NULL; + bool ok; if (flag_split_ivs_in_unroller || flag_variable_expansion_in_unroller) @@ -1396,10 +1419,11 @@ unroll_loop_stupid (struct loops *loops, struct loop *loop) sbitmap_zero (wont_exit); opt_info_start_duplication (opt_info); - if (!duplicate_loop_to_header_edge (loop, loop_latch_edge (loop), - loops, nunroll, wont_exit, NULL, NULL, NULL, - DLTHE_FLAG_UPDATE_FREQ)) - abort (); + ok = duplicate_loop_to_header_edge (loop, loop_latch_edge (loop), + loops, nunroll, wont_exit, + NULL, NULL, NULL, + DLTHE_FLAG_UPDATE_FREQ); + gcc_assert (ok); if (opt_info) { @@ -1453,7 +1477,7 @@ ve_info_hash (const void *ves) } /* Return true if IVTS1 and IVTS2 (which are really both of type - "var_to_expand *") refer to the same instruction. */ + "var_to_expand *") refer to the same instruction. */ static int ve_info_eq (const void *ivts1, const void *ivts2) @@ -1464,7 +1488,7 @@ ve_info_eq (const void *ivts1, const void *ivts2) return i1->insn == i2->insn; } -/* Returns true if REG is referenced in one insn in LOOP. */ +/* Returns true if REG is referenced in one insn in LOOP. */ bool referenced_in_one_insn_in_loop_p (struct loop *loop, rtx reg) @@ -1559,7 +1583,7 @@ analyze_insn_to_expand_var (struct loop *loop, rtx insn) /* Record the accumulator to expand. */ ves = xmalloc (sizeof (struct var_to_expand)); ves->insn = insn; - VARRAY_RTX_INIT (ves->var_expansions, 1, "var_expansions"); + ves->var_expansions = VEC_alloc (rtx, heap, 1); ves->reg = copy_rtx (dest); ves->op = GET_CODE (src); ves->expansion_count = 0; @@ -1598,6 +1622,7 @@ analyze_iv_to_split_insn (rtx insn) rtx set, dest; struct rtx_iv iv; struct iv_to_split *ivts; + bool ok; /* For now we just split the basic induction variables. Later this may be extended for example by selecting also addresses of memory references. */ @@ -1612,8 +1637,8 @@ analyze_iv_to_split_insn (rtx insn) if (!biv_p (insn, dest)) return NULL; - if (!iv_analyze (insn, dest, &iv)) - abort (); + ok = iv_analyze (insn, dest, &iv); + gcc_assert (ok); if (iv.step == const0_rtx || iv.mode != iv.extend_mode) @@ -1639,15 +1664,14 @@ static struct opt_info * analyze_insns_in_loop (struct loop *loop) { basic_block *body, bb; - unsigned i, n_edges = 0; + unsigned i, num_edges = 0; struct opt_info *opt_info = xcalloc (1, sizeof (struct opt_info)); rtx insn; struct iv_to_split *ivts = NULL; struct var_to_expand *ves = NULL; PTR *slot1; PTR *slot2; - edge *edges = get_loop_exit_edges (loop, &n_edges); - basic_block preheader; + edge *edges = get_loop_exit_edges (loop, &num_edges); bool can_apply = false; iv_analysis_loop_init (loop); @@ -1661,15 +1685,14 @@ analyze_insns_in_loop (struct loop *loop) /* Record the loop exit bb and loop preheader before the unrolling. */ if (!loop_preheader_edge (loop)->src) { - preheader = loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX); + loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX); opt_info->loop_preheader = loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX); } else opt_info->loop_preheader = loop_preheader_edge (loop)->src; - if (n_edges == 1 - && !(edges[0]->flags & EDGE_COMPLEX) - && (edges[0]->flags & EDGE_LOOP_EXIT)) + if (num_edges == 1 + && !(edges[0]->flags & EDGE_COMPLEX)) { opt_info->loop_exit = loop_split_edge_with (edges[0], NULL_RTX); can_apply = true; @@ -1861,8 +1884,7 @@ split_iv (struct iv_to_split *ivts, rtx insn, unsigned delta) } -/* Return one expansion of the accumulator recoreded - in struct VE. */ +/* Return one expansion of the accumulator recorded in struct VE. */ static rtx get_expansion (struct var_to_expand *ve) @@ -1872,9 +1894,9 @@ get_expansion (struct var_to_expand *ve) if (ve->reuse_expansion == 0) reg = ve->reg; else - reg = VARRAY_RTX (ve->var_expansions, ve->reuse_expansion - 1); + reg = VEC_index (rtx, ve->var_expansions, ve->reuse_expansion - 1); - if (VARRAY_ACTIVE_SIZE (ve->var_expansions) == (unsigned) ve->reuse_expansion) + if (VEC_length (rtx, ve->var_expansions) == (unsigned) ve->reuse_expansion) ve->reuse_expansion = 0; else ve->reuse_expansion++; @@ -1893,8 +1915,7 @@ expand_var_during_unrolling (struct var_to_expand *ve, rtx insn) bool really_new_expansion = false; set = single_set (insn); - if (!set) - abort (); + gcc_assert (set); /* Generate a new register only if the expansion limit has not been reached. Else reuse an already existing expansion. */ @@ -1912,14 +1933,14 @@ expand_var_during_unrolling (struct var_to_expand *ve, rtx insn) if (apply_change_group ()) if (really_new_expansion) { - VARRAY_PUSH_RTX (ve->var_expansions, new_reg); + VEC_safe_push (rtx, heap, ve->var_expansions, new_reg); ve->expansion_count++; } } /* Initialize the variable expansions in loop preheader. Callbacks for htab_traverse. PLACE_P is the loop-preheader - basic block where the initializtion of the expansions + basic block where the initialization of the expansions should take place. */ static int @@ -1930,21 +1951,19 @@ insert_var_expansion_initialization (void **slot, void *place_p) rtx seq, var, zero_init, insn; unsigned i; - if (VARRAY_ACTIVE_SIZE (ve->var_expansions) == 0) + if (VEC_length (rtx, ve->var_expansions) == 0) return 1; start_sequence (); if (ve->op == PLUS || ve->op == MINUS) - for (i = 0; i < VARRAY_ACTIVE_SIZE (ve->var_expansions); i++) + for (i = 0; VEC_iterate (rtx, ve->var_expansions, i, var); i++) { - var = VARRAY_RTX (ve->var_expansions, i); zero_init = CONST0_RTX (GET_MODE (var)); emit_move_insn (var, zero_init); } else if (ve->op == MULT) - for (i = 0; i < VARRAY_ACTIVE_SIZE (ve->var_expansions); i++) + for (i = 0; VEC_iterate (rtx, ve->var_expansions, i, var); i++) { - var = VARRAY_RTX (ve->var_expansions, i); zero_init = CONST1_RTX (GET_MODE (var)); emit_move_insn (var, zero_init); } @@ -1975,21 +1994,19 @@ combine_var_copies_in_loop_exit (void **slot, void *place_p) rtx expr, seq, var, insn; unsigned i; - if (VARRAY_ACTIVE_SIZE (ve->var_expansions) == 0) + if (VEC_length (rtx, ve->var_expansions) == 0) return 1; start_sequence (); if (ve->op == PLUS || ve->op == MINUS) - for (i = 0; i < VARRAY_ACTIVE_SIZE (ve->var_expansions); i++) + for (i = 0; VEC_iterate (rtx, ve->var_expansions, i, var); i++) { - var = VARRAY_RTX (ve->var_expansions, i); sum = simplify_gen_binary (PLUS, GET_MODE (ve->reg), var, sum); } else if (ve->op == MULT) - for (i = 0; i < VARRAY_ACTIVE_SIZE (ve->var_expansions); i++) + for (i = 0; VEC_iterate (rtx, ve->var_expansions, i, var); i++) { - var = VARRAY_RTX (ve->var_expansions, i); sum = simplify_gen_binary (MULT, GET_MODE (ve->reg), var, sum); } @@ -2150,7 +2167,7 @@ release_var_copies (void **slot, void *data ATTRIBUTE_UNUSED) { struct var_to_expand *ve = *slot; - VARRAY_CLEAR (ve->var_expansions); + VEC_free (rtx, heap, ve->var_expansions); /* Continue traversing the hash table. */ return 1;