Commit 3e6a2a7f authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Make output more readable 

This patch adds two new options to perf annotate:
	- --no-asm-raw : Do not display raw instruction encodings
	- --no-source  : Do not interleave source code with assembly code

We believe those options make the output of annotate more readable.

Systematically displaying source can make it hard to follow code and
especially optimized code.

Raw encodings are not useful in most cases.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20110517153207.GA9834@quad


Signed-off-by: default avatarStephane Eranian <eranian@google.com>
[committer note: Use the 'no-' option inverting logic]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 18e5a45d

tools/perf/Documentation/perf-annotate.txt

+8 −0
Original line number Diff line number Diff line
@@ -72,6 +72,14 @@ OPTIONS 
	CPUs are specified with -: 0-2. Default is to report samples on all

	CPUs.



--asm-raw::

	Show raw instruction encoding of assembly instructions. They

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



--source::

	Interleave source code with assembly code. Enabled by default,

	disable with --no-source.



SEE ALSO

--------

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

tools/perf/builtin-annotate.c

+4 −0
Original line number Diff line number Diff line
@@ -267,6 +267,10 @@ static const struct option options[] = { 
	OPT_BOOLEAN('P', "full-paths", &full_paths,

		    "Don't shorten the displayed pathnames"),

	OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),

	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_END()

};

tools/perf/util/annotate.c

+4 −1
Original line number Diff line number Diff line
@@ -324,9 +324,12 @@ fallback: 


	snprintf(command, sizeof(command),

		 "objdump --start-address=0x%016" PRIx64

		 " --stop-address=0x%016" PRIx64 " -dS -C %s|grep -v %s|expand",

		 " --stop-address=0x%016" PRIx64

		 " -d %s %s -C %s|grep -v %s|expand",

		 map__rip_2objdump(map, sym->start),

		 map__rip_2objdump(map, sym->end),

		 symbol_conf.annotate_asm_raw ? "" : "--no-show-raw",

		 symbol_conf.annotate_src ? "-S" : "",

		 symfs_filename, filename);



	pr_debug("Executing: %s\n", command);

tools/perf/util/symbol.c

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ struct symbol_conf symbol_conf = { 
	.exclude_other	  = true,

	.use_modules	  = true,

	.try_vmlinux_path = true,

	.annotate_asm_raw = true,

	.annotate_src	  = true,

	.symfs            = "",

};

tools/perf/util/symbol.h

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ struct symbol_conf { 
			exclude_other,

			show_cpu_utilization,

			initialized,

			kptr_restrict;

			kptr_restrict,

			annotate_asm_raw,

			annotate_src;

	const char	*vmlinux_name,

			*kallsyms_name,

			*source_prefix,

CRA Git | Maintained and supported by SUSTech CRA and CCSE