Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e450f90e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf

 into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

  * Android related fixes for pager and map dso resolving (Michael Lentine)

  * Add -F option for specifying output fields (Namhyung Kim)

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6480c561 eca81836

tools/perf/Documentation/perf-diff.txt

+3 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ OPTIONS 


-s::

--sort=::

	Sort by key(s): pid, comm, dso, symbol.

	Sort by key(s): pid, comm, dso, symbol, cpu, parent, srcline.

	Please see description of --sort in the perf-report man page.



-t::

--field-separator=::
@@ -202,4 +203,4 @@ If specified the 'Weighted diff' column is displayed with value 'd' computed as: 


SEE ALSO

--------

linkperf:perf-record[1]
 
linkperf:perf-record[1], linkperf:perf-report[1]

tools/perf/Documentation/perf-report.txt

+19 −0
Original line number Diff line number Diff line
@@ -79,6 +79,15 @@ OPTIONS 
	abort cost. This is the global weight.

	- local_weight: Local weight version of the weight above.

	- transaction: Transaction abort flags.

	- overhead: Overhead percentage of sample

	- overhead_sys: Overhead percentage of sample running in system mode

	- overhead_us: Overhead percentage of sample running in user mode

	- overhead_guest_sys: Overhead percentage of sample running in system mode

	on guest machine

	- overhead_guest_us: Overhead percentage of sample running in user mode on

	guest machine

	- sample: Number of sample

	- period: Raw number of event count of sample



	By default, comm, dso and symbol keys are used.

	(i.e. --sort comm,dso,symbol)
@@ -98,6 +107,16 @@ OPTIONS 
	And default sort keys are changed to comm, dso_from, symbol_from, dso_to

	and symbol_to, see '--branch-stack'.



-F::

--fields=::

	Specify output field - multiple keys can be specified in CSV format.

	Following fields are available:

	overhead, overhead_sys, overhead_us, sample and period.

	Also it can contain any sort key(s).



	By default, every sort keys not specified in -F will be appended

	automatically.



-p::

--parent=<regex>::

        A regex filter to identify parent. The parent is a caller of this

tools/perf/Documentation/perf-top.txt

+12 −2
Original line number Diff line number Diff line
@@ -113,7 +113,17 @@ Default is to monitor all CPUS. 
-s::

--sort::

	Sort by key(s): pid, comm, dso, symbol, parent, srcline, weight,

	local_weight, abort, in_tx, transaction

	local_weight, abort, in_tx, transaction, overhead, sample, period.

	Please see description of --sort in the perf-report man page.



--fields=::

	Specify output field - multiple keys can be specified in CSV format.

	Following fields are available:

	overhead, overhead_sys, overhead_us, sample and period.

	Also it can contain any sort key(s).



	By default, every sort keys not specified in --field will be appended

	automatically.



-n::

--show-nr-samples::
@@ -212,4 +222,4 @@ Pressing any unmapped key displays a menu, and prompts for input. 


SEE ALSO

--------

linkperf:perf-stat[1], linkperf:perf-list[1]
 
linkperf:perf-stat[1], linkperf:perf-list[1], linkperf:perf-report[1]

tools/perf/Makefile.perf

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ LIB_OBJS += $(OUTPUT)tests/pmu.o 
LIB_OBJS += $(OUTPUT)tests/hists_common.o

LIB_OBJS += $(OUTPUT)tests/hists_link.o

LIB_OBJS += $(OUTPUT)tests/hists_filter.o

LIB_OBJS += $(OUTPUT)tests/hists_output.o

LIB_OBJS += $(OUTPUT)tests/python-use.o

LIB_OBJS += $(OUTPUT)tests/bp_signal.o

LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o

tools/perf/builtin-diff.c

+4 −3
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static int data__files_cnt; 
#define data__for_each_file(i, d) data__for_each_file_start(i, d, 0)

#define data__for_each_file_new(i, d) data__for_each_file_start(i, d, 1)



static char diff__default_sort_order[] = "dso,symbol";

static bool force;

static bool show_period;

static bool show_formula;
@@ -741,7 +740,8 @@ static const struct option options[] = { 
	OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",

		   "only consider these symbols"),

	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",

		   "sort by key(s): pid, comm, dso, symbol, parent"),

		   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..."

		   " Please refer the man page for the complete list."),

	OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",

		   "separator for columns, no spaces will be added between "

		   "columns '.' is reserved."),
@@ -1141,7 +1141,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) 
{

	perf_config(perf_default_config, NULL);



	sort_order = diff__default_sort_order;

	argc = parse_options(argc, argv, options, diff_usage, 0);



	if (symbol__init() < 0)
@@ -1152,6 +1151,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) 


	ui_init();



	sort__mode = SORT_MODE__DIFF;



	if (setup_sorting() < 0)

		usage_with_options(diff_usage, options);