perf annotate: Use libcapstone as a disasssembler
Namhyung Kim
maintainerv2 cover perf annotate: Use libcapstone as a disasssembler
Hello,
As we've added libcapstone support, it's natural to use it for perf annotate as well. This change added the capstone support on x86 first. Other archs can be added later (by someone who can verify it doesn't break things).
* v2 changes
- Show global symbols in the comment (Changbin)
- Update the commit message for split (Ian)
- Add Ian's Tested-by
For now it tries to use capstone (if available) before objdump. But it doesn't support source file and line number info. So users should use the objdump (by passing --objdump=PATH option) if they need them. For example, this command line will keep the existing behavior (i.e. using objdump).
# not to use capstone for disassembly $ perf annotate --objdump=objdump
The capstone uses LLVM objdump style output which is slightly different than the GNU objdump. But it should not have differences besides that. I've verified the result of data type profiling and it produced the same output but gave me ~3x speedups.
Thanks,
Namhyung
Namhyung Kim (5):
perf annotate: Use ins__is_xxx() if possible perf annotate: Add and use ins__is_nop() perf annotate: Split out util/disasm.c perf annotate: Use libcapstone to disassemble perf annotate: Add symbol name when using capstone
tools/perf/util/Build | 1 + tools/perf/util/annotate.c | 1711 ++-------------------------------- tools/perf/util/annotate.h | 59 +- tools/perf/util/disasm.c | 1814 ++++++++++++++++++++++++++++++++++++ tools/perf/util/disasm.h | 112 +++ 5 files changed, 1989 insertions(+), 1708 deletions(-) create mode 100644 tools/perf/util/disasm.c create mode 100644 tools/perf/util/disasm.h
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH v2 1/5 perf annotate: Use ins__is_xxx() if possible
This is to prepare separation of disasm related code. Use the public ins API instead of checking the internal data structure.
--- tools/perf/util/annotate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/util/annotate.c +4 -4
@@ -3665,7 +3665,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl,struct annotated_op_loc *op_loc;int i; -if (!strcmp (dl->ins.name,"lock" )) +if (ins__is_lock (&dl->ins)) ops = dl->ops.locked.ops;else ops = &dl->ops;
@@ -3763,7 +3763,7 @@ static struct disasm_line *find_disasm_line(struct symbol *sym, u64 ip,* llvm-objdump places "lock" in a separate line and * in that case, we want to get the next line. */ -if (!strcmp (dl->ins.name,"lock" ) && +if (ins__is_lock (&dl->ins) && *dl->ops.raw =='\0' && allow_update) { ip++;continue ;
@@ -4093,10 +4093,10 @@ static bool process_basic_block(struct basic_block_data *bb_data,if (dl == last_dl)break ;/* 'return' instruction finishes the block */ -if (dl->ins.ops == &ret_ops) +if (ins__is_ret (&dl->ins))break ;/* normal instructions are part of the basic block */ -if (dl->ins.ops != &jump_ops) +if (!ins__is_jump (&dl->ins))continue ;/* jump to a different function, tail call or return */ if (dl->ops.target.outside)
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH v2 2/5 perf annotate: Add and use ins__is_nop()
In reply to Namhyung KimLikewise, add ins__is_nop() to check if the current instruction is NOP.
--- tools/perf/util/annotate.c | 7 ++++++- tools/perf/util/annotate.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/annotate.c +6 -1
@@ -757,6 +757,11 @@ static struct ins_ops ret_ops = { .scnprintf = ins__raw_scnprintf, }; +bool ins__is_nop (const struct ins *ins) +{ +return ins->ops == &nop_ops; +} +bool ins__is_ret (const struct ins *ins) {return ins->ops == &ret_ops;
@@ -1785,7 +1790,7 @@ static void delete_last_nop(struct symbol *sym) dl = list_entry(list->prev, struct disasm_line, al.node);if (dl->ins.ops) { -if (dl->ins.ops != &nop_ops) +if (!ins__is_nop (&dl->ins))return ; }else { if (!strstr(dl->al.line, " nop ") &&
tools/perf/util/annotate.h +1 -0
@@ -74,6 +74,7 @@ struct ins_ops {bool ins__is_jump (const struct ins *ins);bool ins__is_call (const struct ins *ins); +bool ins__is_nop (const struct ins *ins);bool ins__is_ret (const struct ins *ins);bool ins__is_lock (const struct ins *ins);int ins__scnprintf (struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name);
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH v2 3/5 perf annotate: Split out util/disasm.c
In reply to Namhyung KimThe util/annotate.c code has both disassembly and sample annotation related codes. Factor out the disasm part so that it can be handled more easily.
No functional changes intended.
--- tools/perf/util/Build | 1 + tools/perf/util/annotate.c | 1708 ++---------------------------------- tools/perf/util/annotate.h | 60 +- tools/perf/util/disasm.c | 1586 +++++++++++++++++++++++++++++++++ tools/perf/util/disasm.h | 112 +++ 5 files changed, 1757 insertions(+), 1710 deletions(-) create mode 100644 tools/perf/util/disasm.c create mode 100644 tools/perf/util/disasm.h
tools/perf/util/Build +1 -0
@@ -12,6 +12,7 @@ perf-y += config.o perf-y += copyfile.o perf-y += ctype.o perf-y += db-export.o +perf-y += disasm.o perf-y += env.o perf-y += event.o perf-y += evlist.o
tools/perf/util/annotate.c +55 -1653
1,761 lines not on this page · raw message
tools/perf/util/annotate.h +3 -57
93 lines not on this page · raw message
tools/perf/util/disasm.c new file +1586 -0
1,139 lines not on this page · raw message
tools/perf/util/disasm.h new file +112 -0
112 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Part of the diff is not shown here. View the raw message.
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v2 3/5] perf annotate: Split out util/disasm.c
Quoted 6 lines · Namhyung Kim
The
util/annotate.ccode has both disassembly and sample annotation related codes. Factor out the disasm part so that it can be handled more easily.No functional changes intended.
Unsure if here, will check and fix later, detected with:
make -C tools/perf build-test'
- Arnaldo
cd . && make BUILD_NONDISTRO=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.8dFJIAFkfV DESTDIR=/tmp/tmp.Wm6UA35mIC
BUILD: Doing 'make -j28' parallel build
HOSTCC /tmp/tmp.8dFJIAFkfV/fixdep.o HOSTLD /tmp/tmp.8dFJIAFkfV/fixdep-in.o LINK /tmp/tmp.8dFJIAFkfV/fixdep
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h
diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
diff -u tools/include/linux/bits.h include/linux/bits.h
diff -u tools/arch/x86/include/asm/disabled-features.h arch/x86/include/asm/disabled-features.h
diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h
diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
diff -u tools/arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/include/uapi/asm/kvm.h
diff -u tools/arch/s390/include/uapi/asm/kvm.h arch/s390/include/uapi/asm/kvm.h
diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h
diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h
diff -u tools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.h arch/x86/include/asm/irq_vectors.h
diff -u tools/perf/trace/beauty/include/uapi/linux/fs.h include/uapi/linux/fs.h
diff -u tools/perf/trace/beauty/include/uapi/linux/vhost.h include/uapi/linux/vhost.h
diff -u tools/perf/trace/beauty/include/uapi/sound/asound.h include/uapi/sound/asound.h
Makefile.config:1147: No openjdk development package found, please install JDK package, e.g. openjdk-8-jdk, java-1.8.0-openjdk-devel
GEN /tmp/tmp.8dFJIAFkfV/common-cmds.h
CC /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v0.o
CC /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v2.o
CC /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-show-cycles.o
LINK /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v0.so
LINK /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v2.so
GEN /tmp/tmp.8dFJIAFkfV/arch/arm64/include/generated/asm/sysreg-defs.h
LINK /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-show-cycles.so
PERF_VERSION = 6.8.g4619ca4cfefa
GEN perf-iostat
GEN perf-archive
INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/help.h
INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/pager.h
INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/exec-cmd.h
INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/run-command.h
INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/parse-options.h
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/exec-cmd.o
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/help.o
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/pager.o
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/parse-options.o
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/run-command.o
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/sigchain.o
CC /tmp/tmp.8dFJIAFkfV/libsubcmd/subcmd-config.o
INSTALL libsubcmd_headers
MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf
MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/
MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/hashmap.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_internal.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/relo_core.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/bpf_perf.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/core.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/cpumap.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/threadmap.h
INSTALL /tmp/tmp.8dFJIAFkfV/libsymbol/include/symbol/kallsyms.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/evlist.h
INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/cpu.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/evsel.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/event.h
INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/debug.h
CC /tmp/tmp.8dFJIAFkfV/libperf/core.o
CC /tmp/tmp.8dFJIAFkfV/libsymbol/kallsyms.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/mmap.h
CC /tmp/tmp.8dFJIAFkfV/libperf/cpumap.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/cpumap.h
INSTALL libsymbol_headers
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/evlist.h
CC /tmp/tmp.8dFJIAFkfV/libperf/threadmap.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/evsel.h
INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/io.h
CC /tmp/tmp.8dFJIAFkfV/libapi/cpu.o
MKDIR /tmp/tmp.8dFJIAFkfV/libapi/fd/
INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/fd/array.h
MKDIR /tmp/tmp.8dFJIAFkfV/libapi/fs/
CC /tmp/tmp.8dFJIAFkfV/libapi/debug.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/lib.h
CC /tmp/tmp.8dFJIAFkfV/libapi/fd/array.o
INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/fs/fs.h
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/mmap.h
CC /tmp/tmp.8dFJIAFkfV/libapi/fs/fs.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/rc_check.h
MKDIR /tmp/tmp.8dFJIAFkfV/libapi/fs/
GEN /tmp/tmp.8dFJIAFkfV/libbpf/bpf_helper_defs.h
INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/fs/tracing_path.h
CC /tmp/tmp.8dFJIAFkfV/libapi/fs/cgroup.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/threadmap.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf.h
CC /tmp/tmp.8dFJIAFkfV/libapi/fs/tracing_path.o
INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/xyarray.h
CC /tmp/tmp.8dFJIAFkfV/libperf/evsel.o
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/btf.h
CC /tmp/tmp.8dFJIAFkfV/libperf/evlist.o
INSTALL libapi_headers
CC /tmp/tmp.8dFJIAFkfV/libapi/str_error_r.o
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf_common.h
CC /tmp/tmp.8dFJIAFkfV/libperf/mmap.o
CC /tmp/tmp.8dFJIAFkfV/libperf/zalloc.o
GEN /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/bpf_helper_defs.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf_legacy.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf.h
CC /tmp/tmp.8dFJIAFkfV/libperf/xyarray.o
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/btf.h
INSTALL libperf_headers
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_common.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_legacy.h
CC /tmp/tmp.8dFJIAFkfV/libperf/lib.o
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_helpers.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_helpers.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_tracing.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_tracing.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_endian.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_endian.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_core_read.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_core_read.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/skel_internal.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/skel_internal.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf_version.h
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/usdt.bpf.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_version.h
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/usdt.bpf.h
LD /tmp/tmp.8dFJIAFkfV/libapi/fd/libapi-in.o
INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_helper_defs.h
MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/
MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/
INSTALL libbpf_headers
MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/
MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/
MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/
LD /tmp/tmp.8dFJIAFkfV/libsymbol/libsymbol-in.o
MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/bpf.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/netlink.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/nlattr.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/btf.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf_errno.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/str_error.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/bpf_prog_linfo.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf_probes.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/hashmap.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/btf_dump.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ringbuf.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/strset.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/linker.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/gen_loader.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/relo_core.o
AR /tmp/tmp.8dFJIAFkfV/libsymbol/libsymbol.a
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/usdt.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/zip.o
MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf.o
MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/bpf.o
LD /tmp/tmp.8dFJIAFkfV/libapi/fs/libapi-in.o
LD /tmp/tmp.8dFJIAFkfV/libapi/libapi-in.o
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/elf.o
INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_helper_defs.h
INSTALL libbpf_headers
CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/features.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/nlattr.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/btf.o
AR /tmp/tmp.8dFJIAFkfV/libapi/libapi.a
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf_errno.o
LD /tmp/tmp.8dFJIAFkfV/libperf/libperf-in.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/str_error.o
AR /tmp/tmp.8dFJIAFkfV/libperf/libperf.a
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/netlink.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/bpf_prog_linfo.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf_probes.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/hashmap.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/btf_dump.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/ringbuf.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/strset.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/linker.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/gen_loader.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/relo_core.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/usdt.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/zip.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/elf.o
LD /tmp/tmp.8dFJIAFkfV/libsubcmd/libsubcmd-in.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/features.o
AR /tmp/tmp.8dFJIAFkfV/libsubcmd/libsubcmd.a
GEN /tmp/tmp.8dFJIAFkfV/python/perf.cpython-312-x86_64-linux-gnu.so
LD /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf-in.o
LD /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf-in.o
LINK /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/libbpf.a
LINK /tmp/tmp.8dFJIAFkfV/libbpf/libbpf.a
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/main.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/common.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/json_writer.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/gen.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/btf.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/xlated_dumper.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/btf_dumper.o
CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/disasm.o
LINK /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/bpftool
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bpf_prog_profiler.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bperf_leader.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bperf_follower.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bperf_cgroup.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/func_latency.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/off_cpu.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/lock_contention.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/kwork_trace.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/sample_filter.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/kwork_top.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bench_uprobe.bpf.o
CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/augmented_raw_syscalls.bpf.o
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bperf_leader.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bench_uprobe.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bperf_follower.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/sample_filter.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/augmented_raw_syscalls.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bpf_prog_profiler.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/func_latency.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bperf_cgroup.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/off_cpu.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/kwork_trace.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/kwork_top.skel.h
GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/lock_contention.skel.h
CC /tmp/tmp.8dFJIAFkfV/builtin-bench.o
CC /tmp/tmp.8dFJIAFkfV/builtin-annotate.o
CC /tmp/tmp.8dFJIAFkfV/builtin-config.o
CC /tmp/tmp.8dFJIAFkfV/builtin-diff.o
CC /tmp/tmp.8dFJIAFkfV/builtin-evlist.o
CC /tmp/tmp.8dFJIAFkfV/builtin-ftrace.o
CC /tmp/tmp.8dFJIAFkfV/builtin-help.o
CC /tmp/tmp.8dFJIAFkfV/builtin-buildid-list.o
CC /tmp/tmp.8dFJIAFkfV/builtin-buildid-cache.o
CC /tmp/tmp.8dFJIAFkfV/builtin-kallsyms.o
CC /tmp/tmp.8dFJIAFkfV/builtin-list.o
CC /tmp/tmp.8dFJIAFkfV/builtin-record.o
MKDIR /tmp/tmp.8dFJIAFkfV/pmu-events/
CC /tmp/tmp.8dFJIAFkfV/builtin-report.o
CC /tmp/tmp.8dFJIAFkfV/builtin-stat.o
CC /tmp/tmp.8dFJIAFkfV/builtin-top.o
CC /tmp/tmp.8dFJIAFkfV/builtin-script.o
TEST /tmp/tmp.8dFJIAFkfV/pmu-events/metric_test.log
CC /tmp/tmp.8dFJIAFkfV/builtin-kvm.o
CC /tmp/tmp.8dFJIAFkfV/builtin-inject.o
CC /tmp/tmp.8dFJIAFkfV/builtin-mem.o
CC /tmp/tmp.8dFJIAFkfV/builtin-data.o
CC /tmp/tmp.8dFJIAFkfV/builtin-version.o
CC /tmp/tmp.8dFJIAFkfV/builtin-c2c.o
CC /tmp/tmp.8dFJIAFkfV/builtin-daemon.o
CC /tmp/tmp.8dFJIAFkfV/builtin-kmem.o
CC /tmp/tmp.8dFJIAFkfV/builtin-kwork.o
CC /tmp/tmp.8dFJIAFkfV/builtin-lock.o
GEN /tmp/tmp.8dFJIAFkfV/pmu-events/pmu-events.c
CC /tmp/tmp.8dFJIAFkfV/builtin-sched.o
CC /tmp/tmp.8dFJIAFkfV/builtin-timechart.o
CC /tmp/tmp.8dFJIAFkfV/builtin-trace.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/clone.o
MKDIR /tmp/tmp.8dFJIAFkfV/bench/
CC /tmp/tmp.8dFJIAFkfV/bench/sched-messaging.o
MKDIR /tmp/tmp.8dFJIAFkfV/tests/
MKDIR /tmp/tmp.8dFJIAFkfV/bench/
CC /tmp/tmp.8dFJIAFkfV/tests/builtin-test.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fcntl.o
CC /tmp/tmp.8dFJIAFkfV/bench/sched-pipe.o
CC /tmp/tmp.8dFJIAFkfV/bench/sched-seccomp-notify.o
CC /tmp/tmp.8dFJIAFkfV/bench/syscall.o
MKDIR /tmp/tmp.8dFJIAFkfV/tests/
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/flock.o
CC /tmp/tmp.8dFJIAFkfV/tests/tests-scripts.o
CC /tmp/tmp.8dFJIAFkfV/tests/parse-events.o
CC /tmp/tmp.8dFJIAFkfV/tests/dso-data.o
CC /tmp/tmp.8dFJIAFkfV/tests/attr.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fs_at_flags.o
CC /tmp/tmp.8dFJIAFkfV/bench/mem-functions.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fsmount.o
CC /tmp/tmp.8dFJIAFkfV/tests/vmlinux-kallsyms.o
CC /tmp/tmp.8dFJIAFkfV/tests/openat-syscall.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fspick.o
CC /tmp/tmp.8dFJIAFkfV/bench/futex-hash.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/ioctl.o
CC /tmp/tmp.8dFJIAFkfV/arch/common.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/kcmp.o
CC /tmp/tmp.8dFJIAFkfV/util/arm64-frame-pointer-unwind-support.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/
CC /tmp/tmp.8dFJIAFkfV/util/addr_location.o
CC /tmp/tmp.8dFJIAFkfV/ui/setup.o
MKDIR /tmp/tmp.8dFJIAFkfV/scripts/perl/Perf-Trace-Util/
CC /tmp/tmp.8dFJIAFkfV/scripts/perl/Perf-Trace-Util/Context.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/mount_flags.o
CC /tmp/tmp.8dFJIAFkfV/ui/helpline.o
MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/util/
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/header.o
MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/util/
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/tsc.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/pmu.o
MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/tests/
CC /tmp/tmp.8dFJIAFkfV/tests/openat-syscall-all-cpus.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/regs_load.o
MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/tests/
CC /tmp/tmp.8dFJIAFkfV/bench/futex-wake.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/dwarf-unwind.o
CC /tmp/tmp.8dFJIAFkfV/bench/futex-wake-parallel.o
CC /tmp/tmp.8dFJIAFkfV/util/annotate.o
CC /tmp/tmp.8dFJIAFkfV/util/block-info.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/move_mount.o
CC /tmp/tmp.8dFJIAFkfV/ui/progress.o
CC /tmp/tmp.8dFJIAFkfV/tests/openat-syscall-tp-fields.o
CC /tmp/tmp.8dFJIAFkfV/ui/util.o
CC /tmp/tmp.8dFJIAFkfV/ui/hist.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/stdio/
CC /tmp/tmp.8dFJIAFkfV/ui/stdio/hist.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/pkey_alloc.o
CC /tmp/tmp.8dFJIAFkfV/tests/mmap-basic.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/arch-tests.o
CC /tmp/tmp.8dFJIAFkfV/builtin-probe.o
CC /tmp/tmp.8dFJIAFkfV/bench/futex-requeue.o
CC /tmp/tmp.8dFJIAFkfV/ui/browser.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/kvm-stat.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/sample-parsing.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/arch_prctl.o
MKDIR /tmp/tmp.8dFJIAFkfV/scripts/python/Perf-Trace-Util/
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/prctl.o
CC /tmp/tmp.8dFJIAFkfV/scripts/python/Perf-Trace-Util/Context.o
CC /tmp/tmp.8dFJIAFkfV/util/block-range.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/perf_regs.o
CC /tmp/tmp.8dFJIAFkfV/perf.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/renameat.o
CC /tmp/tmp.8dFJIAFkfV/util/build-id.o
CC /tmp/tmp.8dFJIAFkfV/tests/perf-record.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/hybrid.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/sockaddr.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/socket.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/intel-pt-test.o
CC /tmp/tmp.8dFJIAFkfV/bench/futex-lock-pi.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/browsers/
CC /tmp/tmp.8dFJIAFkfV/ui/browsers/annotate.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/topdown.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/statx.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/bp-modify.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/sync_file_range.o
CC /tmp/tmp.8dFJIAFkfV/tests/evsel-roundtrip-name.o
CC /tmp/tmp.8dFJIAFkfV/bench/epoll-wait.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/machine.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/browsers/
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/timespec.o
CC /tmp/tmp.8dFJIAFkfV/ui/browsers/hists.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/tui/
CC /tmp/tmp.8dFJIAFkfV/ui/tui/setup.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/event.o
CC /tmp/tmp.8dFJIAFkfV/tests/evsel-tp-sched.o
CC /tmp/tmp.8dFJIAFkfV/bench/epoll-ctl.o
CC /tmp/tmp.8dFJIAFkfV/util/cacheline.o
CC /tmp/tmp.8dFJIAFkfV/ui/browsers/map.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/amd-ibs-via-core-pmu.o
LD /tmp/tmp.8dFJIAFkfV/scripts/python/Perf-Trace-Util/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/evlist.o
CC /tmp/tmp.8dFJIAFkfV/util/config.o
CC /tmp/tmp.8dFJIAFkfV/util/copyfile.o
MKDIR /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/
CC /tmp/tmp.8dFJIAFkfV/util/ctype.o
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/x86_irq_vectors.o
CC /tmp/tmp.8dFJIAFkfV/tests/fdarray.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/mem-events.o
CC /tmp/tmp.8dFJIAFkfV/tests/pmu.o
MKDIR /tmp/tmp.8dFJIAFkfV/ui/tui/
CC /tmp/tmp.8dFJIAFkfV/ui/tui/util.o
CC /tmp/tmp.8dFJIAFkfV/ui/tui/helpline.o
MKDIR /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/
CC /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/x86_msr.o
LD /tmp/tmp.8dFJIAFkfV/arch/x86/tests/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/evsel.o
CC /tmp/tmp.8dFJIAFkfV/ui/browsers/scripts.o
CC /tmp/tmp.8dFJIAFkfV/ui/tui/progress.o
CC /tmp/tmp.8dFJIAFkfV/tests/pmu-events.o
LD /tmp/tmp.8dFJIAFkfV/scripts/perl/Perf-Trace-Util/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/tests/hists_common.o
LD /tmp/tmp.8dFJIAFkfV/scripts/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/tests/hists_link.o
LD /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/iostat.o
LD /tmp/tmp.8dFJIAFkfV/trace/beauty/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/bench/synthesize.o
CC /tmp/tmp.8dFJIAFkfV/ui/browsers/header.o
CC /tmp/tmp.8dFJIAFkfV/ui/browsers/res_sample.o
CC /tmp/tmp.8dFJIAFkfV/util/db-export.o
CC /tmp/tmp.8dFJIAFkfV/tests/hists_filter.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/env.o
CC /tmp/tmp.8dFJIAFkfV/util/disasm.o
CC /tmp/tmp.8dFJIAFkfV/tests/hists_output.o
CC /tmp/tmp.8dFJIAFkfV/bench/kallsyms-parse.o
CC /tmp/tmp.8dFJIAFkfV/util/env.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/dwarf-regs.o
CC /tmp/tmp.8dFJIAFkfV/bench/find-bit-bench.o
CC /tmp/tmp.8dFJIAFkfV/tests/hists_cumulate.o
LD /tmp/tmp.8dFJIAFkfV/ui/tui/perf-in.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/unwind-libunwind.o
CC /tmp/tmp.8dFJIAFkfV/util/event.o
CC /tmp/tmp.8dFJIAFkfV/util/evlist.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/auxtrace.o
CC /tmp/tmp.8dFJIAFkfV/util/sideband_evlist.o
CC /tmp/tmp.8dFJIAFkfV/tests/python-use.o
CC /tmp/tmp.8dFJIAFkfV/util/evsel.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/archinsn.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/intel-pt.o
CC /tmp/tmp.8dFJIAFkfV/bench/inject-buildid.o
CC /tmp/tmp.8dFJIAFkfV/bench/evlist-open-close.o
CC /tmp/tmp.8dFJIAFkfV/tests/bp_signal.o
CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/intel-bts.o
CC /tmp/tmp.8dFJIAFkfV/tests/bp_signal_overflow.o
CC /tmp/tmp.8dFJIAFkfV/bench/breakpoint.o
CC /tmp/tmp.8dFJIAFkfV/tests/bp_account.o
CC /tmp/tmp.8dFJIAFkfV/util/evsel_fprintf.o
CC /tmp/tmp.8dFJIAFkfV/tests/wp.o
CC /tmp/tmp.8dFJIAFkfV/util/perf_event_attr_fprintf.o
CC /tmp/tmp.8dFJIAFkfV/bench/pmu-scan.o
util/disasm.c: In function ‘symbol__disassemble_bpf’:
util/disasm.c:1202:9: error: implicit declaration of function ‘perf_exe’ [-Werror=implicit-function-declaration]
1202 | perf_exe(tpath, sizeof(tpath));
| ^~~~~~~~
util/disasm.c:1222:21: error: implicit declaration of function ‘perf_env__find_bpf_prog_info’ [-Werror=implicit-function-declaration]
1222 | info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~util/disasm.c:1222:19: error: assignment to ‘struct bpf_prog_info_node *’ from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion]
1222 | info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env,
| ^util/disasm.c:1228:32: error: invalid use of undefined type ‘struct bpf_prog_info_node’
1228 | info_linear = info_node->info_linear;
| ^~util/disasm.c:1231:54: error: invalid use of undefined type ‘struct perf_bpil’
1231 | info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
| ^~util/disasm.c:1232:41: error: invalid use of undefined type ‘struct perf_bpil’
1232 | info.buffer_length = info_linear->info.jited_prog_len;
| ^~util/disasm.c:1234:24: error: invalid use of undefined type ‘struct perf_bpil’
1234 | if (info_linear->info.nr_line_info)
| ^~util/disasm.c:1235:62: error: invalid use of undefined type ‘struct perf_bpil’
1235 | prog_linfo = bpf_prog_linfo__new(&info_linear->info);
| ^~util/disasm.c:1237:24: error: invalid use of undefined type ‘struct perf_bpil’
1237 | if (info_linear->info.btf_id) {
| ^~util/disasm.c:1240:24: error: implicit declaration of function ‘perf_env__find_btf’ [-Werror=implicit-function-declaration]
1240 | node = perf_env__find_btf(dso->bpf_prog.env,
| ^~~~~~~~~~~~~~~~~~
util/disasm.c:1241:54: error: invalid use of undefined type ‘struct perf_bpil’
1241 | info_linear->info.btf_id);
| ^~util/disasm.c:1243:53: error: invalid use of undefined type ‘struct btf_node’
1243 | btf = btf__new((__u8 *)(node->data),
| ^~util/disasm.c:1244:44: error: invalid use of undefined type ‘struct btf_node’
1244 | node->data_size);
| ^~util/disasm.c:1268:60: error: invalid use of undefined type ‘struct perf_bpil’
1268 | addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
| ^~
cc1: all warnings being treated as errors
make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:106: /tmp/tmp.8dFJIAFkfV/util/disasm.o] Error 1
CC /tmp/tmp.8dFJIAFkfV/tests/task-exit.o
make[6]: *** Waiting for unfinished jobs....
CC /tmp/tmp.8dFJIAFkfV/tests/sw-clock.o CC /tmp/tmp.8dFJIAFkfV/tests/mmap-thread-lookup.o CC /tmp/tmp.8dFJIAFkfV/bench/uprobe.o CC /tmp/tmp.8dFJIAFkfV/bench/mem-memcpy-x86-64-asm.o CC /tmp/tmp.8dFJIAFkfV/tests/thread-maps-share.o CC /tmp/tmp.8dFJIAFkfV/bench/mem-memset-x86-64-asm.o CC /tmp/tmp.8dFJIAFkfV/tests/switch-tracking.o
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v2 3/5] perf annotate: Split out util/disasm.c
Quoted 11 lines · Arnaldo Carvalho de Melo
Quoted 6 lines · Namhyung Kim
The
util/annotate.ccode has both disassembly and sample annotation related codes. Factor out the disasm part so that it can be handled more easily.No functional changes intended.
Unsure if here, will check and fix later, detected with:
make -C
tools/perfbuild-test'
did it, added the missing env.h header to disasm.c
Quoted 474 lines
- Arnaldo
cd . && make BUILD_NONDISTRO=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.8dFJIAFkfV DESTDIR=/tmp/tmp.Wm6UA35mIC
BUILD: Doing 'make -j28' parallel buildHOSTCC /tmp/tmp.8dFJIAFkfV/fixdep.o HOSTLD /tmp/tmp.8dFJIAFkfV/fixdep-in.o LINK /tmp/tmp.8dFJIAFkfV/fixdepWarning: Kernel ABI header differences:
diff -utools/include/uapi/drm/i915_drm.hinclude/uapi/drm/i915_drm.h
diff -utools/include/uapi/linux/kvm.hinclude/uapi/linux/kvm.h
diff -utools/include/linux/bits.hinclude/linux/bits.h
diff -utools/arch/x86/include/asm/disabled-features.harch/x86/include/asm/disabled-features.h
diff -utools/arch/x86/include/asm/cpufeatures.harch/x86/include/asm/cpufeatures.h
diff -utools/arch/x86/include/asm/msr-index.harch/x86/include/asm/msr-index.h
diff -utools/arch/x86/include/uapi/asm/kvm.harch/x86/include/uapi/asm/kvm.h
diff -utools/arch/powerpc/include/uapi/asm/kvm.harch/powerpc/include/uapi/asm/kvm.h
diff -utools/arch/s390/include/uapi/asm/kvm.harch/s390/include/uapi/asm/kvm.h
diff -utools/arch/arm64/include/uapi/asm/kvm.harch/arm64/include/uapi/asm/kvm.h
diff -utools/arch/arm64/include/asm/cputype.harch/arm64/include/asm/cputype.h
diff -utools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.harch/x86/include/asm/irq_vectors.h
diff -utools/perf/trace/beauty/include/uapi/linux/fs.hinclude/uapi/linux/fs.h
diff -utools/perf/trace/beauty/include/uapi/linux/vhost.hinclude/uapi/linux/vhost.h
diff -utools/perf/trace/beauty/include/uapi/sound/asound.hinclude/uapi/sound/asound.h
Makefile.config:1147: No openjdk development package found, please install JDK package, e.g. openjdk-8-jdk, java-1.8.0-openjdk-develGEN /tmp/tmp.8dFJIAFkfV/common-cmds.h CC /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v0.o CC /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v2.o CC /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-show-cycles.o LINK /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v0.so LINK /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-test-api-v2.so GEN /tmp/tmp.8dFJIAFkfV/arch/arm64/include/generated/asm/sysreg-defs.h LINK /tmp/tmp.8dFJIAFkfV/dlfilters/dlfilter-show-cycles.so PERF_VERSION = 6.8.g4619ca4cfefa GEN perf-iostat GEN perf-archive INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/help.h INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/pager.h INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/exec-cmd.h INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/run-command.h INSTALL /tmp/tmp.8dFJIAFkfV/libsubcmd/include/subcmd/parse-options.h CC /tmp/tmp.8dFJIAFkfV/libsubcmd/exec-cmd.o CC /tmp/tmp.8dFJIAFkfV/libsubcmd/help.o CC /tmp/tmp.8dFJIAFkfV/libsubcmd/pager.o CC /tmp/tmp.8dFJIAFkfV/libsubcmd/parse-options.o CC /tmp/tmp.8dFJIAFkfV/libsubcmd/run-command.o CC /tmp/tmp.8dFJIAFkfV/libsubcmd/sigchain.o CC /tmp/tmp.8dFJIAFkfV/libsubcmd/subcmd-config.o INSTALL libsubcmd_headers MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/ MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/ INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/hashmap.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_internal.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/relo_core.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/bpf_perf.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/core.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/cpumap.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/threadmap.h INSTALL /tmp/tmp.8dFJIAFkfV/libsymbol/include/symbol/kallsyms.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/evlist.h INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/cpu.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/evsel.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/event.h INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/debug.h CC /tmp/tmp.8dFJIAFkfV/libperf/core.o CC /tmp/tmp.8dFJIAFkfV/libsymbol/kallsyms.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/perf/mmap.h CC /tmp/tmp.8dFJIAFkfV/libperf/cpumap.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/cpumap.h INSTALL libsymbol_headers INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/evlist.h CC /tmp/tmp.8dFJIAFkfV/libperf/threadmap.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/evsel.h INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/io.h CC /tmp/tmp.8dFJIAFkfV/libapi/cpu.o MKDIR /tmp/tmp.8dFJIAFkfV/libapi/fd/ INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/fd/array.h MKDIR /tmp/tmp.8dFJIAFkfV/libapi/fs/ CC /tmp/tmp.8dFJIAFkfV/libapi/debug.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/lib.h CC /tmp/tmp.8dFJIAFkfV/libapi/fd/array.o INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/fs/fs.h INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/mmap.h CC /tmp/tmp.8dFJIAFkfV/libapi/fs/fs.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/rc_check.h MKDIR /tmp/tmp.8dFJIAFkfV/libapi/fs/ GEN /tmp/tmp.8dFJIAFkfV/libbpf/bpf_helper_defs.h INSTALL /tmp/tmp.8dFJIAFkfV/libapi/include/api/fs/tracing_path.h CC /tmp/tmp.8dFJIAFkfV/libapi/fs/cgroup.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/threadmap.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf.h CC /tmp/tmp.8dFJIAFkfV/libapi/fs/tracing_path.o INSTALL /tmp/tmp.8dFJIAFkfV/libperf/include/internal/xyarray.h CC /tmp/tmp.8dFJIAFkfV/libperf/evsel.o INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/btf.h CC /tmp/tmp.8dFJIAFkfV/libperf/evlist.o INSTALL libapi_headers CC /tmp/tmp.8dFJIAFkfV/libapi/str_error_r.o INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf_common.h CC /tmp/tmp.8dFJIAFkfV/libperf/mmap.o CC /tmp/tmp.8dFJIAFkfV/libperf/zalloc.o GEN /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/bpf_helper_defs.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf_legacy.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf.h CC /tmp/tmp.8dFJIAFkfV/libperf/xyarray.o INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/btf.h INSTALL libperf_headers INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_common.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_legacy.h CC /tmp/tmp.8dFJIAFkfV/libperf/lib.o INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_helpers.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_helpers.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_tracing.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_tracing.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_endian.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_endian.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_core_read.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_core_read.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/skel_internal.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/skel_internal.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/libbpf_version.h INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/usdt.bpf.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/libbpf_version.h INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/usdt.bpf.h LD /tmp/tmp.8dFJIAFkfV/libapi/fd/libapi-in.o INSTALL /tmp/tmp.8dFJIAFkfV/libbpf/include/bpf/bpf_helper_defs.h MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ INSTALL libbpf_headers MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ LD /tmp/tmp.8dFJIAFkfV/libsymbol/libsymbol-in.o MKDIR /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/bpf.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/netlink.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/nlattr.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/btf.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf_errno.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/str_error.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/bpf_prog_linfo.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf_probes.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/hashmap.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/btf_dump.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/ringbuf.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/strset.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/linker.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/gen_loader.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/relo_core.o AR /tmp/tmp.8dFJIAFkfV/libsymbol/libsymbol.a CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/usdt.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/zip.o MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/ CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf.o MKDIR /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/ CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/bpf.o LD /tmp/tmp.8dFJIAFkfV/libapi/fs/libapi-in.o LD /tmp/tmp.8dFJIAFkfV/libapi/libapi-in.o CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/elf.o INSTALL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf/bpf_helper_defs.h INSTALL libbpf_headers CC /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/features.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/nlattr.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/btf.o AR /tmp/tmp.8dFJIAFkfV/libapi/libapi.a CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf_errno.o LD /tmp/tmp.8dFJIAFkfV/libperf/libperf-in.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/str_error.o AR /tmp/tmp.8dFJIAFkfV/libperf/libperf.a CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/netlink.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/bpf_prog_linfo.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf_probes.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/hashmap.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/btf_dump.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/ringbuf.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/strset.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/linker.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/gen_loader.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/relo_core.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/usdt.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/zip.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/elf.o LD /tmp/tmp.8dFJIAFkfV/libsubcmd/libsubcmd-in.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/features.o AR /tmp/tmp.8dFJIAFkfV/libsubcmd/libsubcmd.a GEN /tmp/tmp.8dFJIAFkfV/python/perf.cpython-312-x86_64-linux-gnu.so LD /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/staticobjs/libbpf-in.o LD /tmp/tmp.8dFJIAFkfV/libbpf/staticobjs/libbpf-in.o LINK /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/libbpf/libbpf.a LINK /tmp/tmp.8dFJIAFkfV/libbpf/libbpf.a CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/main.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/common.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/json_writer.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/gen.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/btf.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/xlated_dumper.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/btf_dumper.o CC /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/disasm.o LINK /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bootstrap/bpftool CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bpf_prog_profiler.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bperf_leader.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bperf_follower.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bperf_cgroup.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/func_latency.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/off_cpu.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/lock_contention.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/kwork_trace.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/sample_filter.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/kwork_top.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/bench_uprobe.bpf.o CLANG /tmp/tmp.8dFJIAFkfV/util/bpf_skel/.tmp/augmented_raw_syscalls.bpf.o GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bperf_leader.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bench_uprobe.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bperf_follower.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/sample_filter.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/augmented_raw_syscalls.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bpf_prog_profiler.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/func_latency.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/bperf_cgroup.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/off_cpu.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/kwork_trace.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/kwork_top.skel.h GENSKEL /tmp/tmp.8dFJIAFkfV/util/bpf_skel/lock_contention.skel.h CC /tmp/tmp.8dFJIAFkfV/builtin-bench.o CC /tmp/tmp.8dFJIAFkfV/builtin-annotate.o CC /tmp/tmp.8dFJIAFkfV/builtin-config.o CC /tmp/tmp.8dFJIAFkfV/builtin-diff.o CC /tmp/tmp.8dFJIAFkfV/builtin-evlist.o CC /tmp/tmp.8dFJIAFkfV/builtin-ftrace.o CC /tmp/tmp.8dFJIAFkfV/builtin-help.o CC /tmp/tmp.8dFJIAFkfV/builtin-buildid-list.o CC /tmp/tmp.8dFJIAFkfV/builtin-buildid-cache.o CC /tmp/tmp.8dFJIAFkfV/builtin-kallsyms.o CC /tmp/tmp.8dFJIAFkfV/builtin-list.o CC /tmp/tmp.8dFJIAFkfV/builtin-record.o MKDIR /tmp/tmp.8dFJIAFkfV/pmu-events/ CC /tmp/tmp.8dFJIAFkfV/builtin-report.o CC /tmp/tmp.8dFJIAFkfV/builtin-stat.o CC /tmp/tmp.8dFJIAFkfV/builtin-top.o CC /tmp/tmp.8dFJIAFkfV/builtin-script.o TEST /tmp/tmp.8dFJIAFkfV/pmu-events/metric_test.log CC /tmp/tmp.8dFJIAFkfV/builtin-kvm.o CC /tmp/tmp.8dFJIAFkfV/builtin-inject.o CC /tmp/tmp.8dFJIAFkfV/builtin-mem.o CC /tmp/tmp.8dFJIAFkfV/builtin-data.o CC /tmp/tmp.8dFJIAFkfV/builtin-version.o CC /tmp/tmp.8dFJIAFkfV/builtin-c2c.o CC /tmp/tmp.8dFJIAFkfV/builtin-daemon.o CC /tmp/tmp.8dFJIAFkfV/builtin-kmem.o CC /tmp/tmp.8dFJIAFkfV/builtin-kwork.o CC /tmp/tmp.8dFJIAFkfV/builtin-lock.o GEN /tmp/tmp.8dFJIAFkfV/pmu-events/pmu-events.c CC /tmp/tmp.8dFJIAFkfV/builtin-sched.o CC /tmp/tmp.8dFJIAFkfV/builtin-timechart.o CC /tmp/tmp.8dFJIAFkfV/builtin-trace.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/clone.o MKDIR /tmp/tmp.8dFJIAFkfV/bench/ CC /tmp/tmp.8dFJIAFkfV/bench/sched-messaging.o MKDIR /tmp/tmp.8dFJIAFkfV/tests/ MKDIR /tmp/tmp.8dFJIAFkfV/bench/ CC /tmp/tmp.8dFJIAFkfV/tests/builtin-test.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fcntl.o CC /tmp/tmp.8dFJIAFkfV/bench/sched-pipe.o CC /tmp/tmp.8dFJIAFkfV/bench/sched-seccomp-notify.o CC /tmp/tmp.8dFJIAFkfV/bench/syscall.o MKDIR /tmp/tmp.8dFJIAFkfV/tests/ CC /tmp/tmp.8dFJIAFkfV/trace/beauty/flock.o CC /tmp/tmp.8dFJIAFkfV/tests/tests-scripts.o CC /tmp/tmp.8dFJIAFkfV/tests/parse-events.o CC /tmp/tmp.8dFJIAFkfV/tests/dso-data.o CC /tmp/tmp.8dFJIAFkfV/tests/attr.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fs_at_flags.o CC /tmp/tmp.8dFJIAFkfV/bench/mem-functions.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fsmount.o CC /tmp/tmp.8dFJIAFkfV/tests/vmlinux-kallsyms.o CC /tmp/tmp.8dFJIAFkfV/tests/openat-syscall.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/fspick.o CC /tmp/tmp.8dFJIAFkfV/bench/futex-hash.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/ioctl.o CC /tmp/tmp.8dFJIAFkfV/arch/common.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/kcmp.o CC /tmp/tmp.8dFJIAFkfV/util/arm64-frame-pointer-unwind-support.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/ CC /tmp/tmp.8dFJIAFkfV/util/addr_location.o CC /tmp/tmp.8dFJIAFkfV/ui/setup.o MKDIR /tmp/tmp.8dFJIAFkfV/scripts/perl/Perf-Trace-Util/ CC /tmp/tmp.8dFJIAFkfV/scripts/perl/Perf-Trace-Util/Context.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/ CC /tmp/tmp.8dFJIAFkfV/trace/beauty/mount_flags.o CC /tmp/tmp.8dFJIAFkfV/ui/helpline.o MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/util/ CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/header.o MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/util/ CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/tsc.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/pmu.o MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/tests/ CC /tmp/tmp.8dFJIAFkfV/tests/openat-syscall-all-cpus.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/regs_load.o MKDIR /tmp/tmp.8dFJIAFkfV/arch/x86/tests/ CC /tmp/tmp.8dFJIAFkfV/bench/futex-wake.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/dwarf-unwind.o CC /tmp/tmp.8dFJIAFkfV/bench/futex-wake-parallel.o CC /tmp/tmp.8dFJIAFkfV/util/annotate.o CC /tmp/tmp.8dFJIAFkfV/util/block-info.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/move_mount.o CC /tmp/tmp.8dFJIAFkfV/ui/progress.o CC /tmp/tmp.8dFJIAFkfV/tests/openat-syscall-tp-fields.o CC /tmp/tmp.8dFJIAFkfV/ui/util.o CC /tmp/tmp.8dFJIAFkfV/ui/hist.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/stdio/ CC /tmp/tmp.8dFJIAFkfV/ui/stdio/hist.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/pkey_alloc.o CC /tmp/tmp.8dFJIAFkfV/tests/mmap-basic.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/arch-tests.o CC /tmp/tmp.8dFJIAFkfV/builtin-probe.o CC /tmp/tmp.8dFJIAFkfV/bench/futex-requeue.o CC /tmp/tmp.8dFJIAFkfV/ui/browser.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/kvm-stat.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/sample-parsing.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/arch_prctl.o MKDIR /tmp/tmp.8dFJIAFkfV/scripts/python/Perf-Trace-Util/ CC /tmp/tmp.8dFJIAFkfV/trace/beauty/prctl.o CC /tmp/tmp.8dFJIAFkfV/scripts/python/Perf-Trace-Util/Context.o CC /tmp/tmp.8dFJIAFkfV/util/block-range.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/perf_regs.o CC /tmp/tmp.8dFJIAFkfV/perf.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/renameat.o CC /tmp/tmp.8dFJIAFkfV/util/build-id.o CC /tmp/tmp.8dFJIAFkfV/tests/perf-record.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/hybrid.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/sockaddr.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/socket.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/intel-pt-test.o CC /tmp/tmp.8dFJIAFkfV/bench/futex-lock-pi.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/browsers/ CC /tmp/tmp.8dFJIAFkfV/ui/browsers/annotate.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/topdown.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/statx.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/bp-modify.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/sync_file_range.o CC /tmp/tmp.8dFJIAFkfV/tests/evsel-roundtrip-name.o CC /tmp/tmp.8dFJIAFkfV/bench/epoll-wait.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/machine.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/browsers/ CC /tmp/tmp.8dFJIAFkfV/trace/beauty/timespec.o CC /tmp/tmp.8dFJIAFkfV/ui/browsers/hists.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/tui/ CC /tmp/tmp.8dFJIAFkfV/ui/tui/setup.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/event.o CC /tmp/tmp.8dFJIAFkfV/tests/evsel-tp-sched.o CC /tmp/tmp.8dFJIAFkfV/bench/epoll-ctl.o CC /tmp/tmp.8dFJIAFkfV/util/cacheline.o CC /tmp/tmp.8dFJIAFkfV/ui/browsers/map.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/tests/amd-ibs-via-core-pmu.o LD /tmp/tmp.8dFJIAFkfV/scripts/python/Perf-Trace-Util/perf-in.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/evlist.o CC /tmp/tmp.8dFJIAFkfV/util/config.o CC /tmp/tmp.8dFJIAFkfV/util/copyfile.o MKDIR /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/ CC /tmp/tmp.8dFJIAFkfV/util/ctype.o CC /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/x86_irq_vectors.o CC /tmp/tmp.8dFJIAFkfV/tests/fdarray.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/mem-events.o CC /tmp/tmp.8dFJIAFkfV/tests/pmu.o MKDIR /tmp/tmp.8dFJIAFkfV/ui/tui/ CC /tmp/tmp.8dFJIAFkfV/ui/tui/util.o CC /tmp/tmp.8dFJIAFkfV/ui/tui/helpline.o MKDIR /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/ CC /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/x86_msr.o LD /tmp/tmp.8dFJIAFkfV/arch/x86/tests/perf-in.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/evsel.o CC /tmp/tmp.8dFJIAFkfV/ui/browsers/scripts.o CC /tmp/tmp.8dFJIAFkfV/ui/tui/progress.o CC /tmp/tmp.8dFJIAFkfV/tests/pmu-events.o LD /tmp/tmp.8dFJIAFkfV/scripts/perl/Perf-Trace-Util/perf-in.o CC /tmp/tmp.8dFJIAFkfV/tests/hists_common.o LD /tmp/tmp.8dFJIAFkfV/scripts/perf-in.o CC /tmp/tmp.8dFJIAFkfV/tests/hists_link.o LD /tmp/tmp.8dFJIAFkfV/trace/beauty/tracepoints/perf-in.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/iostat.o LD /tmp/tmp.8dFJIAFkfV/trace/beauty/perf-in.o CC /tmp/tmp.8dFJIAFkfV/bench/synthesize.o CC /tmp/tmp.8dFJIAFkfV/ui/browsers/header.o CC /tmp/tmp.8dFJIAFkfV/ui/browsers/res_sample.o CC /tmp/tmp.8dFJIAFkfV/util/db-export.o CC /tmp/tmp.8dFJIAFkfV/tests/hists_filter.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/env.o CC /tmp/tmp.8dFJIAFkfV/util/disasm.o CC /tmp/tmp.8dFJIAFkfV/tests/hists_output.o CC /tmp/tmp.8dFJIAFkfV/bench/kallsyms-parse.o CC /tmp/tmp.8dFJIAFkfV/util/env.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/dwarf-regs.o CC /tmp/tmp.8dFJIAFkfV/bench/find-bit-bench.o CC /tmp/tmp.8dFJIAFkfV/tests/hists_cumulate.o LD /tmp/tmp.8dFJIAFkfV/ui/tui/perf-in.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/unwind-libunwind.o CC /tmp/tmp.8dFJIAFkfV/util/event.o CC /tmp/tmp.8dFJIAFkfV/util/evlist.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/auxtrace.o CC /tmp/tmp.8dFJIAFkfV/util/sideband_evlist.o CC /tmp/tmp.8dFJIAFkfV/tests/python-use.o CC /tmp/tmp.8dFJIAFkfV/util/evsel.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/archinsn.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/intel-pt.o CC /tmp/tmp.8dFJIAFkfV/bench/inject-buildid.o CC /tmp/tmp.8dFJIAFkfV/bench/evlist-open-close.o CC /tmp/tmp.8dFJIAFkfV/tests/bp_signal.o CC /tmp/tmp.8dFJIAFkfV/arch/x86/util/intel-bts.o CC /tmp/tmp.8dFJIAFkfV/tests/bp_signal_overflow.o CC /tmp/tmp.8dFJIAFkfV/bench/breakpoint.o CC /tmp/tmp.8dFJIAFkfV/tests/bp_account.o CC /tmp/tmp.8dFJIAFkfV/util/evsel_fprintf.o CC /tmp/tmp.8dFJIAFkfV/tests/wp.o CC /tmp/tmp.8dFJIAFkfV/util/perf_event_attr_fprintf.o CC /tmp/tmp.8dFJIAFkfV/bench/pmu-scan.o util/disasm.c: In function ‘symbol__disassemble_bpf’: util/disasm.c:1202:9: error: implicit declaration of function ‘perf_exe’ [-Werror=implicit-function-declaration] 1202 | perf_exe(tpath, sizeof(tpath)); | ^~~~~~~~ util/disasm.c:1222:21: error: implicit declaration of function ‘perf_env__find_bpf_prog_info’ [-Werror=implicit-function-declaration] 1222 | info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/disasm.c:1222:19: error: assignment to ‘structbpf_prog_info_node*’ from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion]
1222 |info_node= perf_env__find_bpf_prog_info(dso->bpf_prog.env,
| ^util/disasm.c:1228:32: error: invalid use of undefined type ‘struct bpf_prog_info_node’
1228 |info_linear=info_node->info_linear;
| ^~util/disasm.c:1231:54: error: invalid use of undefined type ‘struct perf_bpil’
1231 | info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
| ^~util/disasm.c:1232:41: error: invalid use of undefined type ‘struct perf_bpil’
1232 | info.buffer_length =info_linear->info.jited_prog_len;
| ^~util/disasm.c:1234:24: error: invalid use of undefined type ‘struct perf_bpil’
1234 | if (info_linear->info.nr_line_info)
| ^~util/disasm.c:1235:62: error: invalid use of undefined type ‘struct perf_bpil’
1235 |prog_linfo=bpf_prog_linfo__new(&info_linear->info);
| ^~util/disasm.c:1237:24: error: invalid use of undefined type ‘struct perf_bpil’
1237 | if (info_linear->info.btf_id) {
| ^~util/disasm.c:1240:24: error: implicit declaration of function ‘perf_env__find_btf’ [-Werror=implicit-function-declaration]
1240 | node = perf_env__find_btf(dso->bpf_prog.env,| ^~~~~~~~~~~~~~~~~~
util/disasm.c:1241:54: error: invalid use of undefined type ‘struct perf_bpil’
1241 |info_linear->info.btf_id);
| ^~util/disasm.c:1243:53: error: invalid use of undefined type ‘struct btf_node’
1243 | btf = btf__new((__u8 *)(node->data),
| ^~util/disasm.c:1244:44: error: invalid use of undefined type ‘struct btf_node’
1244 |node->data_size);
| ^~util/disasm.c:1268:60: error: invalid use of undefined type ‘struct perf_bpil’
1268 | addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
| ^~
cc1: all warnings being treated as errors
make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:106:/tmp/tmp.8dFJIAFkfV/util/disasm.o] Error 1
CC/tmp/tmp.8dFJIAFkfV/tests/task-exit.o
make[6]: *** Waiting for unfinished jobs....CC /tmp/tmp.8dFJIAFkfV/tests/sw-clock.o CC /tmp/tmp.8dFJIAFkfV/tests/mmap-thread-lookup.o CC /tmp/tmp.8dFJIAFkfV/bench/uprobe.o CC /tmp/tmp.8dFJIAFkfV/bench/mem-memcpy-x86-64-asm.o CC /tmp/tmp.8dFJIAFkfV/tests/thread-maps-share.o CC /tmp/tmp.8dFJIAFkfV/bench/mem-memset-x86-64-asm.o CC /tmp/tmp.8dFJIAFkfV/tests/switch-tracking.o
Namhyung Kim
maintainerRe: [PATCH v2 3/5] perf annotate: Split out util/disasm.c
Quoted 7 lines · Arnaldo Carvalho de Melo
Quoted 5 lines · Arnaldo Carvalho de Melo
Quoted 4 lines · Namhyung Kim
The
util/annotate.ccode has both disassembly and sample annotation related codes. Factor out the disasm part so that it can be handled more easily.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
No functional changes intended.
Unsure if here, will check and fix later, detected with:
make -C
tools/perfbuild-test'did it, added the missing
env.hheader todisasm.c
Thanks a lot!
Namhyung
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v2 3/5] perf annotate: Split out util/disasm.c
Quoted 11 lines · Namhyung Kim
Quoted 10 lines · Arnaldo Carvalho de Melo
Quoted 8 lines · Arnaldo Carvalho de Melo
Quoted 6 lines · Namhyung Kim
The
util/annotate.ccode has both disassembly and sample annotation related codes. Factor out the disasm part so that it can be handled more easily.No functional changes intended.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Unsure if here, will check and fix later, detected with:
make -C
tools/perfbuild-test'did it, added the missing
env.hheader todisasm.cThanks a lot!
Three more, also fixed:
util/disasm.c: In function ‘symbol__disassemble_bpf’:util/disasm.c:1203:9: error: implicit declaration of function ‘perf_exe’ [-Werror=implicit-function-declaration]
1203 | perf_exe(tpath, sizeof(tpath));
| ^~~~~~~~tools/perf/util/disasm.c +1 -0
@@ -21,6 +21,7 @@#include "maps.h" #include "srcline.h" #include "symbol.h" +#include "util.h" static regex_t file_lineno;
util/disasm.c:1229:32: error: invalid use of undefined type ‘struct bpf_prog_info_node’
1229 | info_linear = info_node->info_linear;
| ^~util/disasm.c: In function ‘symbol__disassemble_bpf’:util/disasm.c:1230:32: error: invalid use of undefined type ‘struct bpf_prog_info_node’
1230 | info_linear = info_node->info_linear;
| ^~
tools/perf/util/disasm.c +2 -0
@@ -1170,6 +1170,8 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil#include <linux/btf.h> #include <tools/dis-asm-compat.h> +#include "bpf-event.h" +static int symbol__disassemble_bpf (struct symbol *sym,struct annotate_args *args) {
util/disasm.c: In function ‘symbol__disassemble_bpf’:util/disasm.c:1235:54: error: invalid use of undefined type ‘struct perf_bpil’
1235 | info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
| tools/perf/util/disasm.c +1 -0
@@ -1173,6 +1173,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil#include <tools/dis-asm-compat.h> #include "bpf-event.h" +#include "bpf-utils.h" static int symbol__disassemble_bpf (struct symbol *sym,struct annotate_args *args)
Namhyung Kim
maintainerPATCH v2 4/5 perf annotate: Use libcapstone to disassemble
In reply to Namhyung KimNow it can use the capstone library to disassemble the instructions. Let's use that (if available) for perf annotate to speed up. Currently it only supports x86 architecture. With this change I can see ~3x speed up in data type profiling.
But note that capstone cannot give the source file and line number info. For now, users should use the external objdump for that by specifying the --objdump option explicitly.
--- tools/perf/util/disasm.c | 160 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+)
tools/perf/util/disasm.c +160 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only #include <ctype.h> #include <errno.h> +#include <fcntl.h> #include <inttypes.h> #include <libgen.h> #include <regex.h>
@@ -18,6 +19,7 @@#include "evsel.h" #include "map.h" #include "maps.h" +#include "namespaces.h" #include "srcline.h" #include "symbol.h"
@@ -1341,6 +1343,158 @@ symbol__disassemble_bpf_image(struct symbol *sym,return 0 ; } +#ifdef HAVE_LIBCAPSTONE_SUPPORT +#include <capstone/capstone.h> + +static int open_capstone_handle (struct annotate_args *args,bool is_64bit, +csh *handle) +{ +struct annotation_options *opt = args->options; +cs_mode mode = is_64bit ?CS_MODE_64 :CS_MODE_32 ; + +/* TODO: support more architectures */ +if (!arch__is (args->arch,"x86" )) +return -1 ; + +if (cs_open (CS_ARCH_X86 , mode, handle) !=CS_ERR_OK ) +return -1 ; + +if (!opt->disassembler_style || + !strcmp (opt->disassembler_style,"att" )) +cs_option (*handle,CS_OPT_SYNTAX ,CS_OPT_SYNTAX_ATT ); + +return 0 ; +} + +struct find_file_offset_data { +u64 ip; +u64 offset; +}; + +/* This will be called for each PHDR in an ELF binary */ +static int find_file_offset (u64 start,u64 len,u64 pgoff,void *arg) +{ +struct find_file_offset_data *data = arg; + +if (start <= data->ip && data->ip < start + len) { + data->offset = pgoff + data->ip - start; +return 1 ; + } +return 0 ; +} + +static int symbol__disassemble_capstone (char *filename,struct symbol *sym, +struct annotate_args *args) +{ +struct annotation *notes =symbol__annotation (sym); +struct map *map = args->ms.map; +struct dso *dso =map__dso (map); +struct nscookie nsc; +u64 start =map__rip_2objdump (map, sym->start); +u64 end =map__rip_2objdump (map, sym->end); +u64 len = end - start; +u64 offset; +int i, fd, count; +bool is_64bit = false; +bool needs_cs_close = false; +u8 *buf =NULL ; +struct find_file_offset_data data = { + .ip = start, + }; +csh handle; +cs_insn *insn; +char disasm_buf[512 ]; +struct disasm_line *dl; + +if (args->options->objdump_path) +return -1 ; + +nsinfo__mountns_enter (dso->nsinfo, &nsc); + fd =open (filename,O_RDONLY ); +nsinfo__mountns_exit (&nsc); +if (fd <0 ) +return -1 ; + +if (file__read_maps (fd,/*exe=*/ true, find_file_offset, &data, + &is_64bit) ==0 ) + goto err; + +if (open_capstone_handle (args, is_64bit, &handle) <0 ) + goto err; + + needs_cs_close = true; + + buf =malloc (len); +if (buf ==NULL ) + goto err; + + count =pread (fd, buf, len, data.offset); +close (fd); + fd =-1 ; + +if ((u64 )count != len) + goto err; + +/* add the function address and name */ +scnprintf (disasm_buf,sizeof (disasm_buf),"%#" PRIx64" <%s>:" , + start, sym->name); + + args->offset =-1 ; + args->line = disasm_buf; + args->line_nr =0 ; + args->fileloc =NULL ; + args->ms.sym = sym; + + dl =disasm_line__new (args); +if (dl ==NULL ) + goto err; + +annotation_line__add (&dl->al, ¬es->src->source); + + count =cs_disasm (handle, buf, len, start, len, &insn); +for (i =0 , offset =0 ; i < count; i++) { +scnprintf (disasm_buf,sizeof (disasm_buf), +" %-7s %s" , + insn[i].mnemonic, insn[i].op_str); + + args->offset = offset; + args->line = disasm_buf; + + dl =disasm_line__new (args); +if (dl ==NULL ) + goto err; + +annotation_line__add (&dl->al, ¬es->src->source); + + offset += insn[i].size; + } + +out: +if (needs_cs_close) +cs_close (&handle); +free (buf); +return count <0 ? count :0 ; + +err: +if (fd >=0 ) +close (fd); +if (needs_cs_close) { +struct disasm_line *tmp; + +/* +* It probably failed in the middle of the above loop. +* Release any resources it might add. +*/ +list_for_each_entry_safe (dl, tmp, ¬es->src->source, al.node) { +list_del (&dl->al.node); +free (dl); + } + } + count =-1 ; + goto out; +} +#endif +/* * Possibly create a new version of line with tabs expanded. Returns the * existing or new line, storage is updated if a new line is allocated. If
@@ -1463,6 +1617,12 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args)strcpy (symfs_filename, tmp); } +#ifdef HAVE_LIBCAPSTONE_SUPPORT + err =symbol__disassemble_capstone (symfs_filename, sym, args); +if (err ==0 ) + goto out_remove_tmp; +#endif + err =asprintf (&command,"%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH v2 5/5 perf annotate: Add symbol name when using capstone
In reply to Namhyung KimThis is to keep the existing behavior with objdump. It needs to show symbol information of global variables like below:
Percent | Source code & Disassembly of elf for cycles:P (1 samples, percent: local period)
------------------------------------------------------------------------------------------------
: 0 0xffffffff81338f70 <vm_normal_page>:
0.00 : ffffffff81338f70: endbr64
0.00 : ffffffff81338f74: callq 0xffffffff81083a40
0.00 : ffffffff81338f79: movq %rdi, %r8
0.00 : ffffffff81338f7c: movq %rdx, %rdi
0.00 : ffffffff81338f7f: callq *0x17021c3(%rip) # ffffffff82a3b148 <pv_ops+0x1e8>
0.00 : ffffffff81338f85: movq 0xffbf3c(%rip), %rdx # ffffffff82334ec8 <physical_mask>
0.00 : ffffffff81338f8c: testq %rax, %rax ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.00 : ffffffff81338f8f: je 0xffffffff81338fd0 here
0.00 : ffffffff81338f91: movq %rax, %rcx
0.00 : ffffffff81338f94: andl $1, %ecx--- tools/perf/util/disasm.c | 74 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 3 deletions(-)
tools/perf/util/disasm.c +71 -3
@@ -1363,6 +1363,12 @@ static int open_capstone_handle(struct annotate_args *args, bool is_64bit, !strcmp(opt->disassembler_style, "att"))cs_option (*handle,CS_OPT_SYNTAX ,CS_OPT_SYNTAX_ATT ); +/* +* Resolving address operands to symbols is implemented +* on x86 by investigating instruction details. +*/ +cs_option (*handle,CS_OPT_DETAIL ,CS_OPT_ON ); +return 0 ; }
@@ -1383,6 +1389,63 @@ static int find_file_offset(u64 start, u64 len, u64 pgoff, void *arg)return 0 ; } +static void print_capstone_detail (cs_insn *insn,char *buf,size_t len, +struct annotate_args *args,u64 addr) +{ +int i; +struct map *map = args->ms.map; +struct symbol *sym; + +/* TODO: support more architectures */ +if (!arch__is (args->arch,"x86" )) +return ; + +if (insn->detail ==NULL ) +return ; + +for (i =0 ; i < insn->detail->x86.op_count; i++) { +cs_x86_op *op = &insn->detail->x86.operands[i]; +u64 orig_addr; + +if (op->type !=X86_OP_MEM ) +continue ; + +/* only print RIP-based global symbols for now */ +if (op->mem.base !=X86_REG_RIP ) +continue ; + +/* get the target address */ + orig_addr = addr + insn->size + op->mem.disp; + addr =map__objdump_2mem (map, orig_addr); + +if (map__dso (map)->kernel) { +/* +* The kernel maps can be splitted into sections, +* let's find the map first and the search the symbol. +*/ + map =maps__find (map__kmaps (map), addr); +if (map ==NULL ) +continue ; + } + +/* convert it to map-relative address for search */ + addr =map__map_ip (map, addr); + + sym =map__find_symbol (map, addr); +if (sym ==NULL ) +continue ; + +if (addr == sym->start) { +scnprintf (buf, len,"\t# %" PRIx64" <%s>" , + orig_addr, sym->name); + }else { +scnprintf (buf, len,"\t# %" PRIx64" <%s+%#" PRIx64">" , + orig_addr, sym->name, addr - sym->start); + } +break ; + } +} +static int symbol__disassemble_capstone (char *filename,struct symbol *sym,struct annotate_args *args) {
@@ -1453,9 +1516,14 @@ static int symbol__disassemble_capstone(char *filename, struct symbol *sym, count =cs_disasm (handle, buf, len, start, len, &insn);for (i =0 , offset =0 ; i < count; i++) { -scnprintf (disasm_buf,sizeof (disasm_buf), -" %-7s %s" , - insn[i].mnemonic, insn[i].op_str); +int printed; + + printed =scnprintf (disasm_buf,sizeof (disasm_buf), +" %-7s %s" , + insn[i].mnemonic, insn[i].op_str); +print_capstone_detail (&insn[i], disasm_buf + printed, +sizeof (disasm_buf) - printed, args, + start + offset); args->offset = offset; args->line = disasm_buf;
Signature · 1 line
2.44.0.478.gd926399ef9-goog