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 <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221130193613.1046804-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 847acdb5dc4077e817472f77b46d4ac2c5bf68dc..f1ee4b052198690fe9abc4c024b2376f790493ed 100644 (file)
--- 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: