From 5330a79d3409f2e0f0dfd314414e53e29136cf89 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Mon, 12 Oct 2015 08:08:06 +0200 Subject: [PATCH] cgraphbuild.c (compute_call_stmt_bb_frequency): Use counts when these are more informative. * cgraphbuild.c (compute_call_stmt_bb_frequency): Use counts when these are more informative. From-SVN: r228703 --- gcc/ChangeLog | 5 +++++ gcc/cgraphbuild.c | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 931dedeec60..5d38bf67c98 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-10-11 Jan Hubicka + + * cgraphbuild.c (compute_call_stmt_bb_frequency): Use + counts when these are more informative. + 2015-10-11 Jan Hubicka * tree-profile.c (tree_profiling): Do not clear diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c index 33b01be83ac..a7b4af6d9fb 100644 --- a/gcc/cgraphbuild.c +++ b/gcc/cgraphbuild.c @@ -202,15 +202,21 @@ compute_call_stmt_bb_frequency (tree decl, basic_block bb) { int entry_freq = ENTRY_BLOCK_PTR_FOR_FN (DECL_STRUCT_FUNCTION (decl))->frequency; - int freq = bb->frequency; + gcov_type entry_count = ENTRY_BLOCK_PTR_FOR_FN + (DECL_STRUCT_FUNCTION (decl))->count; + gcov_type freq = bb->frequency; if (profile_status_for_fn (DECL_STRUCT_FUNCTION (decl)) == PROFILE_ABSENT) return CGRAPH_FREQ_BASE; - if (!entry_freq) - entry_freq = 1, freq++; - - freq = freq * CGRAPH_FREQ_BASE / entry_freq; + if (entry_count > entry_freq) + freq = RDIV (bb->count * CGRAPH_FREQ_BASE, entry_count); + else + { + if (!entry_freq) + entry_freq = 1, freq++; + freq = RDIV (freq * CGRAPH_FREQ_BASE, entry_freq); + } if (freq > CGRAPH_FREQ_MAX) freq = CGRAPH_FREQ_MAX; -- 2.30.2