aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/Documentation/perf-annotate.txt3
-rw-r--r--tools/perf/Documentation/perf-report.txt9
-rw-r--r--tools/perf/Documentation/perf-top.txt10
-rw-r--r--tools/perf/builtin-annotate.c4
-rw-r--r--tools/perf/builtin-report.c4
-rw-r--r--tools/perf/builtin-top.c6
-rw-r--r--tools/perf/util/symbol.c1
7 files changed, 31 insertions, 6 deletions
diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt
index 0102d83600db..fe6762ed56bd 100644
--- a/tools/perf/Documentation/perf-annotate.txt
+++ b/tools/perf/Documentation/perf-annotate.txt
@@ -73,8 +73,7 @@ OPTIONS
73 CPUs. 73 CPUs.
74 74
75--asm-raw:: 75--asm-raw::
76 Show raw instruction encoding of assembly instructions. They 76 Show raw instruction encoding of assembly instructions.
77 are displayed by default, disable with --no-asm-raw.
78 77
79--source:: 78--source::
80 Interleave source code with assembly code. Enabled by default, 79 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 4ed17072ea88..212f24d672e1 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -137,6 +137,13 @@ OPTIONS
137-M:: 137-M::
138--disassembler-style=:: Set disassembler style for objdump. 138--disassembler-style=:: Set disassembler style for objdump.
139 139
140--source::
141 Interleave source code with assembly code. Enabled by default,
142 disable with --no-source.
143
144--asm-raw::
145 Show raw instruction encoding of assembly instructions.
146
140--show-total-period:: Show a column with the sum of periods. 147--show-total-period:: Show a column with the sum of periods.
141 148
142-I:: 149-I::
@@ -147,4 +154,4 @@ OPTIONS
147 154
148SEE ALSO 155SEE ALSO
149-------- 156--------
150linkperf:perf-stat[1] 157linkperf:perf-stat[1], linkperf:perf-annotate[1]
diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index e2e5cd0023cd..b1a5bbbfebef 100644
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -126,6 +126,16 @@ Default is to monitor all CPUS.
126--symbols:: 126--symbols::
127 Only consider these symbols. 127 Only consider these symbols.
128 128
129-M::
130--disassembler-style=:: Set disassembler style for objdump.
131
132--source::
133 Interleave source code with assembly code. Enabled by default,
134 disable with --no-source.
135
136--asm-raw::
137 Show raw instruction encoding of assembly instructions.
138
129-G [type,min,order]:: 139-G [type,min,order]::
130--call-graph:: 140--call-graph::
131 Display call chains using type, min percent threshold and order. 141 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 24db9d2db7b4..3ea764a78053 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -272,9 +272,9 @@ static const struct option options[] = {
272 OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"), 272 OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
273 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", 273 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
274 "Look for files with symbols relative to this directory"), 274 "Look for files with symbols relative to this directory"),
275 OPT_BOOLEAN('0', "source", &symbol_conf.annotate_src, 275 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
276 "Interleave source code with assembly code (default)"), 276 "Interleave source code with assembly code (default)"),
277 OPT_BOOLEAN('0', "asm-raw", &symbol_conf.annotate_asm_raw, 277 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
278 "Display raw encoding of assembly instructions (default)"), 278 "Display raw encoding of assembly instructions (default)"),
279 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style", 279 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
280 "Specify disassembler style (e.g. -M intel for intel syntax)"), 280 "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 66fe822b181d..4d7c8340c326 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -491,6 +491,10 @@ static const struct option options[] = {
491 OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"), 491 OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
492 OPT_BOOLEAN('I', "show-info", &show_full_info, 492 OPT_BOOLEAN('I', "show-info", &show_full_info,
493 "Display extended information about perf.data file"), 493 "Display extended information about perf.data file"),
494 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
495 "Interleave source code with assembly code (default)"),
496 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
497 "Display raw encoding of assembly instructions (default)"),
494 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style", 498 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
495 "Specify disassembler style (e.g. -M intel for intel syntax)"), 499 "Specify disassembler style (e.g. -M intel for intel syntax)"),
496 OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period, 500 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 cc877bc83ebd..c5aebf6eb746 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1117,6 +1117,12 @@ static const struct option options[] = {
1117 "only consider symbols in these comms"), 1117 "only consider symbols in these comms"),
1118 OPT_STRING(0, "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", 1118 OPT_STRING(0, "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
1119 "only consider these symbols"), 1119 "only consider these symbols"),
1120 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
1121 "Interleave source code with assembly code (default)"),
1122 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
1123 "Display raw encoding of assembly instructions (default)"),
1124 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
1125 "Specify disassembler style (e.g. -M intel for intel syntax)"),
1120 OPT_END() 1126 OPT_END()
1121}; 1127};
1122 1128
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 077df15ee705..3f09a23f71b4 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -46,7 +46,6 @@ struct symbol_conf symbol_conf = {
46 .exclude_other = true, 46 .exclude_other = true,
47 .use_modules = true, 47 .use_modules = true,
48 .try_vmlinux_path = true, 48 .try_vmlinux_path = true,
49 .annotate_asm_raw = true,
50 .annotate_src = true, 49 .annotate_src = true,
51 .symfs = "", 50 .symfs = "",
52}; 51};