diff options
| author | Martin Liska <mliska@suse.cz> | 2019-07-03 14:42:02 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-07-03 12:42:02 +0000 |
| commit | 1b309ca5edddd6bf8051993876df5f123394bc79 (patch) | |
| tree | 403bccc3950ad5d8c2f3b4fd08e0d79ed37327c2 /libgcc/libgcov-profiler.c | |
| parent | e157be919b83177d57666234cd19f6b042140ac1 (diff) | |
Support N values in libgcov for single value counter type.
2019-07-03 Martin Liska <mliska@suse.cz>
* gcc.dg/tree-prof/val-prof-2.c: Update scanned pattern
as we do now better.
2019-07-03 Martin Liska <mliska@suse.cz>
* libgcov-merge.c (merge_single_value_set): Support N values.
* libgcov-profiler.c (__gcov_one_value_profiler_body): Likewise.
From-SVN: r273004
Diffstat (limited to 'libgcc/libgcov-profiler.c')
| -rw-r--r-- | libgcc/libgcov-profiler.c | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/libgcc/libgcov-profiler.c b/libgcc/libgcov-profiler.c index 9ba65b90df3..04d6f9c0e40 100644 --- a/libgcc/libgcov-profiler.c +++ b/libgcc/libgcov-profiler.c @@ -118,20 +118,44 @@ static inline void __gcov_one_value_profiler_body (gcov_type *counters, gcov_type value, int use_atomic) { - if (value == counters[1]) - counters[2]++; - else if (counters[2] == 0) + if (use_atomic) + __atomic_fetch_add (&counters[0], 1, __ATOMIC_RELAXED); + else + counters[0]++; + + ++counters; + + /* We have GCOV_DISK_SINGLE_VALUES as we can keep multiple values + next to each other. */ + unsigned sindex = 0; + + for (unsigned i = 0; i < GCOV_DISK_SINGLE_VALUES; i++) { - counters[2] = 1; - counters[1] = value; + if (value == counters[2 * i]) + { + if (use_atomic) + __atomic_fetch_add (&counters[2 * i + 1], 1, __ATOMIC_RELAXED); + else + counters[2 * i + 1]++; + return; + } + else if (counters[2 * i + 1] == 0) + { + /* We found an empty slot. */ + counters[2 * i] = value; + counters[2 * i + 1] = 1; + return; + } + + if (counters[2 * i + 1] < counters[2 * sindex + 1]) + sindex = i; } - else - counters[2]--; + /* We haven't found an empty slot, then decrement the smallest. */ if (use_atomic) - __atomic_fetch_add (&counters[0], 1, __ATOMIC_RELAXED); + __atomic_fetch_sub (&counters[2 * sindex + 1], 1, __ATOMIC_RELAXED); else - counters[0]++; + counters[2 * sindex + 1]--; } #ifdef L_gcov_one_value_profiler_v2 |