diff options
| author | Ian Rogers <irogers@google.com> | 2024-02-09 12:49:47 -0800 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:18:34 -0400 |
| commit | 06b6e6b54c42b96fa63699a8ab1ad724aef52c20 (patch) | |
| tree | 895667ea987200dbf4b12938cf48fd836300a8b8 /tools | |
| parent | 1c3c67e7bce06bbf164ce8a7c3729d8cfb7c7f0f (diff) | |
| download | linux-stable-06b6e6b54c42b96fa63699a8ab1ad724aef52c20.tar.gz linux-stable-06b6e6b54c42b96fa63699a8ab1ad724aef52c20.tar.bz2 linux-stable-06b6e6b54c42b96fa63699a8ab1ad724aef52c20.zip | |
perf metric: Don't remove scale from counts
[ Upstream commit 6d6be5eb45b423a37d746d3ee0fd0c78f76ead9f ]
Counts were switched from the scaled saved value form to the
aggregated count to avoid double accounting. When this happened the
removing of scaling for a count should have been removed, however, it
wasn't and this wasn't observed as it normally doesn't matter because
a counter's scale is 1. A problem was observed with RAPL events that
are scaled.
Fixes: 37cc8ad77cf8 ("perf metric: Directly use counts rather than saved_value")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: James Clark <james.clark@arm.com>
Cc: Kaige Ye <ye@kaige.org>
Cc: John Garry <john.g.garry@oracle.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240209204947.3873294-5-irogers@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/stat-shadow.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index e31426167852..cf573ff3fa84 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -414,12 +414,7 @@ static int prepare_metric(struct evsel **metric_events, val = NAN; source_count = 0; } else { - /* - * If an event was scaled during stat gathering, - * reverse the scale before computing the - * metric. - */ - val = aggr->counts.val * (1.0 / metric_events[i]->scale); + val = aggr->counts.val; source_count = evsel__source_count(metric_events[i]); } } |