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>
This commit is contained in:
parent
fbe96f29ce
commit
64c6f0c7f8
|
@ -73,8 +73,7 @@ OPTIONS
|
||||||
CPUs.
|
CPUs.
|
||||||
|
|
||||||
--asm-raw::
|
--asm-raw::
|
||||||
Show raw instruction encoding of assembly instructions. They
|
Show raw instruction encoding of assembly instructions.
|
||||||
are displayed by default, disable with --no-asm-raw.
|
|
||||||
|
|
||||||
--source::
|
--source::
|
||||||
Interleave source code with assembly code. Enabled by default,
|
Interleave source code with assembly code. Enabled by default,
|
||||||
|
|
|
@ -137,6 +137,13 @@ OPTIONS
|
||||||
-M::
|
-M::
|
||||||
--disassembler-style=:: Set disassembler style for objdump.
|
--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.
|
--show-total-period:: Show a column with the sum of periods.
|
||||||
|
|
||||||
-I::
|
-I::
|
||||||
|
@ -147,4 +154,4 @@ OPTIONS
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
--------
|
--------
|
||||||
linkperf:perf-stat[1]
|
linkperf:perf-stat[1], linkperf:perf-annotate[1]
|
||||||
|
|
|
@ -126,6 +126,16 @@ Default is to monitor all CPUS.
|
||||||
--symbols::
|
--symbols::
|
||||||
Only consider these 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]::
|
-G [type,min,order]::
|
||||||
--call-graph::
|
--call-graph::
|
||||||
Display call chains using type, min percent threshold and order.
|
Display call chains using type, min percent threshold and order.
|
||||||
|
|
|
@ -272,9 +272,9 @@ static const struct option options[] = {
|
||||||
OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
|
OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
|
||||||
OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
|
OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
|
||||||
"Look for files with symbols relative to this 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)"),
|
"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)"),
|
"Display raw encoding of assembly instructions (default)"),
|
||||||
OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
|
OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
|
||||||
"Specify disassembler style (e.g. -M intel for intel syntax)"),
|
"Specify disassembler style (e.g. -M intel for intel syntax)"),
|
||||||
|
|
|
@ -491,6 +491,10 @@ static const struct option options[] = {
|
||||||
OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
|
OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
|
||||||
OPT_BOOLEAN('I', "show-info", &show_full_info,
|
OPT_BOOLEAN('I', "show-info", &show_full_info,
|
||||||
"Display extended information about perf.data file"),
|
"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",
|
OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
|
||||||
"Specify disassembler style (e.g. -M intel for intel syntax)"),
|
"Specify disassembler style (e.g. -M intel for intel syntax)"),
|
||||||
OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
|
OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
|
||||||
|
|
|
@ -1117,6 +1117,12 @@ static const struct option options[] = {
|
||||||
"only consider symbols in these comms"),
|
"only consider symbols in these comms"),
|
||||||
OPT_STRING(0, "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
|
OPT_STRING(0, "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
|
||||||
"only consider these symbols"),
|
"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()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,6 @@ struct symbol_conf symbol_conf = {
|
||||||
.exclude_other = true,
|
.exclude_other = true,
|
||||||
.use_modules = true,
|
.use_modules = true,
|
||||||
.try_vmlinux_path = true,
|
.try_vmlinux_path = true,
|
||||||
.annotate_asm_raw = true,
|
|
||||||
.annotate_src = true,
|
.annotate_src = true,
|
||||||
.symfs = "",
|
.symfs = "",
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue