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: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt
index 0102d83600db463bd670ab8ed7300f68170608ee..fe6762ed56bd64ddeb57cdec377a623b782567da 100644 (file)
--- a/tools/perf/Documentation/perf-annotate.txt
+++ b/tools/perf/Documentation/perf-annotate.txt
@@ -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,

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 4ed17072ea8865873b5d54644ae57078525abd42..212f24d672e1ac2f88b5c2f4a8fb84863fd5e820 100644 (file)
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -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]

diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index e2e5cd0023cda49add169e285a1003195941b8b0..b1a5bbbfebef9e00f936aaa4914c3668ef146637 100644 (file)
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -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.

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 24db9d2db7b42fcb3b5e13d01ecba5fe56bfa5ff..3ea764a7805361c90a58f490fffbb0fdd565d9b6 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -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)"),

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 66fe822b181dadb234a302a17e33ef0217856edf..4d7c8340c3267c82cca1b1a266f36b8ed3c1b793 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -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,

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index cc877bc83ebd91f30cdc473e4faab4c46131213d..c5aebf6eb746f53db56a1e7514cdb657194ec5ce 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1117,6 +1117,12 @@ static const struct option options[] = {
                   "only consider symbols in these comms"),
        OPT_STRING(0, "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
                   "only consider these symbols"),
+       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_END()
 };
 

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 077df15ee705295546be4ac9c80480c241fd444e..3f09a23f71b4207b4ac24f521e520bf5847ab7f8 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -46,7 +46,6 @@ struct symbol_conf symbol_conf = {
        .exclude_other    = true,
        .use_modules      = true,
        .try_vmlinux_path = true,
-       .annotate_asm_raw = true,
        .annotate_src     = true,
        .symfs            = "",
 };