From e5ccb88cb8ba5d3a7686b1b2d2371751e64b5756 Mon Sep 17 00:00:00 2001 From: chengbin Date: Tue, 11 Dec 2018 19:02:12 +0800 Subject: [PATCH 7/7] Fix autofdo indirect call value-prof transformation. --- gcc/auto-profile.c | 25 +++++++++++++------------ gcc/value-prof.c | 5 ----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c index d337cbc7200..f22395ec8f5 100644 --- a/gcc/auto-profile.c +++ b/gcc/auto-profile.c @@ -992,14 +992,6 @@ afdo_indirect_call (gimple_stmt_iterator *gsi, const icall_target_map &map, || gimple_call_fndecl (stmt) != NULL_TREE) return; - callee = gimple_call_fn (stmt); - - histogram_value hist = gimple_alloc_histogram_value ( - cfun, HIST_TYPE_INDIR_CALL, stmt, callee); - hist->n_counters = 3; - hist->hvalue.counters = XNEWVEC (gcov_type, hist->n_counters); - gimple_add_histogram_value (cfun, stmt, hist); - gcov_type total = 0; icall_target_map::const_iterator max_iter = map.end (); @@ -1010,9 +1002,20 @@ afdo_indirect_call (gimple_stmt_iterator *gsi, const icall_target_map &map, if (max_iter == map.end () || max_iter->second < iter->second) max_iter = iter; } + struct cgraph_node *direct_call = cgraph_node::get_for_asmname ( + get_identifier (afdo_string_table->get_name (max_iter->first))); + if (direct_call == NULL || !direct_call->profile_id) + return; - hist->hvalue.counters[0] - = (unsigned long long)afdo_string_table->get_name (max_iter->first); + callee = gimple_call_fn (stmt); + + histogram_value hist = gimple_alloc_histogram_value ( + cfun, HIST_TYPE_INDIR_CALL, stmt, callee); + hist->n_counters = 3; + hist->hvalue.counters = XNEWVEC (gcov_type, hist->n_counters); + gimple_add_histogram_value (cfun, stmt, hist); + + hist->hvalue.counters[0] = direct_call->profile_id; hist->hvalue.counters[1] = max_iter->second; hist->hvalue.counters[2] = total; @@ -1021,8 +1024,6 @@ afdo_indirect_call (gimple_stmt_iterator *gsi, const icall_target_map &map, struct cgraph_edge *indirect_edge = cgraph_node::get (current_function_decl)->get_edge (stmt); - struct cgraph_node *direct_call = cgraph_node::get_for_asmname ( - get_identifier ((const char *) hist->hvalue.counters[0])); if (dump_file) { diff --git a/gcc/value-prof.c b/gcc/value-prof.c index f3be9ff8747..2f39ede806a 100644 --- a/gcc/value-prof.c +++ b/gcc/value-prof.c @@ -627,11 +627,6 @@ gimple_value_profile_transformations (void) gimple_stmt_iterator gsi; bool changed = false; - /* Autofdo does its own transformations for indirect calls, - and otherwise does not support value profiling. */ - if (flag_auto_profile) - return false; - FOR_EACH_BB_FN (bb, cfun) { for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) -- 2.14.4.44.g2045bb6