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

Commit 64c6f0c7 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Make --no-asm-raw the default 

And add the annotation output knobs to all the tools that have
integrated annotation (top, report).

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-gnlob67mke6sji2kf4nstp7m@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fbe96f29

tools/perf/Documentation/perf-annotate.txt

+1 −2
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ OPTIONS 
	CPUs.



--asm-raw::

	Show raw instruction encoding of assembly instructions. They

	are displayed by default, disable with --no-asm-raw.

	Show raw instruction encoding of assembly instructions.



--source::

	Interleave source code with assembly code. Enabled by default,

tools/perf/Documentation/perf-report.txt

+8 −1
Original line number Diff line number Diff line
@@ -137,6 +137,13 @@ OPTIONS 
-M::

--disassembler-style=:: Set disassembler style for objdump.



--source::

	Interleave source code with assembly code. Enabled by default,

	disable with --no-source.



--asm-raw::

	Show raw instruction encoding of assembly instructions.



--show-total-period:: Show a column with the sum of periods.



-I::
@@ -147,4 +154,4 @@ OPTIONS 


SEE ALSO

--------

linkperf:perf-stat[1]
 
linkperf:perf-stat[1], linkperf:perf-annotate[1]

tools/perf/Documentation/perf-top.txt

+10 −0
Original line number Diff line number Diff line
@@ -126,6 +126,16 @@ Default is to monitor all CPUS. 
--symbols::

	Only consider these symbols.



-M::

--disassembler-style=:: Set disassembler style for objdump.



--source::

	Interleave source code with assembly code. Enabled by default,

	disable with --no-source.



--asm-raw::

	Show raw instruction encoding of assembly instructions.



-G [type,min,order]::

--call-graph::

        Display call chains using type, min percent threshold and order.

tools/perf/builtin-annotate.c

+2 −2
Original line number Diff line number Diff line
@@ -272,9 +272,9 @@ static const struct option options[] = { 
	OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),

	OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",

		   "Look for files with symbols relative to this directory"),

	OPT_BOOLEAN('0', "source", &symbol_conf.annotate_src,

	OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,

		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN('0', "asm-raw", &symbol_conf.annotate_asm_raw,

	OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

tools/perf/builtin-report.c

+4 −0
Original line number Diff line number Diff line
@@ -491,6 +491,10 @@ static const struct option options[] = { 
	OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),

	OPT_BOOLEAN('I', "show-info", &show_full_info,

		    "Display extended information about perf.data file"),

	OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,

		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

	OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,