present, use only counts; when guessed use only frequencies.
(estimate_bb_frequencies): Use function_frequency.
* profile.c (compute_branch_probabilities): Exit early when
profile reading failed. Set profile_status.
(branch_prob): Do not set profile_status.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@139868
138bc75d-0d04-0410-961f-
82ee72b054a4
+2008-09-01 Jan Hubicka <jh@suse.cz>
+
+ * predict.c (maybe_hot_count_p, maybe_hot_edge_p): When profile is
+ present, use only counts; when guessed use only frequencies.
+ (estimate_bb_frequencies): Use function_frequency.
+ * profile.c (compute_branch_probabilities): Exit early when
+ profile reading failed. Set profile_status.
+ (branch_prob): Do not set profile_status.
+
2008-09-01 Aldy Hernandez <aldyh@redhat.com>
* tree.c (protected_set_expr_location): New.
bool
maybe_hot_bb_p (const_basic_block bb)
{
- return maybe_hot_count_p (bb->count) && maybe_hot_frequency_p (bb->frequency);
+ if (profile_status == PROFILE_READ)
+ return maybe_hot_count_p (bb->count);
+ return maybe_hot_frequency_p (bb->frequency);
}
/* Return true if the call can be hot. */
bool
maybe_hot_edge_p (edge e)
{
- return maybe_hot_count_p (e->count) && maybe_hot_frequency_p (EDGE_FREQUENCY (e));
+ if (profile_status == PROFILE_READ)
+ return maybe_hot_count_p (e->count);
+ return maybe_hot_frequency_p (EDGE_FREQUENCY (e));
}
/* Return true in case BB is probably never executed. */
basic_block bb;
sreal freq_max;
- if (!flag_branch_probabilities || !counts_to_freqs ())
+ if (cfun->function_frequency != PROFILE_READ || !counts_to_freqs ())
{
static int real_values_initialized = 0;
int inconsistent = 0;
/* Very simple sanity checks so we catch bugs in our profiling code. */
- if (profile_info)
+ if (!profile_info)
+ return;
+ if (profile_info->run_max * profile_info->runs < profile_info->sum_max)
{
- if (profile_info->run_max * profile_info->runs < profile_info->sum_max)
- {
- error ("corrupted profile info: run_max * runs < sum_max");
- exec_counts = NULL;
- }
+ error ("corrupted profile info: run_max * runs < sum_max");
+ exec_counts = NULL;
+ }
- if (profile_info->sum_all < profile_info->sum_max)
- {
- error ("corrupted profile info: sum_all is smaller than sum_max");
- exec_counts = NULL;
- }
+ if (profile_info->sum_all < profile_info->sum_max)
+ {
+ error ("corrupted profile info: sum_all is smaller than sum_max");
+ exec_counts = NULL;
}
/* Attach extra info block to each bb. */
}
}
counts_to_freqs ();
+ profile_status = PROFILE_READ;
if (dump_file)
{
VEC_free (histogram_value, heap, values);
free_edge_list (el);
- if (flag_branch_probabilities && profile_info)
- profile_status = PROFILE_READ;
coverage_end_function ();
}
\f