diff options
Diffstat (limited to 'gcc/auto-profile.cc')
| -rw-r--r-- | gcc/auto-profile.cc | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/gcc/auto-profile.cc b/gcc/auto-profile.cc index 3eefb97..215dadf 100644 --- a/gcc/auto-profile.cc +++ b/gcc/auto-profile.cc @@ -35,6 +35,8 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "profile.h" #include "langhooks.h" +#include "context.h" +#include "pass_manager.h" #include "cfgloop.h" #include "tree-cfg.h" #include "tree-cfgcleanup.h" @@ -233,6 +235,10 @@ public: function_instance *get_function_instance_by_decl (unsigned lineno, tree decl) const; + /* Merge profile of clones. Note that cloning hasnt been performed when + we annotate the CFG (at this stage). */ + void merge (function_instance *other); + /* Store the profile info for LOC in INFO. Return TRUE if profile info is found. */ bool get_count_info (location_t loc, count_info *info) const; @@ -558,6 +564,27 @@ function_instance::get_function_instance_by_decl (unsigned lineno, return NULL; } +/* Merge profile of clones. Note that cloning hasnt been performed when + we annotate the CFG (at this stage). */ + +void function_instance::merge (function_instance *other) +{ + total_count_ += other->total_count_; + head_count_ += other->head_count_; + + for (callsite_map::const_iterator iter = other->callsites.begin (); + iter != other->callsites.end (); ++iter) + if (callsites.count (iter->first) == 0) + callsites[iter->first] = iter->second; + + for (position_count_map::const_iterator iter = pos_counts.begin (); + iter != pos_counts.end (); ++iter) + if (pos_counts.count (iter->first) == 0) + pos_counts[iter->first] = iter->second; + else + pos_counts[iter->first].count += iter->second.count; +} + /* Store the profile info for LOC in INFO. Return TRUE if profile info is found. */ @@ -833,13 +860,36 @@ autofdo_source_profile::read () /* Read in the function/callsite profile, and store it in local data structure. */ unsigned function_num = gcov_read_unsigned (); + int profile_pass_num + = g->get_passes ()->get_pass_auto_profile ()->static_pass_number; + g->get_dumps ()->dump_start (profile_pass_num, NULL); for (unsigned i = 0; i < function_num; i++) { function_instance::function_instance_stack stack; function_instance *s = function_instance::read_function_instance ( &stack, gcov_read_counter ()); - map_[s->name ()] = s; + int fun_id = afdo_string_table->get_index + (afdo_string_table->get_name (s->name ())); + /* If function_instace with get_original_name (without the clone + suffix) exixts, merge the function instances. */ + if (map_.count (fun_id) == 0) + map_[fun_id] = s; + else + { + /* Since this is invoked very early, before the pass + manager, we need to set up the dumping explicitly. This is + similar to the handling in finish_optimization_passes. */ + if (dump_enabled_p ()) + { + dump_user_location_t loc + = dump_user_location_t::from_location_t (input_location); + dump_printf_loc (MSG_NOTE, loc, "Merging profile for %s\n", + afdo_string_table->get_name (s->name ())); + } + map_[fun_id]->merge (s); + } } + g->get_dumps ()->dump_finish (profile_pass_num); return true; } |