From c88da703e3b514969027951946dd2a1fb78ec31a Mon Sep 17 00:00:00 2001 From: "chengbin.cb" Date: Wed, 10 Oct 2018 16:10:20 +0800 Subject: [PATCH 3/4] Set profile count accordingly for AutoFDO. --- gcc/auto-profile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c index 9316f4c477b..cde4f41c1d9 100644 --- a/gcc/auto-profile.c +++ b/gcc/auto-profile.c @@ -1400,7 +1400,7 @@ afdo_calculate_branch_prob (bb_set *annotated_bb, edge_set *annotated_edge) edge e; edge_iterator ei; int num_unknown_succ = 0; - profile_count total_count = profile_count::zero (); + profile_count total_count = profile_count::zero ().afdo (); FOR_EACH_EDGE (e, ei, bb->succs) { @@ -1507,6 +1507,7 @@ afdo_annotate_cfg (const stmt_set &promoted_stmts) = profile_count::from_gcov_type (s->head_count ()).afdo (); ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = profile_count::from_gcov_type (s->head_count ()).afdo (); + EXIT_BLOCK_PTR_FOR_FN (cfun)->count = profile_count::zero ().afdo (); profile_count max_count = ENTRY_BLOCK_PTR_FOR_FN (cfun)->count; FOR_EACH_BB_FN (bb, cfun) @@ -1686,11 +1687,12 @@ afdo_callsite_hot_enough_for_early_inline (struct cgraph_edge *edge) if (count > 0) { bool is_hot; + profile_count pcount = profile_count::from_gcov_type (count).afdo (); gcov_summary *saved_profile_info = profile_info; /* At early inline stage, profile_info is not set yet. We need to temporarily set it to afdo_profile_info to calculate hotness. */ profile_info = autofdo::afdo_profile_info; - is_hot = maybe_hot_count_p (NULL, profile_count::from_gcov_type (count)); + is_hot = maybe_hot_count_p (NULL, pcount); profile_info = saved_profile_info; return is_hot; } -- 2.14.4.44.g2045bb6