Allowing to override record aggr_mode. It's possible
to use perf stat like:

   $ perf stat report -A
   $ perf stat report --per-core
   $ perf stat report --per-socket

To customize the recorded aggregate mode regardless
what was used during the stat record command.

Link: http://lkml.kernel.org/n/tip-5ckzk91fsn6cvv7a740nf...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/Documentation/perf-stat.txt | 10 ++++++++++
 tools/perf/builtin-stat.c              | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/tools/perf/Documentation/perf-stat.txt 
b/tools/perf/Documentation/perf-stat.txt
index 709c9ed165b2..531452d66a8f 100644
--- a/tools/perf/Documentation/perf-stat.txt
+++ b/tools/perf/Documentation/perf-stat.txt
@@ -181,6 +181,16 @@ Reads and reports stat data from perf data file.
 --input file::
 Input file name.
 
+--per-socket::
+Aggregate counts per processor socket for system-wide mode measurements.
+
+--per-core::
+Aggregate counts per physical processor for system-wide mode measurements.
+
+-A::
+--no-aggr::
+Do not aggregate counts across all monitored CPUs.
+
 
 EXAMPLES
 --------
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 10d9568415ae..853570341365 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -135,6 +135,7 @@ struct perf_stat {
        bool                     maps_allocated;
        struct cpu_map          *cpus;
        struct thread_map       *threads;
+       enum aggr_mode           aggr_mode;
 };
 
 static struct perf_stat                perf_stat;
@@ -1520,6 +1521,9 @@ int process_stat_config_event(struct perf_tool *tool 
__maybe_unused,
 
        perf_event__read_stat_config(&stat_config, &event->stat_config);
 
+       if (stat->aggr_mode != AGGR_UNSET)
+               stat_config.aggr_mode = stat->aggr_mode;
+
        if (perf_stat.file.is_pipe)
                perf_stat_init_aggr_mode();
        else
@@ -1599,6 +1603,7 @@ static struct perf_stat perf_stat = {
                .stat           = perf_event__process_stat_event,
                .stat_round     = process_stat_round_event,
        },
+       .aggr_mode = AGGR_UNSET,
 };
 
 static int __cmd_report(int argc, const char **argv)
@@ -1606,6 +1611,12 @@ static int __cmd_report(int argc, const char **argv)
        struct perf_session *session;
        const struct option options[] = {
        OPT_STRING('i', "input", &input_name, "file", "input file name"),
+       OPT_SET_UINT(0, "per-socket", &perf_stat.aggr_mode,
+                    "aggregate counts per processor socket", AGGR_SOCKET),
+       OPT_SET_UINT(0, "per-core", &perf_stat.aggr_mode,
+                    "aggregate counts per physical processor core", AGGR_CORE),
+       OPT_SET_UINT('A', "no-aggr", &perf_stat.aggr_mode,
+                    "disable CPU count aggregation", AGGR_NONE),
        OPT_END()
        };
        struct stat st;
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to