diff options
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/Documentation/perf-annotate.txt | 3 | ||||
-rw-r--r-- | tools/perf/Documentation/perf-report.txt | 3 | ||||
-rw-r--r-- | tools/perf/builtin-annotate.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-report.c | 2 | ||||
-rw-r--r-- | tools/perf/util/annotate.c | 4 | ||||
-rw-r--r-- | tools/perf/util/annotate.h | 1 |
6 files changed, 14 insertions, 1 deletions
diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt index c89f9e1453f..c8ffd9fd5c6 100644 --- a/tools/perf/Documentation/perf-annotate.txt +++ b/tools/perf/Documentation/perf-annotate.txt | |||
@@ -85,6 +85,9 @@ OPTIONS | |||
85 | -M:: | 85 | -M:: |
86 | --disassembler-style=:: Set disassembler style for objdump. | 86 | --disassembler-style=:: Set disassembler style for objdump. |
87 | 87 | ||
88 | --objdump=<path>:: | ||
89 | Path to objdump binary. | ||
90 | |||
88 | SEE ALSO | 91 | SEE ALSO |
89 | -------- | 92 | -------- |
90 | linkperf:perf-record[1], linkperf:perf-report[1] | 93 | linkperf:perf-record[1], linkperf:perf-report[1] |
diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt index 495210a612c..f4d91bebd59 100644 --- a/tools/perf/Documentation/perf-report.txt +++ b/tools/perf/Documentation/perf-report.txt | |||
@@ -168,6 +168,9 @@ OPTIONS | |||
168 | branch stacks and it will automatically switch to the branch view mode, | 168 | branch stacks and it will automatically switch to the branch view mode, |
169 | unless --no-branch-stack is used. | 169 | unless --no-branch-stack is used. |
170 | 170 | ||
171 | --objdump=<path>:: | ||
172 | Path to objdump binary. | ||
173 | |||
171 | SEE ALSO | 174 | SEE ALSO |
172 | -------- | 175 | -------- |
173 | linkperf:perf-stat[1], linkperf:perf-annotate[1] | 176 | linkperf:perf-stat[1], linkperf:perf-annotate[1] |
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 67522cf8740..2f3f0029c0f 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
@@ -282,6 +282,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) | |||
282 | "Display raw encoding of assembly instructions (default)"), | 282 | "Display raw encoding of assembly instructions (default)"), |
283 | OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style", | 283 | OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style", |
284 | "Specify disassembler style (e.g. -M intel for intel syntax)"), | 284 | "Specify disassembler style (e.g. -M intel for intel syntax)"), |
285 | OPT_STRING(0, "objdump", &objdump_path, "path", | ||
286 | "objdump binary to use for disassembly and annotations"), | ||
285 | OPT_END() | 287 | OPT_END() |
286 | }; | 288 | }; |
287 | 289 | ||
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index d61825371ad..1f8d11b4f7f 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -638,6 +638,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) | |||
638 | "Show a column with the sum of periods"), | 638 | "Show a column with the sum of periods"), |
639 | OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "", | 639 | OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "", |
640 | "use branch records for histogram filling", parse_branch_mode), | 640 | "use branch records for histogram filling", parse_branch_mode), |
641 | OPT_STRING(0, "objdump", &objdump_path, "path", | ||
642 | "objdump binary to use for disassembly and annotations"), | ||
641 | OPT_END() | 643 | OPT_END() |
642 | }; | 644 | }; |
643 | 645 | ||
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 3a282c0057d..51ef69c9841 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <pthread.h> | 17 | #include <pthread.h> |
18 | 18 | ||
19 | const char *disassembler_style; | 19 | const char *disassembler_style; |
20 | const char *objdump_path; | ||
20 | 21 | ||
21 | static struct ins *ins__find(const char *name); | 22 | static struct ins *ins__find(const char *name); |
22 | static int disasm_line__parse(char *line, char **namep, char **rawp); | 23 | static int disasm_line__parse(char *line, char **namep, char **rawp); |
@@ -820,9 +821,10 @@ fallback: | |||
820 | dso, dso->long_name, sym, sym->name); | 821 | dso, dso->long_name, sym, sym->name); |
821 | 822 | ||
822 | snprintf(command, sizeof(command), | 823 | snprintf(command, sizeof(command), |
823 | "objdump %s%s --start-address=0x%016" PRIx64 | 824 | "%s %s%s --start-address=0x%016" PRIx64 |
824 | " --stop-address=0x%016" PRIx64 | 825 | " --stop-address=0x%016" PRIx64 |
825 | " -d %s %s -C %s|grep -v %s|expand", | 826 | " -d %s %s -C %s|grep -v %s|expand", |
827 | objdump_path ? objdump_path : "objdump", | ||
826 | disassembler_style ? "-M " : "", | 828 | disassembler_style ? "-M " : "", |
827 | disassembler_style ? disassembler_style : "", | 829 | disassembler_style ? disassembler_style : "", |
828 | map__rip_2objdump(map, sym->start), | 830 | map__rip_2objdump(map, sym->start), |
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 78a5692dd71..a6d6bc5d716 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h | |||
@@ -152,5 +152,6 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, | |||
152 | #endif | 152 | #endif |
153 | 153 | ||
154 | extern const char *disassembler_style; | 154 | extern const char *disassembler_style; |
155 | extern const char *objdump_path; | ||
155 | 156 | ||
156 | #endif /* __PERF_ANNOTATE_H */ | 157 | #endif /* __PERF_ANNOTATE_H */ |