diff options
Diffstat (limited to 'libgcc/libgcov-merge.c')
| -rw-r--r-- | libgcc/libgcov-merge.c | 103 |
1 files changed, 20 insertions, 83 deletions
diff --git a/libgcc/libgcov-merge.c b/libgcc/libgcov-merge.c index c0785b0..1acdaa0 100644 --- a/libgcc/libgcov-merge.c +++ b/libgcc/libgcov-merge.c @@ -86,86 +86,6 @@ __gcov_merge_time_profile (gcov_type *counters, unsigned n_counters) #ifdef L_gcov_merge_topn -/* To merging of TOPN profiles. - counters[0] is the number of executions - for i in 0 ... TOPN-1 - counters[2 * i + 1] is target - counters[2 * i + 2] is corresponding hitrate counter. - - Because we prune counters only those with probability >= 1/TOPN are - present now. - - We use sign of counters[0] to track whether the number of different - targets exceeds TOPN. */ - -static void -merge_topn_values_set (gcov_type *counters) -{ - /* First value is number of total executions of the profiler. */ - gcov_type all = gcov_get_counter (); - gcov_type *total = &counters[0]; - ++counters; - - /* Negative value means that counter is missing some of values. */ - if (all < 0) - *total = -(*total); - - *total += all; - - /* Read all part values. */ - gcov_type read_counters[2 * GCOV_TOPN_VALUES]; - for (unsigned i = 0; i < GCOV_TOPN_VALUES; i++) - { - read_counters[2 * i] = gcov_get_counter_target (); - read_counters[2 * i + 1] = gcov_get_counter_ignore_scaling (-1); - } - - for (unsigned i = 0; i < GCOV_TOPN_VALUES; i++) - { - if (read_counters[2 * i + 1] == 0) - continue; - - unsigned j; - int slot = 0; - - for (j = 0; j < GCOV_TOPN_VALUES; j++) - { - if (counters[2 * j] == read_counters[2 * i]) - { - counters[2 * j + 1] += read_counters[2 * i + 1]; - break; - } - else if (counters[2 * j + 1] < counters[2 * slot + 1]) - slot = j; - } - - if (j == GCOV_TOPN_VALUES) - { - gcov_type slot_count = counters[2 * slot + 1]; - /* We found an empty slot. */ - if (slot_count == 0) - { - /* If we found empty slot, add the value. */ - counters[2 * slot] = read_counters[2 * i]; - counters[2 * slot + 1] = read_counters[2 * i + 1]; - } - else - { - /* Here we are loosing some values. */ - if (*total >= 0) - *total = -(*total); - if (read_counters[2 * i + 1] > slot_count) - { - counters[2 * slot] = read_counters[2 * i]; - counters[2 * slot + 1] = read_counters[2 * i + 1]; - } - else - counters[2 * slot + 1] -= read_counters[2 * i + 1]; - } - } - } -} - /* The profile merging function for choosing the most common value. It is given an array COUNTERS of N_COUNTERS old counters and it reads the same number of counters from the gcov file. The counters @@ -175,13 +95,30 @@ merge_topn_values_set (gcov_type *counters) -- the stored candidate on the most common value of the measured entity -- counter */ + void __gcov_merge_topn (gcov_type *counters, unsigned n_counters) { - gcc_assert (!(n_counters % GCOV_TOPN_VALUES_COUNTERS)); + gcc_assert (!(n_counters % GCOV_TOPN_MEM_COUNTERS)); - for (unsigned i = 0; i < (n_counters / GCOV_TOPN_VALUES_COUNTERS); i++) - merge_topn_values_set (counters + (i * GCOV_TOPN_VALUES_COUNTERS)); + for (unsigned i = 0; i < (n_counters / GCOV_TOPN_MEM_COUNTERS); i++) + { + /* First value is number of total executions of the profiler. */ + gcov_type all = gcov_get_counter_ignore_scaling (-1); + gcov_type n = gcov_get_counter_ignore_scaling (-1); + + counters[GCOV_TOPN_MEM_COUNTERS * i] += all; + + for (unsigned j = 0; j < n; j++) + { + gcov_type value = gcov_get_counter_target (); + gcov_type count = gcov_get_counter_ignore_scaling (-1); + + // TODO: we should use atomic here + gcov_topn_add_value (counters + GCOV_TOPN_MEM_COUNTERS * i, value, + count, 0, 0); + } + } } #endif /* L_gcov_merge_topn */ |