2022-11-30 20:09:27

by Namhyung Kim

Subject: [PATCH] Revert "perf stat: Rename "aggregate-number" to "cpu-count" in JSON"

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 <[email protected]>
---
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

2022-12-05 13:44:36

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] Revert "perf stat: Rename "aggregate-number" to "cpu-count" in JSON"

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 <[email protected]>
> ---
> 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