aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hubicka <jh@suse.cz>2008-09-01 18:28:06 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2008-09-01 16:28:06 +0000
commitba623cedf4b07b3a2c2f3e638fa379bcde55c42e (patch)
treeacd38c7a826f584bcddf0792b749cd9537cd440f
parent6a3799eb0065d62b04315aa2a9808bce71dab54b (diff)
downloadgcc-ba623cedf4b07b3a2c2f3e638fa379bcde55c42e.zip
gcc-ba623cedf4b07b3a2c2f3e638fa379bcde55c42e.tar.gz
gcc-ba623cedf4b07b3a2c2f3e638fa379bcde55c42e.tar.bz2
predict.c (maybe_hot_count_p, [...]): When profile is present, use only counts; when guessed use only frequencies.
* 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. From-SVN: r139868
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/predict.c10
-rw-r--r--gcc/profile.c24
3 files changed, 27 insertions, 16 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16cb50c..a6bc7c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/gcc/predict.c b/gcc/predict.c
index 41a9ee3..1c877ec 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -148,7 +148,9 @@ maybe_hot_count_p (gcov_type count)
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. */
@@ -178,7 +180,9 @@ cgraph_maybe_hot_edge_p (struct cgraph_edge *edge)
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. */
@@ -2009,7 +2013,7 @@ estimate_bb_frequencies (void)
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;
diff --git a/gcc/profile.c b/gcc/profile.c
index 6f89645..883515d 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -402,19 +402,18 @@ compute_branch_probabilities (void)
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. */
@@ -695,6 +694,7 @@ compute_branch_probabilities (void)
}
}
counts_to_freqs ();
+ profile_status = PROFILE_READ;
if (dump_file)
{
@@ -1154,8 +1154,6 @@ branch_prob (void)
VEC_free (histogram_value, heap, values);
free_edge_list (el);
- if (flag_branch_probabilities && profile_info)
- profile_status = PROFILE_READ;
coverage_end_function ();
}