From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-perf-users@vger.kernel.org,
Kan Liang <kan.liang@linux.intel.com>,
Leo Yan <leo.yan@linaro.org>, Andi Kleen <ak@linux.intel.com>,
Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
James Clark <james.clark@arm.com>,
Xing Zhengjun <zhengjun.xing@linux.intel.com>
Subject: [PATCH 04/19] perf stat: Add aggr id for global mode
Date: Sun, 9 Oct 2022 22:35:45 -0700 [thread overview]
Message-ID: <20221010053600.272854-5-namhyung@kernel.org> (raw)
In-Reply-To: <20221010053600.272854-1-namhyung@kernel.org>
To make the code simpler, I'd like to use the same aggregation code for
the global mode. We can simply add an id function to return cpu 0 and
use print_aggr().
No functional change intended.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-stat.c | 39 ++++++++++++++++++++++++++++++++--
tools/perf/util/cpumap.c | 10 +++++++++
tools/perf/util/cpumap.h | 6 +++++-
tools/perf/util/stat-display.c | 9 ++------
4 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 265b05157972..144bb3a657f2 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1330,6 +1330,15 @@ static struct aggr_cpu_id perf_stat__get_node(struct perf_stat_config *config __
return aggr_cpu_id__node(cpu, /*data=*/NULL);
}
+static struct aggr_cpu_id perf_stat__get_global(struct perf_stat_config *config __maybe_unused,
+ struct perf_cpu cpu __maybe_unused)
+{
+ struct aggr_cpu_id id = aggr_cpu_id__empty();
+
+ id.cpu = (struct perf_cpu){ .cpu = 0 };
+ return id;
+}
+
static struct aggr_cpu_id perf_stat__get_aggr(struct perf_stat_config *config,
aggr_get_id_t get_id, struct perf_cpu cpu)
{
@@ -1366,6 +1375,12 @@ static struct aggr_cpu_id perf_stat__get_node_cached(struct perf_stat_config *co
return perf_stat__get_aggr(config, perf_stat__get_node, cpu);
}
+static struct aggr_cpu_id perf_stat__get_global_cached(struct perf_stat_config *config,
+ struct perf_cpu cpu)
+{
+ return perf_stat__get_aggr(config, perf_stat__get_global, cpu);
+}
+
static bool term_percore_set(void)
{
struct evsel *counter;
@@ -1395,6 +1410,7 @@ static aggr_cpu_id_get_t aggr_mode__get_aggr(enum aggr_mode aggr_mode)
return NULL;
case AGGR_GLOBAL:
+ return aggr_cpu_id__global;
case AGGR_THREAD:
case AGGR_UNSET:
case AGGR_MAX:
@@ -1420,6 +1436,7 @@ static aggr_get_id_t aggr_mode__get_id(enum aggr_mode aggr_mode)
}
return NULL;
case AGGR_GLOBAL:
+ return perf_stat__get_global_cached;
case AGGR_THREAD:
case AGGR_UNSET:
case AGGR_MAX:
@@ -1535,6 +1552,16 @@ static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(struct perf_cpu cpu, vo
return id;
}
+static struct aggr_cpu_id perf_env__get_global_aggr_by_cpu(struct perf_cpu cpu __maybe_unused,
+ void *data __maybe_unused)
+{
+ struct aggr_cpu_id id = aggr_cpu_id__empty();
+
+ /* it always aggregates to the cpu 0 */
+ id.cpu = (struct perf_cpu){ .cpu = 0 };
+ return id;
+}
+
static struct aggr_cpu_id perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused,
struct perf_cpu cpu)
{
@@ -1558,6 +1585,12 @@ static struct aggr_cpu_id perf_stat__get_node_file(struct perf_stat_config *conf
return perf_env__get_node_aggr_by_cpu(cpu, &perf_stat.session->header.env);
}
+static struct aggr_cpu_id perf_stat__get_global_file(struct perf_stat_config *config __maybe_unused,
+ struct perf_cpu cpu)
+{
+ return perf_env__get_global_aggr_by_cpu(cpu, &perf_stat.session->header.env);
+}
+
static aggr_cpu_id_get_t aggr_mode__get_aggr_file(enum aggr_mode aggr_mode)
{
switch (aggr_mode) {
@@ -1569,8 +1602,9 @@ static aggr_cpu_id_get_t aggr_mode__get_aggr_file(enum aggr_mode aggr_mode)
return perf_env__get_core_aggr_by_cpu;
case AGGR_NODE:
return perf_env__get_node_aggr_by_cpu;
- case AGGR_NONE:
case AGGR_GLOBAL:
+ return perf_env__get_global_aggr_by_cpu;
+ case AGGR_NONE:
case AGGR_THREAD:
case AGGR_UNSET:
case AGGR_MAX:
@@ -1590,8 +1624,9 @@ static aggr_get_id_t aggr_mode__get_id_file(enum aggr_mode aggr_mode)
return perf_stat__get_core_file;
case AGGR_NODE:
return perf_stat__get_node_file;
- case AGGR_NONE:
case AGGR_GLOBAL:
+ return perf_stat__get_global_file;
+ case AGGR_NONE:
case AGGR_THREAD:
case AGGR_UNSET:
case AGGR_MAX:
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index 8486ca3bec75..60209fe87456 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -354,6 +354,16 @@ struct aggr_cpu_id aggr_cpu_id__node(struct perf_cpu cpu, void *data __maybe_unu
return id;
}
+struct aggr_cpu_id aggr_cpu_id__global(struct perf_cpu cpu, void *data __maybe_unused)
+{
+ struct aggr_cpu_id id = aggr_cpu_id__empty();
+
+ /* it always aggregates to the cpu 0 */
+ cpu.cpu = 0;
+ id.cpu = cpu;
+ return id;
+}
+
/* setup simple routines to easily access node numbers given a cpu number */
static int get_max_num(char *path, int *max)
{
diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index 4a6d029576ee..b2ff648bc417 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -133,5 +133,9 @@ struct aggr_cpu_id aggr_cpu_id__cpu(struct perf_cpu cpu, void *data);
* cpu. The function signature is compatible with aggr_cpu_id_get_t.
*/
struct aggr_cpu_id aggr_cpu_id__node(struct perf_cpu cpu, void *data);
-
+/**
+ * aggr_cpu_id__global - Create an aggr_cpu_id for global aggregation.
+ * The function signature is compatible with aggr_cpu_id_get_t.
+ */
+struct aggr_cpu_id aggr_cpu_id__global(struct perf_cpu cpu, void *data);
#endif /* __PERF_CPUMAP_H */
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 4113aa86772f..1d8e585df4ad 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -1477,13 +1477,8 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf
if (config->iostat_run)
iostat_print_counters(evlist, config, ts, prefix = buf,
print_counter_aggr);
- else {
- evlist__for_each_entry(evlist, counter) {
- print_counter_aggr(config, counter, prefix);
- }
- if (metric_only)
- fputc('\n', config->output);
- }
+ else
+ print_aggr(config, evlist, prefix);
break;
case AGGR_NONE:
if (metric_only)
--
2.38.0.rc1.362.ged0d419d3c-goog
next prev parent reply other threads:[~2022-10-10 5:36 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 5:35 [RFC/PATCHSET 00/19] perf stat: Cleanup counter aggregation (v1) Namhyung Kim
2022-10-10 5:35 ` [PATCH 01/19] perf tools: Save evsel->pmu in parse_events() Namhyung Kim
2022-10-10 22:21 ` Ian Rogers
2022-10-10 5:35 ` [PATCH 02/19] perf tools: Use pmu info in evsel__is_hybrid() Namhyung Kim
2022-10-10 22:31 ` Ian Rogers
2022-10-11 5:10 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 03/19] perf stat: Use evsel__is_hybrid() more Namhyung Kim
2022-10-10 22:32 ` Ian Rogers
2022-10-10 5:35 ` Namhyung Kim [this message]
2022-10-10 22:46 ` [PATCH 04/19] perf stat: Add aggr id for global mode Ian Rogers
2022-10-11 23:08 ` Namhyung Kim
2022-10-12 10:55 ` Jiri Olsa
2022-10-12 16:31 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 05/19] perf stat: Add cpu aggr id for no aggregation mode Namhyung Kim
2022-10-10 22:49 ` Ian Rogers
2022-10-12 10:40 ` Jiri Olsa
2022-10-12 16:27 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 06/19] perf stat: Add 'needs_sort' argument to cpu_aggr_map__new() Namhyung Kim
2022-10-10 22:53 ` Ian Rogers
2022-10-11 23:32 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 07/19] perf stat: Add struct perf_stat_aggr to perf_stat_evsel Namhyung Kim
2022-10-10 23:00 ` Ian Rogers
2022-10-11 23:37 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 08/19] perf stat: Allocate evsel->stats->aggr properly Namhyung Kim
2022-10-10 23:03 ` Ian Rogers
2022-10-11 23:38 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 09/19] perf stat: Aggregate events using evsel->stats->aggr Namhyung Kim
2022-10-10 23:11 ` Ian Rogers
2022-10-11 23:44 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 10/19] perf stat: Aggregate per-thread stats " Namhyung Kim
2022-10-10 23:17 ` Ian Rogers
2022-10-11 23:46 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 11/19] perf stat: Allocate aggr counts for recorded data Namhyung Kim
2022-10-10 23:18 ` Ian Rogers
2022-10-10 5:35 ` [PATCH 12/19] perf stat: Reset aggr counts for each interval Namhyung Kim
2022-10-10 23:20 ` Ian Rogers
2022-10-11 23:48 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 13/19] perf stat: Split process_counters() Namhyung Kim
2022-10-10 23:21 ` Ian Rogers
2022-10-10 5:35 ` [PATCH 14/19] perf stat: Add perf_stat_merge_counters() Namhyung Kim
2022-10-10 23:31 ` Ian Rogers
2022-10-11 23:55 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 15/19] perf stat: Add perf_stat_process_percore() Namhyung Kim
2022-10-10 23:32 ` Ian Rogers
2022-10-11 23:59 ` Namhyung Kim
2022-10-10 5:35 ` [PATCH 16/19] perf stat: Add perf_stat_process_shadow_stats() Namhyung Kim
2022-10-10 23:36 ` Ian Rogers
2022-10-10 5:35 ` [PATCH 17/19] perf stat: Display event stats using aggr counts Namhyung Kim
2022-10-10 23:38 ` Ian Rogers
2022-10-10 5:35 ` [PATCH 18/19] perf stat: Display percore events properly Namhyung Kim
2022-10-10 23:39 ` Ian Rogers
2022-10-10 5:36 ` [PATCH 19/19] perf stat: Remove unused perf_counts.aggr field Namhyung Kim
2022-10-10 23:40 ` Ian Rogers
2022-10-12 8:41 ` Jiri Olsa
2022-10-12 16:26 ` Namhyung Kim
2022-10-13 20:56 ` [PATCH] perf stat: Init aggr_map when reporting per-process stat Namhyung Kim
2022-10-11 0:25 ` [RFC/PATCHSET 00/19] perf stat: Cleanup counter aggregation (v1) Andi Kleen
2022-10-11 5:38 ` Namhyung Kim
2022-10-11 6:13 ` Ian Rogers
2022-10-12 3:55 ` Namhyung Kim
2022-10-11 11:57 ` Andi Kleen
2022-10-12 3:58 ` Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2022-10-14 6:15 [PATCHSET 00/19] perf stat: Cleanup counter aggregation (v2) Namhyung Kim
2022-10-14 6:15 ` [PATCH 04/19] perf stat: Add aggr id for global mode Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221010053600.272854-5-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).