* [PATCH] Revert "perf stat: Rename "aggregate-number" to "cpu-count" in JSON"
@ 2022-11-30 19:36 Namhyung Kim
2022-12-05 13:09 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 2+ messages in thread
From: Namhyung Kim @ 2022-11-30 19:36 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Jiri Olsa
Cc: Ingo Molnar, Peter Zijlstra, LKML, Ian Rogers, Adrian Hunter,
linux-perf-users, James Clark, Kan Liang
This reverts commit c4b41b83c25073c09bfcc4e5ec496c9dd316656b.
As Ian said, the "cpu-count" is not appropriate for uncore events, also it
caused a perf test failure.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/stat-display.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 847acdb5dc40..f1ee4b052198 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -281,19 +281,19 @@ static void print_aggr_id_json(struct perf_stat_config *config,
switch (config->aggr_mode) {
case AGGR_CORE:
- fprintf(output, "\"core\" : \"S%d-D%d-C%d\", \"cpu-count\" : %d, ",
+ fprintf(output, "\"core\" : \"S%d-D%d-C%d\", \"aggregate-number\" : %d, ",
id.socket, id.die, id.core, nr);
break;
case AGGR_DIE:
- fprintf(output, "\"die\" : \"S%d-D%d\", \"cpu-count\" : %d, ",
+ fprintf(output, "\"die\" : \"S%d-D%d\", \"aggregate-number\" : %d, ",
id.socket, id.die, nr);
break;
case AGGR_SOCKET:
- fprintf(output, "\"socket\" : \"S%d\", \"cpu-count\" : %d, ",
+ fprintf(output, "\"socket\" : \"S%d\", \"aggregate-number\" : %d, ",
id.socket, nr);
break;
case AGGR_NODE:
- fprintf(output, "\"node\" : \"N%d\", \"cpu-count\" : %d, ",
+ fprintf(output, "\"node\" : \"N%d\", \"aggregate-number\" : %d, ",
id.node, nr);
break;
case AGGR_NONE:
--
2.38.1.584.g0f3c55d4c2-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Revert "perf stat: Rename "aggregate-number" to "cpu-count" in JSON"
2022-11-30 19:36 [PATCH] Revert "perf stat: Rename "aggregate-number" to "cpu-count" in JSON" Namhyung Kim
@ 2022-12-05 13:09 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2022-12-05 13:09 UTC (permalink / raw)
To: Namhyung Kim
Cc: Jiri Olsa, Ingo Molnar, Peter Zijlstra, LKML, Ian Rogers,
Adrian Hunter, linux-perf-users, James Clark, Kan Liang
Em Wed, Nov 30, 2022 at 11:36:13AM -0800, Namhyung Kim escreveu:
> This reverts commit c4b41b83c25073c09bfcc4e5ec496c9dd316656b.
>
> As Ian said, the "cpu-count" is not appropriate for uncore events, also it
> caused a perf test failure.
This was applied, thanks.
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/util/stat-display.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> index 847acdb5dc40..f1ee4b052198 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -281,19 +281,19 @@ static void print_aggr_id_json(struct perf_stat_config *config,
>
> switch (config->aggr_mode) {
> case AGGR_CORE:
> - fprintf(output, "\"core\" : \"S%d-D%d-C%d\", \"cpu-count\" : %d, ",
> + fprintf(output, "\"core\" : \"S%d-D%d-C%d\", \"aggregate-number\" : %d, ",
> id.socket, id.die, id.core, nr);
> break;
> case AGGR_DIE:
> - fprintf(output, "\"die\" : \"S%d-D%d\", \"cpu-count\" : %d, ",
> + fprintf(output, "\"die\" : \"S%d-D%d\", \"aggregate-number\" : %d, ",
> id.socket, id.die, nr);
> break;
> case AGGR_SOCKET:
> - fprintf(output, "\"socket\" : \"S%d\", \"cpu-count\" : %d, ",
> + fprintf(output, "\"socket\" : \"S%d\", \"aggregate-number\" : %d, ",
> id.socket, nr);
> break;
> case AGGR_NODE:
> - fprintf(output, "\"node\" : \"N%d\", \"cpu-count\" : %d, ",
> + fprintf(output, "\"node\" : \"N%d\", \"aggregate-number\" : %d, ",
> id.node, nr);
> break;
> case AGGR_NONE:
> --
> 2.38.1.584.g0f3c55d4c2-goog
--
- Arnaldo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-05 13:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-30 19:36 [PATCH] Revert "perf stat: Rename "aggregate-number" to "cpu-count" in JSON" Namhyung Kim
2022-12-05 13:09 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.