diff options
Diffstat (limited to 'gcc-4.4.3/gcc/tree-ssa-loop-ivopts.c')
| -rw-r--r-- | gcc-4.4.3/gcc/tree-ssa-loop-ivopts.c | 404 |
1 files changed, 334 insertions, 70 deletions
diff --git a/gcc-4.4.3/gcc/tree-ssa-loop-ivopts.c b/gcc-4.4.3/gcc/tree-ssa-loop-ivopts.c index 144dace8f..53ecdcf0f 100644 --- a/gcc-4.4.3/gcc/tree-ssa-loop-ivopts.c +++ b/gcc-4.4.3/gcc/tree-ssa-loop-ivopts.c @@ -93,6 +93,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-affine.h" #include "target.h" #include "tree-inline.h" +#include "dbgcnt.h" /* The infinite cost. */ #define INFTY 10000000 @@ -150,7 +151,7 @@ enum use_type /* Cost of a computation. */ typedef struct { - unsigned cost; /* The runtime cost. */ + int cost; /* The runtime cost. */ unsigned complexity; /* The estimate of the complexity of the code for the computation (in no concrete units -- complexity field should be larger for more @@ -206,6 +207,8 @@ enum iv_position { IP_NORMAL, /* At the end, just before the exit condition. */ IP_END, /* At the end of the latch block. */ + IP_BEFORE_USE, /* Immediately before a specific use. */ + IP_AFTER_USE, /* Immediately after a specific use. */ IP_ORIGINAL /* The original biv. */ }; @@ -225,6 +228,9 @@ struct iv_cand to replace the final value of an iv by direct computation of the value. */ unsigned cost; /* Cost of the candidate. */ + unsigned cost_step; /* Cost of the candidate's increment operation. */ + struct iv_use *ainc_use; /* For IP_{BEFORE,AFTER}_USE candidates, the place + where it is incremented. */ bitmap depends_on; /* The list of invariants that are used in step of the biv. */ }; @@ -570,6 +576,14 @@ dump_cand (FILE *file, struct iv_cand *cand) fprintf (file, " incremented before exit test\n"); break; + case IP_BEFORE_USE: + fprintf (file, " incremented before use %d\n", cand->ainc_use->id); + break; + + case IP_AFTER_USE: + fprintf (file, " incremented after use %d\n", cand->ainc_use->id); + break; + case IP_END: fprintf (file, " incremented at end\n"); break; @@ -622,14 +636,14 @@ stmt_after_ip_normal_pos (struct loop *loop, gimple stmt) } /* Returns true if STMT if after the place where the original induction - variable CAND is incremented. */ + variable CAND is incremented. If TRUE_IF_EQUAL is set, we return true + if the positions are identical. */ static bool -stmt_after_ip_original_pos (struct iv_cand *cand, gimple stmt) +stmt_after_inc_pos (struct iv_cand *cand, gimple stmt, bool true_if_equal) { basic_block cand_bb = gimple_bb (cand->incremented_at); basic_block stmt_bb = gimple_bb (stmt); - gimple_stmt_iterator bsi; if (!dominated_by_p (CDI_DOMINATORS, stmt_bb, cand_bb)) return false; @@ -637,15 +651,10 @@ stmt_after_ip_original_pos (struct iv_cand *cand, gimple stmt) if (stmt_bb != cand_bb) return true; - /* Scan the block from the end, since the original ivs are usually - incremented at the end of the loop body. */ - for (bsi = gsi_last_bb (stmt_bb); ; gsi_prev (&bsi)) - { - if (gsi_stmt (bsi) == cand->incremented_at) - return false; - if (gsi_stmt (bsi) == stmt) - return true; - } + if (true_if_equal + && gimple_uid (stmt) == gimple_uid (cand->incremented_at)) + return true; + return gimple_uid (stmt) > gimple_uid (cand->incremented_at); } /* Returns true if STMT if after the place where the induction variable @@ -663,7 +672,11 @@ stmt_after_increment (struct loop *loop, struct iv_cand *cand, gimple stmt) return stmt_after_ip_normal_pos (loop, stmt); case IP_ORIGINAL: - return stmt_after_ip_original_pos (cand, stmt); + case IP_AFTER_USE: + return stmt_after_inc_pos (cand, stmt, false); + + case IP_BEFORE_USE: + return stmt_after_inc_pos (cand, stmt, true); default: gcc_unreachable (); @@ -754,9 +767,10 @@ contains_abnormal_ssa_name_p (tree expr) EXIT of DATA->current_loop, or NULL if something goes wrong. */ static tree -niter_for_exit (struct ivopts_data *data, edge exit) +niter_for_exit (struct ivopts_data *data, edge exit, + struct tree_niter_desc **desc_p) { - struct tree_niter_desc desc; + struct tree_niter_desc* desc = NULL; tree niter; void **slot; @@ -775,18 +789,24 @@ niter_for_exit (struct ivopts_data *data, edge exit) being zero). Also, we cannot safely work with ssa names that appear in phi nodes on abnormal edges, so that we do not create overlapping life ranges for them (PR 27283). */ + desc = XNEW (struct tree_niter_desc); if (number_of_iterations_exit (data->current_loop, - exit, &desc, true) - && integer_zerop (desc.may_be_zero) - && !contains_abnormal_ssa_name_p (desc.niter)) - niter = desc.niter; + exit, desc, true) + && integer_zerop (desc->may_be_zero) + && !contains_abnormal_ssa_name_p (desc->niter)) + niter = desc->niter; else niter = NULL_TREE; - *pointer_map_insert (data->niters, exit) = niter; + desc->niter = niter; + slot = pointer_map_insert (data->niters, exit); + *slot = desc; } else - niter = (tree) *slot; + niter = ((struct tree_niter_desc *) *slot)->niter; + + if (desc_p) + *desc_p = (struct tree_niter_desc *) *slot; return niter; } @@ -803,7 +823,7 @@ niter_for_single_dom_exit (struct ivopts_data *data) if (!exit) return NULL; - return niter_for_exit (data, exit); + return niter_for_exit (data, exit, NULL); } /* Initializes data structures used by the iv optimization pass, stored @@ -2185,7 +2205,9 @@ add_candidate_1 (struct ivopts_data *data, if (cand->pos != pos) continue; - if (cand->incremented_at != incremented_at) + if (cand->incremented_at != incremented_at + || ((pos == IP_AFTER_USE || pos == IP_BEFORE_USE) + && cand->ainc_use != use)) continue; if (!cand->iv) @@ -2233,6 +2255,11 @@ add_candidate_1 (struct ivopts_data *data, walk_tree (&step, find_depends, &cand->depends_on, NULL); } + if (pos == IP_AFTER_USE || pos == IP_BEFORE_USE) + cand->ainc_use = use; + else + cand->ainc_use = NULL; + if (dump_file && (dump_flags & TDF_DETAILS)) dump_cand (dump_file, cand); } @@ -2276,6 +2303,56 @@ allow_ip_end_pos_p (struct loop *loop) return false; } +/* If possible, adds autoincrement candidates BASE + STEP * i based on use USE. + Important field is set to IMPORTANT. */ + +static void +add_autoinc_candidates (struct ivopts_data *data, tree base, tree step, + bool important, struct iv_use *use) +{ + basic_block use_bb = gimple_bb (use->stmt); + enum machine_mode mem_mode; + unsigned HOST_WIDE_INT cstepi; + + /* If we insert the increment in any position other than the standard + ones, we must ensure that it is incremented once per iteration. + It must not be in an inner nested loop, or one side of an if + statement. */ + if (use_bb->loop_father != data->current_loop + || !dominated_by_p (CDI_DOMINATORS, data->current_loop->latch, use_bb) + || stmt_could_throw_p (use->stmt) + || !cst_and_fits_in_hwi (step)) + return; + + cstepi = int_cst_value (step); + + mem_mode = TYPE_MODE (TREE_TYPE (*use->op_p)); + if ((HAVE_PRE_INCREMENT && GET_MODE_SIZE (mem_mode) == cstepi) + || (HAVE_PRE_DECREMENT && GET_MODE_SIZE (mem_mode) == -cstepi)) + { + enum tree_code code = MINUS_EXPR; + tree new_base; + tree new_step = step; + + if (POINTER_TYPE_P (TREE_TYPE (base))) + { + new_step = fold_build1 (NEGATE_EXPR, TREE_TYPE (step), step); + code = POINTER_PLUS_EXPR; + } + else + new_step = fold_convert (TREE_TYPE (base), new_step); + new_base = fold_build2 (code, TREE_TYPE (base), base, new_step); + add_candidate_1 (data, new_base, step, important, IP_BEFORE_USE, use, + use->stmt); + } + if ((HAVE_POST_INCREMENT && GET_MODE_SIZE (mem_mode) == cstepi) + || (HAVE_POST_DECREMENT && GET_MODE_SIZE (mem_mode) == -cstepi)) + { + add_candidate_1 (data, base, step, important, IP_AFTER_USE, use, + use->stmt); + } +} + /* Adds a candidate BASE + STEP * i. Important field is set to IMPORTANT and position to POS. If USE is not NULL, the candidate is set as related to it. The candidate computation is scheduled on all available positions. */ @@ -2289,6 +2366,9 @@ add_candidate (struct ivopts_data *data, if (ip_end_pos (data->current_loop) && allow_ip_end_pos_p (data->current_loop)) add_candidate_1 (data, base, step, important, IP_END, use, NULL); + + if (use != NULL && use->type == USE_ADDRESS) + add_autoinc_candidates (data, base, step, important, use); } /* Add a standard "0 + 1 * iteration" iv candidate for a @@ -2462,24 +2542,6 @@ record_important_candidates (struct ivopts_data *data) } } -/* Finds the candidates for the induction variables. */ - -static void -find_iv_candidates (struct ivopts_data *data) -{ - /* Add commonly used ivs. */ - add_standard_iv_candidates (data); - - /* Add old induction variables. */ - add_old_ivs_candidates (data); - - /* Add induction variables derived from uses. */ - add_derived_ivs_candidates (data); - - /* Record the important candidates. */ - record_important_candidates (data); -} - /* Allocates the data structure mapping the (use, candidate) pairs to costs. If consider_all_candidates is true, we use a two-dimensional array, otherwise we allocate a simple list to every use. */ @@ -2571,7 +2633,7 @@ infinite_cost_p (comp_cost cost) /* Sets cost of (USE, CANDIDATE) pair to COST and record that it depends on invariants DEPENDS_ON and that the value used in expressing it - is VALUE.*/ + is VALUE. */ static void set_use_iv_cost (struct ivopts_data *data, @@ -3095,21 +3157,30 @@ multiplier_allowed_in_address_p (HOST_WIDE_INT ratio, enum machine_mode mode) variable is omitted. Compute the cost for a memory reference that accesses a memory location of mode MEM_MODE. + MAY_AUTOINC is set to true if the autoincrement (increasing index by + size of MEM_MODE / RATIO) is available. To make this determination, we + look at the size of the increment to be made, which is given in CSTEP. + CSTEP may be zero if the step is unknown. + STMT_AFTER_INC is true iff the statement we're looking at is after the + increment of the original biv. + TODO -- there must be some better way. This all is quite crude. */ static comp_cost get_address_cost (bool symbol_present, bool var_present, unsigned HOST_WIDE_INT offset, HOST_WIDE_INT ratio, - enum machine_mode mem_mode, - bool speed) + HOST_WIDE_INT cstep, enum machine_mode mem_mode, bool speed, + bool stmt_after_inc, bool *may_autoinc) { static bool initialized[MAX_MACHINE_MODE]; static HOST_WIDE_INT rat[MAX_MACHINE_MODE], off[MAX_MACHINE_MODE]; static HOST_WIDE_INT min_offset[MAX_MACHINE_MODE], max_offset[MAX_MACHINE_MODE]; static unsigned costs[MAX_MACHINE_MODE][2][2][2][2]; + static bool has_preinc[MAX_MACHINE_MODE], has_postinc[MAX_MACHINE_MODE]; + static bool has_predec[MAX_MACHINE_MODE], has_postdec[MAX_MACHINE_MODE]; unsigned cost, acost, complexity; - bool offset_p, ratio_p; - HOST_WIDE_INT s_offset; + bool offset_p, ratio_p, autoinc; + HOST_WIDE_INT s_offset, autoinc_offset, msize; unsigned HOST_WIDE_INT mask; unsigned bits; @@ -3168,6 +3239,26 @@ get_address_cost (bool symbol_present, bool var_present, reg0 = gen_raw_REG (Pmode, LAST_VIRTUAL_REGISTER + 1); reg1 = gen_raw_REG (Pmode, LAST_VIRTUAL_REGISTER + 2); + if (HAVE_PRE_DECREMENT) + { + addr = gen_rtx_PRE_DEC (Pmode, reg0); + has_predec[mem_mode] = memory_address_p (mem_mode, addr); + } + if (HAVE_POST_DECREMENT) + { + addr = gen_rtx_POST_DEC (Pmode, reg0); + has_postdec[mem_mode] = memory_address_p (mem_mode, addr); + } + if (HAVE_PRE_INCREMENT) + { + addr = gen_rtx_PRE_INC (Pmode, reg0); + has_preinc[mem_mode] = memory_address_p (mem_mode, addr); + } + if (HAVE_POST_INCREMENT) + { + addr = gen_rtx_POST_INC (Pmode, reg0); + has_postinc[mem_mode] = memory_address_p (mem_mode, addr); + } for (i = 0; i < 16; i++) { sym_p = i & 1; @@ -3206,7 +3297,7 @@ get_address_cost (bool symbol_present, bool var_present, if (base) addr = gen_rtx_fmt_ee (PLUS, Pmode, addr, base); - + start_sequence (); /* To avoid splitting addressing modes, pretend that no cse will follow. */ @@ -3251,7 +3342,7 @@ get_address_cost (bool symbol_present, bool var_present, if (acost < costs[mem_mode][1][var_p][off_p][rat_p]) costs[mem_mode][1][var_p][off_p][rat_p] = acost; } - + if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "Address costs:\n"); @@ -3276,6 +3367,9 @@ get_address_cost (bool symbol_present, bool var_present, acost = costs[mem_mode][sym_p][var_p][off_p][rat_p]; fprintf (dump_file, "index costs %d\n", acost); } + if (has_predec[mem_mode] || has_postdec[mem_mode] + || has_preinc[mem_mode] || has_postinc[mem_mode]) + fprintf (dump_file, " May include autoinc/dec\n"); fprintf (dump_file, "\n"); } } @@ -3287,6 +3381,23 @@ get_address_cost (bool symbol_present, bool var_present, offset |= ~mask; s_offset = offset; + autoinc = false; + msize = GET_MODE_SIZE (mem_mode); + autoinc_offset = offset; + if (stmt_after_inc) + autoinc_offset += ratio * cstep; + if (symbol_present || var_present || ratio != 1) + autoinc = false; + else if ((has_postinc[mem_mode] && autoinc_offset == 0 + && msize == cstep) + || (has_postdec[mem_mode] && autoinc_offset == 0 + && msize == -cstep) + || (has_preinc[mem_mode] && autoinc_offset == msize + && msize == cstep) + || (has_predec[mem_mode] && autoinc_offset == -msize + && msize == -cstep)) + autoinc = true; + cost = 0; offset_p = (s_offset != 0 && min_offset[mem_mode] <= s_offset @@ -3300,6 +3411,8 @@ get_address_cost (bool symbol_present, bool var_present, if (s_offset && !offset_p && !symbol_present) cost += add_cost (Pmode, speed); + if (may_autoinc) + *may_autoinc = autoinc; acost = costs[mem_mode][symbol_present][var_present][offset_p][ratio_p]; complexity = (symbol_present != 0) + (var_present != 0) + offset_p + ratio_p; return new_cost (cost + acost, complexity); @@ -3438,7 +3551,7 @@ force_expr_to_var_cost (tree expr, bool speed) computations often are either loop invariant or at least can be shared between several iv uses, so letting this grow without limits would not give reasonable results. */ - if (cost.cost > target_spill_cost [speed]) + if (cost.cost > (int) target_spill_cost [speed]) cost.cost = target_spill_cost [speed]; return cost; @@ -3687,19 +3800,22 @@ create_loop_invariant_temp (tree ubase, tree cbase, HOST_WIDE_INT ratio) from induction variable CAND. If ADDRESS_P is true, we just need to create an address from it, otherwise we want to get it into register. A set of invariants we depend on is stored in - DEPENDS_ON. AT is the statement at that the value is computed. */ + DEPENDS_ON. AT is the statement at that the value is computed. + If CAN_AUTOINC is nonnull, use it to record whether autoinc + addressing is likely. */ static comp_cost get_computation_cost_at (struct ivopts_data *data, struct iv_use *use, struct iv_cand *cand, - bool address_p, bitmap *depends_on, gimple at) + bool address_p, bitmap *depends_on, gimple at, + bool *can_autoinc) { tree ubase = use->iv->base, ustep = use->iv->step; tree cbase, cstep; tree utype = TREE_TYPE (ubase), ctype; unsigned HOST_WIDE_INT cstepi, offset = 0; HOST_WIDE_INT ratio, aratio; - bool var_present, symbol_present; + bool var_present, symbol_present, stmt_is_after_inc; comp_cost cost; unsigned n_sums; double_int rat; @@ -3805,7 +3921,8 @@ get_computation_cost_at (struct ivopts_data *data, /* If we are after the increment, the value of the candidate is higher by one iteration. */ - if (stmt_after_increment (data->current_loop, cand, at)) + stmt_is_after_inc = stmt_after_increment (data->current_loop, cand, at); + if (stmt_is_after_inc) offset -= ratio * cstepi; /* Now the computation is in shape symbol + var1 + const + ratio * var2. @@ -3813,8 +3930,10 @@ get_computation_cost_at (struct ivopts_data *data, find the cost of addressing this. */ if (address_p) return add_costs (cost, get_address_cost (symbol_present, var_present, - offset, ratio, - TYPE_MODE (TREE_TYPE (*use->op_p)), speed)); + offset, ratio, cstepi, + TYPE_MODE (TREE_TYPE (*use->op_p)), + speed, stmt_is_after_inc, + can_autoinc)); /* Otherwise estimate the costs for computing the expression. */ aratio = ratio > 0 ? ratio : -ratio; @@ -3844,6 +3963,9 @@ get_computation_cost_at (struct ivopts_data *data, return cost; fallback: + if (can_autoinc) + *can_autoinc = false; + { /* Just get the expression, expand it and measure the cost. */ tree comp = get_computation_at (data->current_loop, use, cand, at); @@ -3862,15 +3984,17 @@ fallback: from induction variable CAND. If ADDRESS_P is true, we just need to create an address from it, otherwise we want to get it into register. A set of invariants we depend on is stored in - DEPENDS_ON. */ + DEPENDS_ON. If CAN_AUTOINC is nonnull, use it to record whether + autoinc addressing is likely. */ static comp_cost get_computation_cost (struct ivopts_data *data, struct iv_use *use, struct iv_cand *cand, - bool address_p, bitmap *depends_on) + bool address_p, bitmap *depends_on, bool *can_autoinc) { return get_computation_cost_at (data, - use, cand, address_p, depends_on, use->stmt); + use, cand, address_p, depends_on, use->stmt, + can_autoinc); } /* Determines cost of basing replacement of USE on CAND in a generic @@ -3894,7 +4018,7 @@ determine_use_iv_cost_generic (struct ivopts_data *data, return true; } - cost = get_computation_cost (data, use, cand, false, &depends_on); + cost = get_computation_cost (data, use, cand, false, &depends_on, NULL); if (use->use_pos == IU_OUTSIDE_LOOP_ONLY && !infinite_cost_p (cost)) cost.cost /= avg_loop_niter (data->current_loop); @@ -3911,8 +4035,20 @@ determine_use_iv_cost_address (struct ivopts_data *data, struct iv_use *use, struct iv_cand *cand) { bitmap depends_on; - comp_cost cost = get_computation_cost (data, use, cand, true, &depends_on); + bool can_autoinc; + comp_cost cost = get_computation_cost (data, use, cand, true, &depends_on, + &can_autoinc); + if (cand->ainc_use == use) + { + if (can_autoinc) + cost.cost -= cand->cost_step; + /* If we generated the candidate solely for exploiting autoincrement + opportunities, and it turns out it can't be used, set the cost to + infinity to make sure we ignore it. */ + else if (cand->pos == IP_AFTER_USE || cand->pos == IP_BEFORE_USE) + cost = infinite_cost; + } set_use_iv_cost (data, use, cand, cost, depends_on, NULL_TREE); return !infinite_cost_p (cost); @@ -3995,6 +4131,7 @@ may_eliminate_iv (struct ivopts_data *data, tree nit, period; struct loop *loop = data->current_loop; aff_tree bnd; + struct tree_niter_desc *desc = NULL; if (TREE_CODE (cand->iv->step) != INTEGER_CST) return false; @@ -4013,7 +4150,7 @@ may_eliminate_iv (struct ivopts_data *data, if (flow_bb_inside_loop_p (loop, exit->dest)) return false; - nit = niter_for_exit (data, exit); + nit = niter_for_exit (data, exit, &desc); if (!nit) return false; @@ -4025,8 +4162,17 @@ may_eliminate_iv (struct ivopts_data *data, /* If the number of iterations is constant, compare against it directly. */ if (TREE_CODE (nit) == INTEGER_CST) { - if (!tree_int_cst_lt (nit, period)) - return false; + /* See cand_value_at. */ + if (stmt_after_increment (loop, cand, use->stmt)) + { + if (!tree_int_cst_lt (nit, period)) + return false; + } + else + { + if (tree_int_cst_lt (period, nit)) + return false; + } } /* If not, and if this is the only possible exit of the loop, see whether @@ -4035,11 +4181,25 @@ may_eliminate_iv (struct ivopts_data *data, else { double_int period_value, max_niter; - if (!estimated_loop_iterations (loop, true, &max_niter)) - return false; + + max_niter = desc->max; + if (stmt_after_increment (loop, cand, use->stmt)) + max_niter = double_int_add (max_niter, double_int_one); period_value = tree_to_double_int (period); if (double_int_ucmp (max_niter, period_value) > 0) - return false; + { + /* See if we can take advantage of inferred loop bound information. */ + if (loop_only_exit_p (loop, exit)) + { + if (!estimated_loop_iterations (loop, true, &max_niter)) + return false; + /* The loop bound is already adjusted by adding 1. */ + if (double_int_ucmp (max_niter, period_value) > 0) + return false; + } + else + return false; + } } cand_value_at (loop, cand, use->stmt, nit, &bnd); @@ -4088,7 +4248,7 @@ determine_use_iv_cost_condition (struct ivopts_data *data, gcc_assert (ok); express_cost = get_computation_cost (data, use, cand, false, - &depends_on_express); + &depends_on_express, NULL); fd_ivopts_data = data; walk_tree (&cmp_iv->base, find_depends, &depends_on_express, NULL); @@ -4140,6 +4300,78 @@ determine_use_iv_cost (struct ivopts_data *data, } } +/* Return true if get_computation_cost indicates that autoincrement is + a possibility for the pair of USE and CAND, false otherwise. */ + +static bool +autoinc_possible_for_pair (struct ivopts_data *data, struct iv_use *use, + struct iv_cand *cand) +{ + bitmap depends_on; + bool can_autoinc; + comp_cost cost; + + if (use->type != USE_ADDRESS) + return false; + + cost = get_computation_cost (data, use, cand, true, &depends_on, + &can_autoinc); + + BITMAP_FREE (depends_on); + + return !infinite_cost_p (cost) && can_autoinc; +} + +/* Examine IP_ORIGINAL candidates to see if they are incremented next to a + use that allows autoincrement, and set their AINC_USE if possible. */ + +static void +set_autoinc_for_original_candidates (struct ivopts_data *data) +{ + unsigned i, j; + + for (i = 0; i < n_iv_cands (data); i++) + { + struct iv_cand *cand = iv_cand (data, i); + struct iv_use *closest = NULL; + if (cand->pos != IP_ORIGINAL) + continue; + for (j = 0; j < n_iv_uses (data); j++) + { + struct iv_use *use = iv_use (data, j); + unsigned uid = gimple_uid (use->stmt); + if (gimple_bb (use->stmt) != gimple_bb (cand->incremented_at) + || uid > gimple_uid (cand->incremented_at)) + continue; + if (closest == NULL || uid > gimple_uid (closest->stmt)) + closest = use; + } + if (closest == NULL || !autoinc_possible_for_pair (data, closest, cand)) + continue; + cand->ainc_use = closest; + } +} + +/* Finds the candidates for the induction variables. */ + +static void +find_iv_candidates (struct ivopts_data *data) +{ + /* Add commonly used ivs. */ + add_standard_iv_candidates (data); + + /* Add old induction variables. */ + add_old_ivs_candidates (data); + + /* Add induction variables derived from uses. */ + add_derived_ivs_candidates (data); + + set_autoinc_for_original_candidates (data); + + /* Record the important candidates. */ + record_important_candidates (data); +} + /* Determines costs of basing the use of the iv on an iv candidate. */ static void @@ -4255,6 +4487,7 @@ determine_iv_cost (struct ivopts_data *data, struct iv_cand *cand) cost++; cand->cost = cost; + cand->cost_step = cost_step; } /* Determines costs of computation of the candidates. */ @@ -4279,7 +4512,7 @@ determine_iv_costs (struct ivopts_data *data) if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, " %d\t%d\n", i, cand->cost); } - + if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, "\n"); } @@ -5482,6 +5715,13 @@ create_new_iv (struct ivopts_data *data, struct iv_cand *cand) after = true; break; + case IP_AFTER_USE: + after = true; + /* fall through */ + case IP_BEFORE_USE: + incr_pos = gsi_for_stmt (cand->incremented_at); + break; + case IP_ORIGINAL: /* Mark that the iv is preserved. */ name_info (data, cand->var_before)->preserve_biv = true; @@ -5629,6 +5869,9 @@ cause_overlapping_lr (struct ivopts_data *data, if (!CONSTANT_CLASS_P (gimple_assign_rhs2 (increment))) return NULL; + if (gimple_assign_rhs1 (increment) != selected_iv_nm) + return NULL; + return increment; } @@ -6423,6 +6666,19 @@ remove_unused_ivs (struct ivopts_data *data) } } +/* Frees memory occupied by struct tree_niter_desc in *VALUE. Callback + for pointer_map_traverse. */ + +static bool +free_tree_niter_desc (const void *key ATTRIBUTE_UNUSED, void **value, + void *data ATTRIBUTE_UNUSED) +{ + struct tree_niter_desc *const niter = (struct tree_niter_desc *) *value; + + free (niter); + return true; +} + /* Frees data allocated by the optimization of a single loop. */ static void @@ -6435,6 +6691,7 @@ free_loop_data (struct ivopts_data *data) if (data->niters) { + pointer_map_traverse (data->niters, free_tree_niter_desc, NULL); pointer_map_destroy (data->niters); data->niters = NULL; } @@ -6531,7 +6788,10 @@ tree_ssa_iv_optimize_loop (struct ivopts_data *data, struct loop *loop) bool changed = false; struct iv_ca *iv_ca; edge exit; + basic_block *body; + if (!dbg_cnt (ivopts)) + return false; gcc_assert (!data->niters); data->current_loop = loop; data->speed = optimize_loop_for_speed_p (loop); @@ -6552,6 +6812,10 @@ tree_ssa_iv_optimize_loop (struct ivopts_data *data, struct loop *loop) fprintf (dump_file, "\n"); } + body = get_loop_body (loop); + renumber_gimple_stmt_uids_in_blocks (body, loop->num_nodes); + free (body); + /* For each ssa name determines whether it behaves as an induction variable in some loop. */ if (!find_induction_variables (data)) @@ -6566,8 +6830,8 @@ tree_ssa_iv_optimize_loop (struct ivopts_data *data, struct loop *loop) find_iv_candidates (data); /* Calculates the costs (item 3, part 1). */ - determine_use_iv_costs (data); determine_iv_costs (data); + determine_use_iv_costs (data); determine_set_costs (data); /* Find the optimal set of induction variables (item 3, part 2). */ |