diff options
Diffstat (limited to 'gcc/predict.c')
| -rw-r--r-- | gcc/predict.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/gcc/predict.c b/gcc/predict.c index 03fba123052..e865a6223cc 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -74,12 +74,12 @@ static sreal real_zero, real_one, real_almost_one, real_br_prob_base, static void combine_predictions_for_insn (rtx, basic_block); static void dump_prediction (FILE *, enum br_predictor, int, basic_block, int); -static void estimate_bb_frequencies (struct loops *); static void predict_paths_leading_to (basic_block, int *, enum br_predictor, enum prediction); static bool last_basic_block_p (basic_block); static void compute_function_frequency (void); static void choose_function_section (void); static bool can_predict_insn_p (rtx); +static void estimate_bb_frequencies (void); /* Information we hold about each branch predictor. Filled using information from predict.def. */ @@ -625,23 +625,22 @@ combine_predictions_for_bb (basic_block bb) } } -/* Predict edge probabilities by exploiting loop structure. - When RTLSIMPLELOOPS is set, attempt to count number of iterations by analyzing - RTL otherwise use tree based approach. */ +/* Predict edge probabilities by exploiting loop structure. */ + static void -predict_loops (struct loops *loops_info) +predict_loops (void) { unsigned i; - scev_initialize (loops_info); + scev_initialize (); /* Try to predict out blocks in a loop that are not part of a natural loop. */ - for (i = 1; i < loops_info->num; i++) + for (i = 1; i < current_loops->num; i++) { basic_block bb, *bbs; unsigned j, n_exits; - struct loop *loop = loops_info->parray[i]; + struct loop *loop = current_loops->parray[i]; VEC (edge, heap) *exits; struct tree_niter_desc niter_desc; edge ex; @@ -1252,7 +1251,7 @@ tree_estimate_probability (void) loop_optimizer_init (0); if (current_loops && dump_file && (dump_flags & TDF_DETAILS)) - flow_loops_dump (current_loops, dump_file, NULL, 0); + flow_loops_dump (dump_file, NULL, 0); add_noreturn_fake_exit_edges (); connect_infinite_loops_to_exit (); @@ -1261,9 +1260,9 @@ tree_estimate_probability (void) tree_bb_level_predictions (); - mark_irreducible_loops (current_loops); + mark_irreducible_loops (); if (current_loops) - predict_loops (current_loops); + predict_loops (); FOR_EACH_BB (bb) { @@ -1325,7 +1324,7 @@ tree_estimate_probability (void) combine_predictions_for_bb (bb); strip_builtin_expect (); - estimate_bb_frequencies (current_loops); + estimate_bb_frequencies (); free_dominance_info (CDI_POST_DOMINATORS); remove_fake_exit_edges (); loop_optimizer_finalize (); @@ -1602,17 +1601,17 @@ estimate_loops_at_level (struct loop *first_loop) } } -/* Propates frequencies through structure of LOOPS. */ +/* Propates frequencies through structure of loops. */ static void -estimate_loops (struct loops *loops) +estimate_loops (void) { bitmap tovisit = BITMAP_ALLOC (NULL); basic_block bb; /* Start by estimating the frequencies in the loops. */ - if (loops) - estimate_loops_at_level (loops->tree_root->inner); + if (current_loops) + estimate_loops_at_level (current_loops->tree_root->inner); /* Now propagate the frequencies through all the blocks. */ FOR_ALL_BB (bb) @@ -1685,7 +1684,7 @@ expensive_function_p (int threshold) /* Estimate basic blocks frequency by given branch probabilities. */ static void -estimate_bb_frequencies (struct loops *loops) +estimate_bb_frequencies (void) { basic_block bb; sreal freq_max; @@ -1729,7 +1728,7 @@ estimate_bb_frequencies (struct loops *loops) /* First compute probabilities locally for each loop from innermost to outermost to examine probabilities for back edges. */ - estimate_loops (loops); + estimate_loops (); memcpy (&freq_max, &real_zero, sizeof (real_zero)); FOR_EACH_BB (bb) |