perf stat report: Allow to override aggr_mode
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. Reported-by: Kan Liang <kan.liang@intel.com> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1446734469-11352-19-git-send-email-jolsa@kernel.org [ Renamed 'stat' parameter to 'st' to fix 'already defined' build error with older distros (e.g. RHEL6.7) ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
fa6ea7817d
commit
89af4e05c2
|
@ -182,6 +182,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
|
||||
--------
|
||||
|
|
|
@ -138,6 +138,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;
|
||||
|
@ -1663,6 +1664,15 @@ int process_stat_config_event(struct perf_tool *tool __maybe_unused,
|
|||
|
||||
perf_event__read_stat_config(&stat_config, &event->stat_config);
|
||||
|
||||
if (cpu_map__empty(st->cpus)) {
|
||||
if (st->aggr_mode != AGGR_UNSET)
|
||||
pr_warning("warning: processing task data, aggregation mode not set\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (st->aggr_mode != AGGR_UNSET)
|
||||
stat_config.aggr_mode = st->aggr_mode;
|
||||
|
||||
if (perf_stat.file.is_pipe)
|
||||
perf_stat_init_aggr_mode();
|
||||
else
|
||||
|
@ -1743,6 +1753,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)
|
||||
|
@ -1750,6 +1761,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;
|
||||
|
|
Loading…
Reference in New Issue