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

Commit f5d05bce authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

tools/perf: Support sorting by in_tx or abort branch flags 



Extend the perf branch sorting code to support sorting by in_tx
or abort_tx qualifiers. Also print out those qualifiers.

This also fixes up some of the existing sort key documentation.

We do not support no_tx here, because it's simply not showing
the in_tx flag.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1379688044-14173-4-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a405bad5

tools/perf/Documentation/perf-report.txt

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ OPTIONS 
	entries are displayed as "[other]".

	- cpu: cpu number the task ran at the time of sample

	- srcline: filename and line number executed at the time of sample.  The

	DWARF debuggin info must be provided.

	DWARF debugging info must be provided.



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

	(i.e. --sort comm,dso,symbol)
@@ -85,6 +85,8 @@ OPTIONS 
	- symbol_from: name of function branched from

	- symbol_to: name of function branched to

	- mispredict: "N" for predicted branch, "Y" for mispredicted branch

	- in_tx: branch in TSX transaction

	- abort: TSX transaction abort.



	And default sort keys are changed to comm, dso_from, symbol_from, dso_to

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

tools/perf/Documentation/perf-top.txt

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ Default is to monitor all CPUS. 


-s::

--sort::

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

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

	local_weight, abort, in_tx



-n::

--show-nr-samples::

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
		   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline,"

		   " dso_to, dso_from, symbol_to, symbol_from, mispredict,"

		   " weight, local_weight, mem, symbol_daddr, dso_daddr, tlb, "

		   "snoop, locked"),

		   "snoop, locked, abort, in_tx"),

	OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,

		    "Show sample percentage for different cpu modes"),

	OPT_STRING('p', "parent", &parent_pattern, "regex",

tools/perf/builtin-top.c

+2 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_INCR('v', "verbose", &verbose,

		    "be more verbose (show counter open errors, etc)"),

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

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

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

		   " abort, in_tx"),

	OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,

		    "Show a column with the number of samples"),

	OPT_CALLBACK_DEFAULT('G', "call-graph", &top.record_opts,

tools/perf/perf.h

+3 −1
Original line number Diff line number Diff line
@@ -182,7 +182,9 @@ struct ip_callchain { 
struct branch_flags {

	u64 mispred:1;

	u64 predicted:1;

	u64 reserved:62;

	u64 in_tx:1;

	u64 abort:1;

	u64 reserved:60;

};



struct branch_entry {