Libdw/dwarf build clean up
Subsystems (4)
Ian Rogers
reviewerv2 cover Libdw/dwarf build clean up
There patches are on top of:
https://lore.kernel.org/lkml/[email protected]/
where it was pointed out that a lot of the libdw conditional compilation was due to features that have now been standard for 10 or 15 years. The patches remove the conditional compilation assuming the features are in libdw where the feature test is expanded to check there pressence.
In the Makefile code, and for perf record --call-graph, dwarf tends to mean unwind or libdw support for dwarf things. To make it clearer when dwarf really just means libdw numerous build variables and defines are renamed. PERF_HAVE_DWARF_REGS was particularly tricky and has been removed as it isn't necessary as was somewhat inversely guarding libdw support. The Makefile variable indicated an architecture having a dwarf-regs.c file. This file contained code for BPF prologues, which were removed with BPF event support. The files also often just contained a redundant get_arch_regstr function. The function was redundant as get_dwarf_regstr would do the appropriate thing if the ELF machine were given. To remove get_arch_regstr the ELF machine is computed for the host machine. This now makes the logic work across platforms, but the testing I was able to do across platforms was minimal.
There is some tech debt in the changes as perf check still reports the values using the old name and for features that are no longer tested. This can be cleanup for another day.
v2: Instead of renaming PERF_HAVE_DWARF_REGS to PERF_HAVE_LIBDW_REGS,
remove it.
Ian Rogers (31):
perf build: Fix !HAVE_DWARF_GETLOCATIONS_SUPPORT
perf build: Rename NO_DWARF to NO_LIBDW
perf build: Remove defined but never used variable
perf build: Rename test-dwarf to test-libdw
perf build: Combine libdw-dwarf-unwind into libdw feature tests perf build: Combine test-dwarf-getlocations into test-libdw perf build: Combine test-dwarf-getcfi into test-libdw
perf probe: Move elfutils support check to libdw check perf libdw: Remove unnecessary defines
perf build: Rename HAVE_DWARF_SUPPORT to HAVE_LIBDW_SUPPORT perf build: Rename CONFIG_DWARF to CONFIG_LIBDW
perf bpf-prologue: Remove unused file
perf dwarf-regs: Remove PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET perf dwarf-regs: Add EM_HOST and EF_HOST defines
perf disasm: Add e_machine/e_flags to struct arch
perf dwarf-regs: Pass accurate disassembly machine to get_dwarf_regnum perf dwarf-regs: Pass ELF flags to get_dwarf_regstr
perf dwarf-regs: Move x86 dwarf-regs out of arch
perf arm64: Remove dwarf-regs.c
perf arm: Remove dwarf-regs.c
perf dwarf-regs: Move csky dwarf-regs out of arch
perf loongarch: Remove dwarf-regs.c
perf mips: Remove dwarf-regs.c
perf dwarf-regs: Move powerpc dwarf-regs out of arch
perf riscv: Remove dwarf-regs.c and add dwarf-regs-table.h perf s390: Remove dwarf-regs.c
perf sh: Remove dwarf-regs.c
perf sparc: Remove dwarf-regs.c
perf xtensa: Remove dwarf-regs.c
perf dwarf-regs: Remove get_arch_regstr code
perf build: Remove PERF_HAVE_DWARF_REGS
tools/build/Makefile.feature | 11 +-
tools/build/feature/Makefile | 24 +--
tools/build/feature/test-all.c | 16 +-
tools/build/feature/test-dwarf.c | 11 --
tools/build/feature/test-dwarf_getcfi.c | 9 --
tools/build/feature/test-dwarf_getlocations.c | 13 --
tools/build/feature/test-libdw-dwarf-unwind.c | 14 --
tools/build/feature/test-libdw.c | 56 +++++++
tools/perf/Documentation/perf-check.txt | 6 +-
tools/perf/Makefile.config | 58 ++-----
tools/perf/Makefile.perf | 2 +-
tools/perf/arch/arc/annotate/instructions.c | 2 +
tools/perf/arch/arm/Makefile | 3 -
tools/perf/arch/arm/annotate/instructions.c | 2 +
tools/perf/arch/arm/util/Build | 2 -
tools/perf/arch/arm/util/dwarf-regs.c | 61 -------
tools/perf/arch/arm64/Makefile | 4 -
tools/perf/arch/arm64/annotate/instructions.c | 2 +
tools/perf/arch/arm64/util/Build | 1 -
tools/perf/arch/arm64/util/dwarf-regs.c | 92 -----------
tools/perf/arch/csky/Makefile | 4 -
tools/perf/arch/csky/annotate/instructions.c | 7 +-
tools/perf/arch/csky/util/Build | 1 -
tools/perf/arch/loongarch/Makefile | 4 -
.../arch/loongarch/annotate/instructions.c | 2 +
tools/perf/arch/loongarch/util/Build | 1 -
tools/perf/arch/loongarch/util/dwarf-regs.c | 44 -----
tools/perf/arch/mips/Makefile | 4 -
tools/perf/arch/mips/annotate/instructions.c | 2 +
tools/perf/arch/mips/util/Build | 1 -
tools/perf/arch/mips/util/dwarf-regs.c | 38 -----
tools/perf/arch/powerpc/Makefile | 5 -
.../perf/arch/powerpc/annotate/instructions.c | 6 +-
tools/perf/arch/powerpc/util/Build | 3 +-
tools/perf/arch/powerpc/util/dwarf-regs.c | 153 ------------------
tools/perf/arch/riscv/Makefile | 5 +-
.../arch/riscv/include/dwarf-regs-table.h | 42 +++++
tools/perf/arch/riscv/util/Build | 1 -
tools/perf/arch/riscv/util/dwarf-regs.c | 72 ---------
.../perf/arch/riscv64/annotate/instructions.c | 2 +
tools/perf/arch/s390/Makefile | 4 -
tools/perf/arch/s390/annotate/instructions.c | 2 +
tools/perf/arch/s390/util/Build | 1 -
tools/perf/arch/s390/util/dwarf-regs.c | 43 -----
tools/perf/arch/sh/Build | 1 -
tools/perf/arch/sh/Makefile | 4 -
tools/perf/arch/sh/util/Build | 1 -
tools/perf/arch/sh/util/dwarf-regs.c | 41 -----
tools/perf/arch/sparc/Build | 1 -
tools/perf/arch/sparc/Makefile | 4 -
tools/perf/arch/sparc/annotate/instructions.c | 2 +
tools/perf/arch/sparc/util/Build | 1 -
tools/perf/arch/sparc/util/dwarf-regs.c | 39 -----
tools/perf/arch/x86/Makefile | 4 -
tools/perf/arch/x86/annotate/instructions.c | 5 +-
tools/perf/arch/x86/util/Build | 3 -
tools/perf/arch/x86/util/dwarf-regs.c | 153 ------------------
tools/perf/arch/xtensa/Build | 1 -
tools/perf/arch/xtensa/Makefile | 4 -
tools/perf/arch/xtensa/util/Build | 1 -
tools/perf/arch/xtensa/util/dwarf-regs.c | 21 ---
tools/perf/builtin-annotate.c | 2 +-
tools/perf/builtin-check.c | 6 +-
tools/perf/builtin-probe.c | 14 +-
tools/perf/builtin-report.c | 4 +-
tools/perf/util/Build | 15 +-
tools/perf/util/annotate-data.h | 8 +-
tools/perf/util/annotate.c | 6 +-
tools/perf/util/bpf-prologue.h | 37 -----
tools/perf/util/debuginfo.h | 6 +-
tools/perf/util/disasm.c | 4 +-
tools/perf/util/disasm.h | 8 +-
tools/perf/util/dwarf-aux.c | 6 -
tools/perf/util/dwarf-aux.h | 53 ------
.../dwarf-regs.c => util/dwarf-regs-csky.c} | 19 +--
tools/perf/util/dwarf-regs-powerpc.c | 61 +++++++
tools/perf/util/dwarf-regs-x86.c | 50 ++++++
tools/perf/util/dwarf-regs.c | 38 +++--
tools/perf/util/genelf.c | 4 +-
tools/perf/util/genelf.h | 2 +-
tools/perf/util/include/dwarf-regs.h | 114 ++++++++++---
tools/perf/util/probe-event.c | 4 +-
tools/perf/util/probe-finder.c | 19 +--
tools/perf/util/probe-finder.h | 9 +-
84 files changed, 454 insertions(+), 1157 deletions(-)
delete mode 100644 tools/build/feature/test-dwarf.c
delete mode 100644 tools/build/feature/test-dwarf_getcfi.c
delete mode 100644 tools/build/feature/test-dwarf_getlocations.c
delete mode 100644 tools/build/feature/test-libdw-dwarf-unwind.c
create mode 100644 tools/build/feature/test-libdw.c
delete mode 100644 tools/perf/arch/arm/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/arm64/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/csky/Makefile
delete mode 100644 tools/perf/arch/loongarch/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/mips/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/powerpc/util/dwarf-regs.c
create mode 100644 tools/perf/arch/riscv/include/dwarf-regs-table.h
delete mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/s390/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/sh/Build
delete mode 100644 tools/perf/arch/sh/Makefile
delete mode 100644 tools/perf/arch/sh/util/Build
delete mode 100644 tools/perf/arch/sh/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/sparc/Build
delete mode 100644 tools/perf/arch/sparc/util/Build
delete mode 100644 tools/perf/arch/sparc/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/x86/util/dwarf-regs.c
delete mode 100644 tools/perf/arch/xtensa/Build
delete mode 100644 tools/perf/arch/xtensa/Makefile
delete mode 100644 tools/perf/arch/xtensa/util/Build
delete mode 100644 tools/perf/arch/xtensa/util/dwarf-regs.c
delete mode 100644 tools/perf/util/bpf-prologue.h
rename tools/perf/{arch/csky/util/dwarf-regs.c => util/dwarf-regs-csky.c} (74%)
create mode 100644 tools/perf/util/dwarf-regs-powerpc.c
create mode 100644 tools/perf/util/dwarf-regs-x86.cSignature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 1/31 perf build: Fix !HAVE_DWARF_GETLOCATIONS_SUPPORT
Testing with a LIBDW_DIR showed some issues. In dwarf-aux.h if HAVE_DWARF_GETLOCATIONS_SUPPORT isn't defined then the code uses an undefined errno value, so add errno.h.
In Makefile.config the dwarf feature tests need the LIBDW_DIR setting in the CFLAGS/LDFLAGS.
--- tools/perf/Makefile.config | 6 ++++++ tools/perf/util/dwarf-aux.h | 1 + 2 files changed, 7 insertions(+)
tools/perf/Makefile.config +6 -0
@@ -159,8 +159,14 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) DWARFLIBS += -lebl endif endif +FEATURE_CHECK_CFLAGS-dwarf := $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-dwarf := $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) $(DWARFLIBS) +FEATURE_CHECK_CFLAGS-dwarf_getlocations := $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-dwarf_getlocations := $(LIBDW_LDFLAGS) $(DWARFLIBS) +FEATURE_CHECK_CFLAGS-dwarf_getcfi := $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-dwarf_getcfi := $(LIBDW_LDFLAGS) $(DWARFLIBS) # for linking with debug library, run like: # make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/
tools/perf/util/dwarf-aux.h +1 -0
@@ -177,6 +177,7 @@ void die_collect_vars(Dwarf_Die *sc_die, struct die_var_type **var_types);void die_collect_global_vars (Dwarf_Die *cu_die,struct die_var_type **var_types);#else /* HAVE_DWARF_GETLOCATIONS_SUPPORT */ +#include <errno.h> static inline int die_get_var_range(Dwarf_Die *sp_die __maybe_unused, Dwarf_Die *vr_die __maybe_unused,
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 2/31 perf build: Rename NO_DWARF to NO_LIBDW
In reply to Ian RogersNO_DWARF could mean more than NO_LIBDW support, in particular no libunwind support. Rename to be more intention revealing.
--- tools/perf/Makefile.config | 16 ++++++++-------- tools/perf/Makefile.perf | 2 +- tools/perf/arch/arm/Makefile | 2 +- tools/perf/arch/arm64/Makefile | 2 +- tools/perf/arch/csky/Makefile | 2 +- tools/perf/arch/loongarch/Makefile | 2 +- tools/perf/arch/mips/Makefile | 2 +- tools/perf/arch/powerpc/Makefile | 2 +- tools/perf/arch/riscv/Makefile | 2 +- tools/perf/arch/s390/Makefile | 2 +- tools/perf/arch/sh/Makefile | 2 +- tools/perf/arch/sparc/Makefile | 2 +- tools/perf/arch/x86/Makefile | 2 +- tools/perf/arch/xtensa/Makefile | 2 +- tools/perf/builtin-probe.c | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-)
tools/perf/Makefile.config +8 -8
@@ -429,7 +429,7 @@ ifeq ($(feature-file-handle), 1) endif ifdef NO_LIBELF - NO_DWARF := 1 + NO_LIBDW := 1 NO_LIBUNWIND := 1 NO_LIBDW_DWARF_UNWIND := 1 NO_LIBBPF := 1
@@ -471,9 +471,9 @@ else endif endif ifneq ($(feature-dwarf), 1) - ifndef NO_DWARF + ifndef NO_LIBDW $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev) - NO_DWARF := 1 + NO_LIBDW := 1 endif else ifneq ($(feature-dwarf_getlocations), 1)
@@ -496,7 +496,7 @@ ifeq ($(feature-libaio), 1) endif endif -ifdef NO_DWARF +ifdef NO_LIBDW NO_LIBDW_DWARF_UNWIND := 1 endif
@@ -574,17 +574,17 @@ ifndef NO_LIBELF endif endif - ifndef NO_DWARF + ifndef NO_LIBDW ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled) - NO_DWARF := 1 + NO_LIBDW := 1 else CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS) LDFLAGS += $(LIBDW_LDFLAGS) EXTLIBS += ${DWARFLIBS} $(call detected,CONFIG_DWARF) endif # PERF_HAVE_DWARF_REGS - endif # NO_DWARF + endif # NO_LIBDW ifndef NO_LIBBPF ifeq ($(feature-bpf), 1)
@@ -633,7 +633,7 @@ ifdef PERF_HAVE_JITDUMP endif ifeq ($(SRCARCH),powerpc) - ifndef NO_DWARF + ifndef NO_LIBDW CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX endif endif
tools/perf/Makefile.perf +1 -1
@@ -40,7 +40,7 @@ include ../scripts/utilities.mak # # Define EXTRA_PERFLIBS to pass extra libraries to PERFLIBS. # -# Define NO_DWARF if you do not want debug-info analysis feature at all. +# Define NO_LIBDW if you do not want debug-info analysis feature at all. # # Define WERROR=0 to disable treating any warnings as errors. #
tools/perf/arch/arm/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif PERF_HAVE_JITDUMP := 1
tools/perf/arch/arm64/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif PERF_HAVE_JITDUMP := 1
tools/perf/arch/csky/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif
tools/perf/arch/loongarch/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
tools/perf/arch/mips/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif
tools/perf/arch/powerpc/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif
tools/perf/arch/riscv/Makefile +1 -1
@@ -1,4 +1,4 @@ -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
tools/perf/arch/s390/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/sh/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif
tools/perf/arch/sparc/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif
tools/perf/arch/x86/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/xtensa/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_DWARF +ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif
tools/perf/builtin-probe.c +1 -1
@@ -616,7 +616,7 @@ __cmd_probe(int argc, const char **argv)set_option_flag (options,'L' ,"line" ,PARSE_OPT_EXCLUSIVE );set_option_flag (options,'V' ,"vars" ,PARSE_OPT_EXCLUSIVE );#else -# define set_nobuild (s, l, c) set_option_nobuild(options, s, l, "NO_DWARF=1", c) +# define set_nobuild (s, l, c) set_option_nobuild(options, s, l, "NO_LIBDW=1", c)set_nobuild ('L' ,"line" , false);set_nobuild ('V' ,"vars" , false);set_nobuild ('\0' ,"externs" , false);
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 3/31 perf build: Remove defined but never used variable
In reply to Ian RogersPreviously NO_DWARF_UNWIND was part of conditional compilation but it is now unused so remove.
--- tools/perf/Makefile.config | 2 -- 1 file changed, 2 deletions(-)
tools/perf/Makefile.config +0 -2
@@ -753,8 +753,6 @@ endif ifeq ($(dwarf-post-unwind),1) CFLAGS += -DHAVE_DWARF_UNWIND_SUPPORT $(call detected,CONFIG_DWARF_UNWIND) -else - NO_DWARF_UNWIND := 1 endif ifndef NO_LOCAL_LIBUNWIND
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 4/31 perf build: Rename test-dwarf to test-libdw
In reply to Ian RogersBe more intention revealing that the dwarf test is actually testing for libdw support.
---
tools/build/Makefile.feature | 6 +++---
tools/build/feature/Makefile | 16 ++++++++--------
tools/build/feature/test-all.c | 6 +++---
.../build/feature/{test-dwarf.c => test-libdw.c} | 0
tools/perf/Makefile.config | 6 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
rename tools/build/feature/{test-dwarf.c => test-libdw.c} (100%)tools/build/Makefile.feature +3 -3
@@ -30,7 +30,7 @@ endef # FEATURE_TESTS_BASIC := \ backtrace \ - dwarf \ + libdw \ dwarf_getlocations \ dwarf_getcfi \ eventfd \
@@ -120,7 +120,7 @@ ifeq ($(FEATURE_TESTS),all) endif FEATURE_DISPLAY ?= \ - dwarf \ + libdw \ dwarf_getlocations \ glibc \ libbfd \
@@ -233,7 +233,7 @@ endef # # generates feature value assignment for name, like: -# $(call feature_assign,dwarf) == feature-dwarf=1 +# $(call feature_assign,libdw) == feature-libdw=1 # feature_assign = feature-$(1)=$(feature-$(1))
tools/build/feature/Makefile +8 -8
@@ -5,7 +5,7 @@ FILES= \ test-all.bin \ test-backtrace.bin \ test-bionic.bin \ - test-dwarf.bin \ + test-libdw.bin \ test-dwarf_getlocations.bin \ test-dwarf_getcfi.bin \ test-eventfd.bin \
@@ -168,9 +168,9 @@ $(OUTPUT)test-libopencsd.bin: $(BUILD) # -lopencsd_c_api -lopencsd provided by # $(FEATURE_CHECK_LDFLAGS-libopencsd) -DWARFLIBS := -ldw +DWLIBS := -ldw ifeq ($(findstring -static,${LDFLAGS}),-static) - DWARFLIBS += -lelf -lz -llzma -lbz2 -lzstd + DWLIBS += -lelf -lz -llzma -lbz2 -lzstd LIBDW_VERSION := $(shell $(PKG_CONFIG) --modversion libdw) LIBDW_VERSION_1 := $(word 1, $(subst ., ,$(LIBDW_VERSION)))
@@ -179,18 +179,18 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) # Elfutils merged libebl.a into libdw.a starting from version 0.177, # Link libebl.a only if libdw is older than this version. ifeq ($(shell test $(LIBDW_VERSION_2) -lt 177; echo $$?),0) - DWARFLIBS += -lebl + DWLIBS += -lebl endif endif -$(OUTPUT)test-dwarf.bin: - $(BUILD) $(DWARFLIBS) +$(OUTPUT)test-libdw.bin: + $(BUILD) $(DWLIBS) $(OUTPUT)test-dwarf_getlocations.bin: - $(BUILD) $(DWARFLIBS) + $(BUILD) $(DWLIBS) $(OUTPUT)test-dwarf_getcfi.bin: - $(BUILD) $(DWARFLIBS) + $(BUILD) $(DWLIBS) $(OUTPUT)test-libelf-getphdrnum.bin: $(BUILD) -lelf
tools/build/feature/test-all.c +3 -3
@@ -38,8 +38,8 @@# include "test-glibc.c" #undef main -#define main main_test_dwarf -# include "test-dwarf.c" +#define main main_test_libdw +# include "test-libdw.c" #undef main#define main main_test_dwarf_getlocations
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])main_test_get_current_dir_name ();main_test_gettid ();main_test_glibc (); -main_test_dwarf (); +main_test_libdw ();main_test_dwarf_getlocations ();main_test_eventfd ();main_test_libelf_getphdrnum ();
tools/build/feature/test-libdw.c renamed from tools/build/feature/test-dwarf.c +0 -0
tools/perf/Makefile.config +3 -3
@@ -159,8 +159,8 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) DWARFLIBS += -lebl endif endif -FEATURE_CHECK_CFLAGS-dwarf := $(LIBDW_CFLAGS) -FEATURE_CHECK_LDFLAGS-dwarf := $(LIBDW_LDFLAGS) $(DWARFLIBS) +FEATURE_CHECK_CFLAGS-libdw := $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-libdw := $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-dwarf_getlocations := $(LIBDW_CFLAGS)
@@ -470,7 +470,7 @@ else $(warning No libdw DWARF unwind found, Please install elfutils-devel/libdw-dev >= 0.158 and/or set LIBDW_DIR) endif endif - ifneq ($(feature-dwarf), 1) + ifneq ($(feature-libdw), 1) ifndef NO_LIBDW $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev) NO_LIBDW := 1
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 5/31 perf build: Combine libdw-dwarf-unwind into libdw feature tests
In reply to Ian RogersSupport in libdw has been present for 10 years so let's simplify the build logic with a single feature test.
--- tools/build/Makefile.feature | 2 -- tools/build/feature/Makefile | 4 ---- tools/build/feature/test-all.c | 5 ----- tools/build/feature/test-libdw-dwarf-unwind.c | 14 -------------- tools/build/feature/test-libdw.c | 19 ++++++++++++++++++- tools/perf/Makefile.config | 8 -------- 6 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 tools/build/feature/test-libdw-dwarf-unwind.c
tools/build/Makefile.feature +0 -2
@@ -60,7 +60,6 @@ FEATURE_TESTS_BASIC := \ reallocarray \ stackprotector-all \ timerfd \ - libdw-dwarf-unwind \ zlib \ lzma \ get_cpuid \
@@ -133,7 +132,6 @@ FEATURE_DISPLAY ?= \ libpython \ libcrypto \ libunwind \ - libdw-dwarf-unwind \ libcapstone \ llvm-perf \ zlib \
tools/build/feature/Makefile +0 -4
@@ -52,7 +52,6 @@ FILES= \ test-pthread-barrier.bin \ test-stackprotector-all.bin \ test-timerfd.bin \ - test-libdw-dwarf-unwind.bin \ test-libbabeltrace.bin \ test-libcapstone.bin \ test-compile-32.bin \
@@ -314,9 +313,6 @@ $(OUTPUT)test-backtrace.bin: $(OUTPUT)test-timerfd.bin: $(BUILD) -$(OUTPUT)test-libdw-dwarf-unwind.bin: - $(BUILD) # -ldw provided by $(FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind) - $(OUTPUT)test-libbabeltrace.bin: $(BUILD) # -lbabeltrace provided by $(FEATURE_CHECK_LDFLAGS-libbabeltrace)
tools/build/feature/test-all.c +0 -5
@@ -98,10 +98,6 @@# include "test-stackprotector-all.c" #undef main -#define main main_test_libdw_dwarf_unwind -# include "test-libdw-dwarf-unwind.c" -#undef main -#define main main_test_zlib# include "test-zlib.c" #undef main
@@ -202,7 +198,6 @@ int main(int argc, char *argv[])main_test_numa_num_possible_cpus ();main_test_timerfd ();main_test_stackprotector_all (); -main_test_libdw_dwarf_unwind ();main_test_zlib ();main_test_pthread_attr_setaffinity_np ();main_test_pthread_barrier ();
tools/build/feature/test-libdw-dwarf-unwind.c deleted +0 -14
@@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include <elfutils/libdwfl.h> - -int main (void ) -{ -/* -* This function is guarded via: __nonnull_attribute__ (1, 2). -* Passing '1' as arguments value. This code is never executed, -* only compiled. -*/ -dwfl_thread_getframes ((void *)1 , (void *)1 ,NULL ); -return 0 ; -}
tools/build/feature/test-libdw.c +18 -1
@@ -1,11 +1,28 @@// SPDX-License-Identifier: GPL-2.0 #include <dwarf.h> #include <elfutils/libdw.h> +#include <elfutils/libdwfl.h> #include <elfutils/version.h> -int main (void ) +int test_libdw (void ) {Dwarf *dbg =dwarf_begin (0 ,DWARF_C_READ );return (long )dbg; } + +int test_libdw_unwind (void ) +{ +/* +* This function is guarded via: __nonnull_attribute__ (1, 2). +* Passing '1' as arguments value. This code is never executed, +* only compiled. +*/ +dwfl_thread_getframes ((void *)1 , (void *)1 ,NULL ); +return 0 ; +} + +int main (void ) +{ +return test_libdw () +test_libdw_unwind (); +}
tools/perf/Makefile.config +0 -8
@@ -161,8 +161,6 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) endif FEATURE_CHECK_CFLAGS-libdw := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw := $(LIBDW_LDFLAGS) $(DWARFLIBS) -FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS) -FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-dwarf_getlocations := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-dwarf_getlocations := $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-dwarf_getcfi := $(LIBDW_CFLAGS)
@@ -464,12 +462,6 @@ else endif endif else - ifndef NO_LIBDW_DWARF_UNWIND - ifneq ($(feature-libdw-dwarf-unwind),1) - NO_LIBDW_DWARF_UNWIND := 1 - $(warning No libdw DWARF unwind found, Please install elfutils-devel/libdw-dev >= 0.158 and/or set LIBDW_DIR) - endif - endif ifneq ($(feature-libdw), 1) ifndef NO_LIBDW $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev)
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 6/31 perf build: Combine test-dwarf-getlocations into test-libdw
In reply to Ian Rogersdwarf_getlocations support in libdw is more than 10 years old. Make libdw imply dwarf_getlocations support and simplify build logic.
--- tools/build/Makefile.feature | 2 -- tools/build/feature/Makefile | 4 ---- tools/build/feature/test-all.c | 5 ----- tools/build/feature/test-dwarf_getlocations.c | 13 ------------- tools/build/feature/test-libdw.c | 14 +++++++++++++- tools/perf/Makefile.config | 10 ++-------- 6 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 tools/build/feature/test-dwarf_getlocations.c
tools/build/Makefile.feature +0 -2
@@ -31,7 +31,6 @@ endef FEATURE_TESTS_BASIC := \ backtrace \ libdw \ - dwarf_getlocations \ dwarf_getcfi \ eventfd \ fortify-source \
@@ -120,7 +119,6 @@ endif FEATURE_DISPLAY ?= \ libdw \ - dwarf_getlocations \ glibc \ libbfd \ libbfd-buildid \
tools/build/feature/Makefile +0 -4
@@ -6,7 +6,6 @@ FILES= \ test-backtrace.bin \ test-bionic.bin \ test-libdw.bin \ - test-dwarf_getlocations.bin \ test-dwarf_getcfi.bin \ test-eventfd.bin \ test-fortify-source.bin \
@@ -185,9 +184,6 @@ endif $(OUTPUT)test-libdw.bin: $(BUILD) $(DWLIBS) -$(OUTPUT)test-dwarf_getlocations.bin: - $(BUILD) $(DWLIBS) - $(OUTPUT)test-dwarf_getcfi.bin: $(BUILD) $(DWLIBS)
tools/build/feature/test-all.c +0 -5
@@ -42,10 +42,6 @@# include "test-libdw.c" #undef main -#define main main_test_dwarf_getlocations -# include "test-dwarf_getlocations.c" -#undef main -#define main main_test_eventfd# include "test-eventfd.c" #undef main
@@ -184,7 +180,6 @@ int main(int argc, char *argv[])main_test_gettid ();main_test_glibc ();main_test_libdw (); -main_test_dwarf_getlocations ();main_test_eventfd ();main_test_libelf_getphdrnum ();main_test_libelf_gelf_getnote ();
tools/build/feature/test-dwarf_getlocations.c deleted +0 -13
@@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <stdlib.h> -#include <elfutils/libdw.h> - -int main (void ) -{ -Dwarf_Addr base, start, end; -Dwarf_Attribute attr; -Dwarf_Op *op; -size_t nops; -ptrdiff_t offset =0 ; -return (int )dwarf_getlocations (&attr, offset, &base, &start, &end, &op, &nops); -}
tools/build/feature/test-libdw.c +13 -1
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include <stdlib.h> #include <dwarf.h> #include <elfutils/libdw.h> #include <elfutils/libdwfl.h>
@@ -22,7 +23,18 @@ int test_libdw_unwind(void)return 0 ; } +int test_libdw_getlocations (void ) +{ +Dwarf_Addr base, start, end; +Dwarf_Attribute attr; +Dwarf_Op *op; +size_t nops; +ptrdiff_t offset =0 ; + +return (int )dwarf_getlocations (&attr, offset, &base, &start, &end, &op, &nops); +} +int main (void ) { -return test_libdw () +test_libdw_unwind (); +return test_libdw () +test_libdw_unwind () +test_libdw_getlocations (); }
tools/perf/Makefile.config +2 -8
@@ -161,8 +161,6 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) endif FEATURE_CHECK_CFLAGS-libdw := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw := $(LIBDW_LDFLAGS) $(DWARFLIBS) -FEATURE_CHECK_CFLAGS-dwarf_getlocations := $(LIBDW_CFLAGS) -FEATURE_CHECK_LDFLAGS-dwarf_getlocations := $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-dwarf_getcfi := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-dwarf_getcfi := $(LIBDW_LDFLAGS) $(DWARFLIBS)
@@ -464,15 +462,11 @@ else else ifneq ($(feature-libdw), 1) ifndef NO_LIBDW - $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev) + $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.157, disables dwarf support. Please install new elfutils-devel/libdw-dev) NO_LIBDW := 1 endif else - ifneq ($(feature-dwarf_getlocations), 1) - $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.157) - else - CFLAGS += -DHAVE_DWARF_GETLOCATIONS_SUPPORT - endif # dwarf_getlocations + CFLAGS += -DHAVE_DWARF_GETLOCATIONS_SUPPORT ifneq ($(feature-dwarf_getcfi), 1) $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.142) else
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 7/31 perf build: Combine test-dwarf-getcfi into test-libdw
In reply to Ian Rogersdwarf_getcfi support in libdw is 15 years old. Make libdw imply dwarf_getcfi support and simplify build logic.
--- tools/build/Makefile.feature | 1 - tools/build/feature/Makefile | 4 ---- tools/build/feature/test-dwarf_getcfi.c | 9 --------- tools/build/feature/test-libdw.c | 10 +++++++++- tools/perf/Makefile.config | 8 +------- 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 tools/build/feature/test-dwarf_getcfi.c
tools/build/Makefile.feature +0 -1
@@ -31,7 +31,6 @@ endef FEATURE_TESTS_BASIC := \ backtrace \ libdw \ - dwarf_getcfi \ eventfd \ fortify-source \ get_current_dir_name \
tools/build/feature/Makefile +0 -4
@@ -6,7 +6,6 @@ FILES= \ test-backtrace.bin \ test-bionic.bin \ test-libdw.bin \ - test-dwarf_getcfi.bin \ test-eventfd.bin \ test-fortify-source.bin \ test-get_current_dir_name.bin \
@@ -184,9 +183,6 @@ endif $(OUTPUT)test-libdw.bin: $(BUILD) $(DWLIBS) -$(OUTPUT)test-dwarf_getcfi.bin: - $(BUILD) $(DWLIBS) - $(OUTPUT)test-libelf-getphdrnum.bin: $(BUILD) -lelf
tools/build/feature/test-dwarf_getcfi.c deleted +0 -9
@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <stdio.h> -#include <elfutils/libdw.h> - -int main (void ) -{ -Dwarf *dwarf =NULL ; -return dwarf_getcfi (dwarf) ==NULL ; -}
tools/build/feature/test-libdw.c +9 -1
@@ -34,7 +34,15 @@ int test_libdw_getlocations(void)return (int )dwarf_getlocations (&attr, offset, &base, &start, &end, &op, &nops); } +int test_libdw_getcfi (void ) +{ +Dwarf *dwarf =NULL ; + +return dwarf_getcfi (dwarf) ==NULL ; +} +int main (void ) { -return test_libdw () +test_libdw_unwind () +test_libdw_getlocations (); +return test_libdw () +test_libdw_unwind () +test_libdw_getlocations () + +test_libdw_getcfi (); }
tools/perf/Makefile.config +1 -7
@@ -161,8 +161,6 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) endif FEATURE_CHECK_CFLAGS-libdw := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw := $(LIBDW_LDFLAGS) $(DWARFLIBS) -FEATURE_CHECK_CFLAGS-dwarf_getcfi := $(LIBDW_CFLAGS) -FEATURE_CHECK_LDFLAGS-dwarf_getcfi := $(LIBDW_LDFLAGS) $(DWARFLIBS) # for linking with debug library, run like: # make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/
@@ -467,11 +465,7 @@ else endif else CFLAGS += -DHAVE_DWARF_GETLOCATIONS_SUPPORT - ifneq ($(feature-dwarf_getcfi), 1) - $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.142) - else - CFLAGS += -DHAVE_DWARF_CFI_SUPPORT - endif # dwarf_getcfi + CFLAGS += -DHAVE_DWARF_CFI_SUPPORT endif # Dwarf support endif # libelf support endif # NO_LIBELF
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 8/31 perf probe: Move elfutils support check to libdw check
In reply to Ian RogersThe test _ELFUTILS_PREREQ(0, 142) is false for elfutils before 2009-06-13, but that is 15 years ago and very unlikely. Add a test to test-libdw.c and assume the libdw version is at least 0.142 to simplify the build logic.
--- tools/build/feature/test-libdw.c | 10 +++++++++- tools/perf/util/probe-finder.c | 2 -- tools/perf/util/probe-finder.h | 2 -- 3 files changed, 9 insertions(+), 5 deletions(-)
tools/build/feature/test-libdw.c +9 -1
@@ -41,8 +41,16 @@ int test_libdw_getcfi(void)return dwarf_getcfi (dwarf) ==NULL ; } +int test_elfutils (void ) +{ +Dwarf_CFI *cfi =NULL ; + +dwarf_cfi_end (cfi); +return 0 ; +} +int main (void ) {return test_libdw () +test_libdw_unwind () +test_libdw_getlocations () + -test_libdw_getcfi (); +test_libdw_getcfi () +test_elfutils (); }
tools/perf/util/probe-finder.c +0 -2
@@ -1379,10 +1379,8 @@ int debuginfo__find_trace_events(struct debuginfo *dbg,if (ret >=0 && tf.pf.skip_empty_arg) ret =fill_empty_trace_arg (pev, tf.tevs, tf.ntevs); -#if _ELFUTILS_PREREQ (0 ,142 )dwarf_cfi_end (tf.pf.cfi_eh);dwarf_cfi_end (tf.pf.cfi_dbg); -#endif if (ret <0 || tf.ntevs ==0 ) {for (i =0 ; i < tf.ntevs; i++)
tools/perf/util/probe-finder.h +0 -2
@@ -63,12 +63,10 @@ struct probe_finder {struct intlist *lcache;/* Line cache for lazy match */ /* For variable searching */ -#if _ELFUTILS_PREREQ (0 ,142 )/* Call Frame Information from .eh_frame */ Dwarf_CFI *cfi_eh;/* Call Frame Information from .debug_frame */ Dwarf_CFI *cfi_dbg; -#endif Dwarf_Op *fb_ops;/* Frame base attribute */ unsigned int machine;/* Target machine arch */ struct perf_probe_arg *pvar;/* Current target variable */
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 9/31 perf libdw: Remove unnecessary defines
In reply to Ian RogersAs HAVE_DWARF_GETLOCATIONS_SUPPORT and HAVE_DWARF_CFI_SUPPORT always match HAVE_DWARF_SUPPORT remove the macros and use HAVE_DWARF_SUPPORT. If building the file is guarded by CONFIG_DWARF then remove all ifs.
--- tools/perf/Documentation/perf-check.txt | 2 +- tools/perf/Makefile.config | 3 -- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-check.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/util/dwarf-aux.c | 6 --- tools/perf/util/dwarf-aux.h | 54 ------------------------- tools/perf/util/probe-finder.c | 4 -- 8 files changed, 4 insertions(+), 71 deletions(-)
tools/perf/Documentation/perf-check.txt +1 -1
@@ -48,7 +48,7 @@ feature:: bpf_skeletons / HAVE_BPF_SKEL debuginfod / HAVE_DEBUGINFOD_SUPPORT dwarf / HAVE_DWARF_SUPPORT - dwarf_getlocations / HAVE_DWARF_GETLOCATIONS_SUPPORT + dwarf_getlocations / HAVE_DWARF_SUPPORT dwarf-unwind / HAVE_DWARF_UNWIND_SUPPORT auxtrace / HAVE_AUXTRACE_SUPPORT libaudit / HAVE_LIBAUDIT_SUPPORT
tools/perf/Makefile.config +0 -3
@@ -463,9 +463,6 @@ else $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.157, disables dwarf support. Please install new elfutils-devel/libdw-dev) NO_LIBDW := 1 endif - else - CFLAGS += -DHAVE_DWARF_GETLOCATIONS_SUPPORT - CFLAGS += -DHAVE_DWARF_CFI_SUPPORT endif # Dwarf support endif # libelf support endif # NO_LIBELF
tools/perf/builtin-annotate.c +1 -1
@@ -840,7 +840,7 @@ int cmd_annotate(int argc, const char **argv) }#endif -#ifndef HAVE_DWARF_GETLOCATIONS_SUPPORT +#ifndef HAVE_DWARF_SUPPORT if (annotate.data_type) {pr_err ("Error: Data type profiling is disabled due to missing DWARF support\n" );return -ENOTSUP ;
tools/perf/builtin-check.c +1 -1
@@ -28,7 +28,7 @@ struct feature_status supported_features[] = {FEATURE_STATUS ("bpf_skeletons" ,HAVE_BPF_SKEL ),FEATURE_STATUS ("debuginfod" ,HAVE_DEBUGINFOD_SUPPORT ),FEATURE_STATUS ("dwarf" ,HAVE_DWARF_SUPPORT ), -FEATURE_STATUS ("dwarf_getlocations" ,HAVE_DWARF_GETLOCATIONS_SUPPORT ), +FEATURE_STATUS ("dwarf_getlocations" ,HAVE_DWARF_SUPPORT ),FEATURE_STATUS ("dwarf-unwind" ,HAVE_DWARF_UNWIND_SUPPORT ),FEATURE_STATUS ("auxtrace" ,HAVE_AUXTRACE_SUPPORT ), FEATURE_STATUS("libaudit", HAVE_LIBAUDIT_SUPPORT),
tools/perf/builtin-report.c +1 -1
@@ -1701,7 +1701,7 @@ int cmd_report(int argc, const char **argv) report.data_type = true; annotate_opts.annotate_src = false; -#ifndef HAVE_DWARF_GETLOCATIONS_SUPPORT +#ifndef HAVE_DWARF_SUPPORT pr_err ("Error: Data type profiling is disabled due to missing DWARF support\n" ); goto error;#endif
tools/perf/util/dwarf-aux.c +0 -6
@@ -1182,7 +1182,6 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf)return ret <0 ? ret :strbuf_addf (buf,"\t%s" ,dwarf_diename (vr_die)); } -#if defined(HAVE_DWARF_GETLOCATIONS_SUPPORT ) || defined(HAVE_DWARF_CFI_SUPPORT )static int reg_from_dwarf_op (Dwarf_Op *op) {switch (op->atom) {
@@ -1245,9 +1244,7 @@ static bool check_allowed_ops(Dwarf_Op *ops, size_t nops) }return true; } -#endif /* HAVE_DWARF_GETLOCATIONS_SUPPORT || HAVE_DWARF_CFI_SUPPORT */ -#ifdef HAVE_DWARF_GETLOCATIONS_SUPPORT /** * die_get_var_innermost_scope - Get innermost scope range of given variable DIE * @sp_die: a subprogram DIE
@@ -1697,9 +1694,7 @@ void die_collect_global_vars(Dwarf_Die *cu_die, struct die_var_type **var_types)die_find_child (cu_die, __die_collect_global_vars_cb, (void *)var_types, &die_mem); } -#endif /* HAVE_DWARF_GETLOCATIONS_SUPPORT */ -#ifdef HAVE_DWARF_CFI_SUPPORT /** * die_get_cfa - Get frame base information * @dwarf: a Dwarf info
@@ -1732,7 +1727,6 @@ int die_get_cfa(Dwarf *dwarf, u64 pc, int *preg, int *poffset) }return -1 ; } -#endif /* HAVE_DWARF_CFI_SUPPORT */ /* * die_has_loclist - Check if DW_AT_location of @vr_die is a location list
tools/perf/util/dwarf-aux.h +0 -54
67 lines not on this page · raw message
tools/perf/util/probe-finder.c +0 -4
@@ -602,7 +602,6 @@ static int call_probe_finder(Dwarf_Die *sc_die, struct probe_finder *pf) ret =dwarf_getlocation_addr (&fb_attr, pf->addr, &pf->fb_ops, &nops,1 );if (ret <=0 || nops ==0 ) { pf->fb_ops =NULL ; -#ifdef HAVE_DWARF_CFI_SUPPORT }else if (nops ==1 && pf->fb_ops[0 ].atom == DW_OP_call_frame_cfa && (pf->cfi_eh !=NULL || pf->cfi_dbg !=NULL )) { if ((dwarf_cfi_addrframe(pf->cfi_eh, pf->addr, &frame) != 0 &&
@@ -613,7 +612,6 @@ static int call_probe_finder(Dwarf_Die *sc_die, struct probe_finder *pf)free (frame);return -ENOENT ; } -#endif /* HAVE_DWARF_CFI_SUPPORT */ }/* Call finder's callback handler */
@@ -1138,7 +1136,6 @@ static int debuginfo__find_probes(struct debuginfo *dbg, pf->machine = ehdr.e_machine; -#ifdef HAVE_DWARF_CFI_SUPPORT do { GElf_Shdr shdr;
@@ -1148,7 +1145,6 @@ static int debuginfo__find_probes(struct debuginfo *dbg, pf->cfi_dbg =dwarf_getcfi (dbg->dbg); }while (0 ); -#endif /* HAVE_DWARF_CFI_SUPPORT */ ret =debuginfo__find_probe_location (dbg, pf);return ret;
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 10/31 perf build: Rename HAVE_DWARF_SUPPORT to HAVE_LIBDW_SUPPORT
In reply to Ian RogersIn Makefile.config for unwinding the name dwarf implies either libunwind or libdw. Make it clearer that HAVE_DWARF_SUPPORT is really just defined when libdw is present by renaming to HAVE_LIBDW_SUPPORT.
--- tools/perf/Documentation/perf-check.txt | 6 +++--- tools/perf/Makefile.config | 2 +- tools/perf/arch/powerpc/annotate/instructions.c | 4 ++-- tools/perf/arch/x86/annotate/instructions.c | 2 +- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-check.c | 6 +++--- tools/perf/builtin-probe.c | 12 ++++++------ tools/perf/builtin-report.c | 4 ++-- tools/perf/util/annotate-data.h | 8 ++++---- tools/perf/util/debuginfo.h | 6 +++--- tools/perf/util/disasm.c | 4 ++-- tools/perf/util/disasm.h | 4 ++-- tools/perf/util/genelf.c | 4 ++-- tools/perf/util/genelf.h | 2 +- tools/perf/util/include/dwarf-regs.h | 6 +++--- tools/perf/util/probe-event.c | 4 ++-- tools/perf/util/probe-finder.h | 4 ++-- 17 files changed, 40 insertions(+), 40 deletions(-)
tools/perf/Documentation/perf-check.txt +3 -3
@@ -47,15 +47,15 @@ feature:: bpf / HAVE_LIBBPF_SUPPORT bpf_skeletons / HAVE_BPF_SKEL debuginfod / HAVE_DEBUGINFOD_SUPPORT - dwarf / HAVE_DWARF_SUPPORT - dwarf_getlocations / HAVE_DWARF_SUPPORT + dwarf / HAVE_LIBDW_SUPPORT + dwarf_getlocations / HAVE_LIBDW_SUPPORT dwarf-unwind / HAVE_DWARF_UNWIND_SUPPORT auxtrace / HAVE_AUXTRACE_SUPPORT libaudit / HAVE_LIBAUDIT_SUPPORT libbfd / HAVE_LIBBFD_SUPPORT libcapstone / HAVE_LIBCAPSTONE_SUPPORT libcrypto / HAVE_LIBCRYPTO_SUPPORT - libdw-dwarf-unwind / HAVE_DWARF_SUPPORT + libdw-dwarf-unwind / HAVE_LIBDW_SUPPORT libelf / HAVE_LIBELF_SUPPORT libnuma / HAVE_LIBNUMA_SUPPORT libopencsd / HAVE_CSTRACE_SUPPORT
tools/perf/Makefile.config +1 -1
@@ -556,7 +556,7 @@ ifndef NO_LIBELF $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled) NO_LIBDW := 1 else - CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS) + CFLAGS += -DHAVE_LIBDW_SUPPORT $(LIBDW_CFLAGS) LDFLAGS += $(LIBDW_LDFLAGS) EXTLIBS += ${DWARFLIBS} $(call detected,CONFIG_DWARF)
tools/perf/arch/powerpc/annotate/instructions.c +2 -2
@@ -255,7 +255,7 @@ static struct ins_ops *check_ppc_insn(struct disasm_line *dl)* is moved to r31. update_insn_state_powerpc tracks these state * changes */ -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT static void update_insn_state_powerpc (struct type_state *state,struct data_loc_info *dloc,Dwarf_Die * cu_die__maybe_unused ,struct disasm_line *dl)
@@ -300,7 +300,7 @@ static void update_insn_state_powerpc(struct type_state *state, insn_offset, src->reg1, dst->reg1); pr_debug_type_name(&tsr->type, tsr->kind); } -#endif /* HAVE_DWARF_SUPPORT */ +#endif /* HAVE_LIBDW_SUPPORT */ static int powerpc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {
tools/perf/arch/x86/annotate/instructions.c +1 -1
@@ -207,7 +207,7 @@ static int x86__annotate_init(struct arch *arch, char *cpuid)return err; } -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT static void update_insn_state_x86 (struct type_state *state,struct data_loc_info *dloc,Dwarf_Die *cu_die,struct disasm_line *dl)
tools/perf/builtin-annotate.c +1 -1
@@ -840,7 +840,7 @@ int cmd_annotate(int argc, const char **argv) }#endif -#ifndef HAVE_DWARF_SUPPORT +#ifndef HAVE_LIBDW_SUPPORT if (annotate.data_type) {pr_err ("Error: Data type profiling is disabled due to missing DWARF support\n" );return -ENOTSUP ;
tools/perf/builtin-check.c +3 -3
@@ -27,15 +27,15 @@ struct feature_status supported_features[] = {FEATURE_STATUS ("bpf" ,HAVE_LIBBPF_SUPPORT ),FEATURE_STATUS ("bpf_skeletons" ,HAVE_BPF_SKEL ),FEATURE_STATUS ("debuginfod" ,HAVE_DEBUGINFOD_SUPPORT ), -FEATURE_STATUS ("dwarf" ,HAVE_DWARF_SUPPORT ), -FEATURE_STATUS ("dwarf_getlocations" ,HAVE_DWARF_SUPPORT ), +FEATURE_STATUS ("dwarf" ,HAVE_LIBDW_SUPPORT ), +FEATURE_STATUS ("dwarf_getlocations" ,HAVE_LIBDW_SUPPORT ),FEATURE_STATUS ("dwarf-unwind" ,HAVE_DWARF_UNWIND_SUPPORT ),FEATURE_STATUS ("auxtrace" ,HAVE_AUXTRACE_SUPPORT ),FEATURE_STATUS ("libaudit" ,HAVE_LIBAUDIT_SUPPORT ),FEATURE_STATUS ("libbfd" ,HAVE_LIBBFD_SUPPORT ),FEATURE_STATUS ("libcapstone" ,HAVE_LIBCAPSTONE_SUPPORT ),FEATURE_STATUS ("libcrypto" ,HAVE_LIBCRYPTO_SUPPORT ), -FEATURE_STATUS ("libdw-dwarf-unwind" ,HAVE_DWARF_SUPPORT ), +FEATURE_STATUS ("libdw-dwarf-unwind" ,HAVE_LIBDW_SUPPORT ),FEATURE_STATUS ("libelf" ,HAVE_LIBELF_SUPPORT ),FEATURE_STATUS ("libnuma" ,HAVE_LIBNUMA_SUPPORT ), FEATURE_STATUS("libopencsd", HAVE_CSTRACE_SUPPORT),
tools/perf/builtin-probe.c +6 -6
@@ -229,7 +229,7 @@ static int opt_set_target_ns(const struct option *opt __maybe_unused,/* Command option callbacks */ -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT static int opt_show_lines (const struct option *opt,const char *str,int unset__maybe_unused ) {
@@ -505,7 +505,7 @@ static int perf_del_probe_events(struct strfilter *filter)return ret; } -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT #define PROBEDEF_STR \ "[EVENT=]FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT [[NAME=]ARG ...]"#else
@@ -521,7 +521,7 @@ __cmd_probe(int argc, const char **argv)"perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]" ,"perf probe [<options>] --del '[GROUP:]EVENT' ..." ,"perf probe --list [GROUP:]EVENT ..." , -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT"perf probe [<options>] --line 'LINEDESC'" , "perf probe [<options>] --vars 'PROBEPOINT'", #endif
@@ -545,7 +545,7 @@ __cmd_probe(int argc, const char **argv)"\t\tFUNC:\tFunction name\n" "\t\tOFF:\tOffset from function entry (in byte)\n" "\t\t%return:\tPut the probe at function return\n" -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT"\t\tSRC:\tSource code path\n" "\t\tRL:\tRelative line number from function entry.\n" "\t\tAL:\tAbsolute line number in file.\n"
@@ -612,7 +612,7 @@ __cmd_probe(int argc, const char **argv)set_option_flag (options,'d' ,"del" ,PARSE_OPT_EXCLUSIVE );set_option_flag (options,'D' ,"definition" ,PARSE_OPT_EXCLUSIVE );set_option_flag (options,'l' ,"list" ,PARSE_OPT_EXCLUSIVE ); -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT set_option_flag (options,'L' ,"line" ,PARSE_OPT_EXCLUSIVE );set_option_flag (options,'V' ,"vars" ,PARSE_OPT_EXCLUSIVE );#else
@@ -694,7 +694,7 @@ __cmd_probe(int argc, const char **argv)if (ret <0 )pr_err_with_code (" Error: Failed to show functions." , ret);return ret; -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT case 'L' : ret =show_line_range (¶ms->line_range, params->target, params->nsi, params->uprobes);
tools/perf/builtin-report.c +2 -2
@@ -455,7 +455,7 @@ static int report__setup_sample_type(struct report *rep)if (!(evlist__combined_branch_type (session->evlist) &PERF_SAMPLE_BRANCH_ANY )) rep->nonany_branch_mode = true; -#if !defined(HAVE_LIBUNWIND_SUPPORT ) && !defined(HAVE_DWARF_SUPPORT ) +#if !defined(HAVE_LIBUNWIND_SUPPORT ) && !defined(HAVE_LIBDW_SUPPORT )if (dwarf_callchain_users) {ui__warning ("Please install libunwind or libdw " "development packages during the perf build.\n" );
@@ -1701,7 +1701,7 @@ int cmd_report(int argc, const char **argv) report.data_type = true; annotate_opts.annotate_src = false; -#ifndef HAVE_DWARF_SUPPORT +#ifndef HAVE_LIBDW_SUPPORT pr_err ("Error: Data type profiling is disabled due to missing DWARF support\n" ); goto error;#endif
tools/perf/util/annotate-data.h +4 -4
@@ -9,7 +9,7 @@#include "dwarf-regs.h" #include "annotate.h" -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT #include "debuginfo.h" #endif
@@ -165,7 +165,7 @@ struct annotated_data_stat { };extern struct annotated_data_stat ann_data_stat; -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT /* * Type information in a register, valid when @ok is true. * The @caller_saved registers are invalidated after a function call.
@@ -244,7 +244,7 @@ bool get_global_var_info(struct data_loc_info *dloc, u64 addr, const char **var_name, int *var_offset);void pr_debug_type_name (Dwarf_Die *die,enum type_state_kind kind); -#else /* HAVE_DWARF_SUPPORT */ +#else /* HAVE_LIBDW_SUPPORT */ static inline struct annotated_data_type *find_data_type (struct data_loc_info *dloc__maybe_unused )
@@ -276,7 +276,7 @@ static inline int hist_entry__annotate_data_tty(struct hist_entry *he __maybe_unreturn -1 ; } -#endif /* HAVE_DWARF_SUPPORT */ +#endif /* HAVE_LIBDW_SUPPORT */ #ifdef HAVE_SLANG_SUPPORT int hist_entry__annotate_data_tui(struct hist_entry *he, struct evsel *evsel,
tools/perf/util/debuginfo.h +3 -3
@@ -5,7 +5,7 @@#include <errno.h> #include <linux/compiler.h> -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT #include "dwarf-aux.h"
@@ -25,7 +25,7 @@ void debuginfo__delete(struct debuginfo *dbg);int debuginfo__get_text_offset (struct debuginfo *dbg,Dwarf_Addr *offs,bool adjust_offset); -#else /* HAVE_DWARF_SUPPORT */ +#else /* HAVE_LIBDW_SUPPORT */ /* dummy debug information structure */ struct debuginfo {
@@ -49,7 +49,7 @@ static inline int debuginfo__get_text_offset(struct debuginfo *dbg __maybe_unusereturn -EINVAL ; } -#endif /* HAVE_DWARF_SUPPORT */ +#endif /* HAVE_LIBDW_SUPPORT */ #ifdef HAVE_DEBUGINFOD_SUPPORT int get_source_from_debuginfod(const char *raw_path, const char *sbuild_id,
tools/perf/util/disasm.c +2 -2
@@ -151,14 +151,14 @@ static struct arch architectures[] = { .memory_ref_char = '(', .imm_char = '$', }, -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT .update_insn_state = update_insn_state_x86,#endif }, { .name = "powerpc", .init = powerpc__annotate_init, -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT .update_insn_state = update_insn_state_powerpc,#endif },
tools/perf/util/disasm.h +2 -2
@@ -4,7 +4,7 @@#include "map_symbol.h" -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT #include "dwarf-aux.h" #endif
@@ -39,7 +39,7 @@ struct arch {char memory_ref_char;char imm_char; } objdump; -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT void (*update_insn_state)(struct type_state *state,struct data_loc_info *dloc,Dwarf_Die *cu_die,struct disasm_line *dl);
tools/perf/util/genelf.c +2 -2
@@ -16,7 +16,7 @@#include <inttypes.h> #include <fcntl.h> #include <err.h> -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT #include <dwarf.h> #endif
@@ -499,7 +499,7 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym, shdr->sh_size =sizeof (bnote); shdr->sh_entsize =0 ; -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT if (debug && nr_debug_entries) { retval =jit_add_debug_info (e, load_addr, debug, nr_debug_entries);if (retval)
tools/perf/util/genelf.h +1 -1
@@ -8,7 +8,7 @@int jit_write_elf (int fd,uint64_t code_addr,const char *sym,const void *code,int csize,void *debug,int nr_debug_entries,void *unwinding,uint64_t unwinding_header_size,uint64_t unwinding_size); -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT /* genelf_debug.c */ int jit_add_debug_info (Elf *e,uint64_t code_addr,void *debug,int nr_debug_entries);#endif
tools/perf/util/include/dwarf-regs.h +3 -3
@@ -6,7 +6,7 @@#define DWARF_REG_PC 0xd3af9c/* random number */ #define DWARF_REG_FB 0xd3affb/* random number */ -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT const char *get_arch_regstr (unsigned int n);/* * get_dwarf_regstr - Returns ftrace register string from DWARF regnum
@@ -23,7 +23,7 @@ int get_arch_regnum(const char *name);*/ int get_dwarf_regnum (const char *name,unsigned int machine); -#else /* HAVE_DWARF_SUPPORT */ +#else /* HAVE_LIBDW_SUPPORT */ static inline int get_dwarf_regnum (const char *name__maybe_unused ,unsigned int machine__maybe_unused )
@@ -32,7 +32,7 @@ static inline int get_dwarf_regnum(const char *name __maybe_unused, }#endif -#if !defined(__powerpc__) || !defined(HAVE_DWARF_SUPPORT ) +#if !defined(__powerpc__) || !defined(HAVE_LIBDW_SUPPORT )static inline void get_powerpc_regs (u32 raw_insn__maybe_unused ,int is_source__maybe_unused ,struct annotated_op_loc *op_loc__maybe_unused ) {
tools/perf/util/probe-event.c +2 -2
@@ -342,7 +342,7 @@ static char *find_module_name(const char *module)return mod_name; } -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT static int kernel_get_module_dso (const char *module,struct dso **pdso) {
@@ -1250,7 +1250,7 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs, return ret; } -#else /* !HAVE_DWARF_SUPPORT */ +#else /* !HAVE_LIBDW_SUPPORT */ static void debuginfo_cache__exit (void ) {
tools/perf/util/probe-finder.h +2 -2
@@ -21,7 +21,7 @@ static inline int is_c_varname(const char *name)return isalpha (name[0 ]) || name[0 ] =='_' ; } -#ifdef HAVE_DWARF_SUPPORT +#ifdef HAVE_LIBDW_SUPPORT #include "dwarf-aux.h" #include "debuginfo.h"
@@ -102,6 +102,6 @@ struct line_finder {int found; }; -#endif /* HAVE_DWARF_SUPPORT */ +#endif /* HAVE_LIBDW_SUPPORT */ #endif /*_PROBE_FINDER_H */
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 11/31 perf build: Rename CONFIG_DWARF to CONFIG_LIBDW
In reply to Ian RogersIn Makefile.config for unwinding the name dwarf implies either libunwind or libdw. Make it clearer that CONFIG_DWARF is really just defined when libdw is present by renaming to CONFIG_LIBDW.
--- tools/perf/Makefile.config | 2 +- tools/perf/arch/arm/util/Build | 2 +- tools/perf/arch/arm64/util/Build | 2 +- tools/perf/arch/csky/util/Build | 2 +- tools/perf/arch/loongarch/util/Build | 2 +- tools/perf/arch/mips/util/Build | 2 +- tools/perf/arch/powerpc/util/Build | 4 ++-- tools/perf/arch/riscv/util/Build | 2 +- tools/perf/arch/s390/util/Build | 2 +- tools/perf/arch/sh/util/Build | 2 +- tools/perf/arch/sparc/util/Build | 2 +- tools/perf/arch/x86/util/Build | 2 +- tools/perf/arch/xtensa/util/Build | 2 +- tools/perf/util/Build | 12 ++++++------ 14 files changed, 20 insertions(+), 20 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -559,7 +559,7 @@ ifndef NO_LIBELF CFLAGS += -DHAVE_LIBDW_SUPPORT $(LIBDW_CFLAGS) LDFLAGS += $(LIBDW_LDFLAGS) EXTLIBS += ${DWARFLIBS} - $(call detected,CONFIG_DWARF) + $(call detected,CONFIG_LIBDW) endif # PERF_HAVE_DWARF_REGS endif # NO_LIBDW
tools/perf/arch/arm/util/Build +1 -1
@@ -1,6 +1,6 @@ perf-util-y += perf_regs.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/arm64/util/Build +1 -1
@@ -4,7 +4,7 @@ perf-util-y += perf_regs.o perf-util-y += tsc.o perf-util-y += pmu.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/csky/util/Build +1 -1
@@ -1,4 +1,4 @@ perf-util-y += perf_regs.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/loongarch/util/Build +1 -1
@@ -1,7 +1,7 @@ perf-util-y += header.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
tools/perf/arch/mips/util/Build +1 -1
@@ -1,3 +1,3 @@ perf-util-y += perf_regs.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
tools/perf/arch/powerpc/util/Build +2 -2
@@ -7,8 +7,8 @@ perf-util-y += sym-handling.o perf-util-y += evsel.o perf-util-y += event.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o -perf-util-$(CONFIG_DWARF) += skip-callchain-idx.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/riscv/util/Build +1 -1
@@ -2,5 +2,5 @@ perf-util-y += perf_regs.o perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/s390/util/Build +1 -1
@@ -2,7 +2,7 @@ perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += machine.o
tools/perf/arch/sh/util/Build +1 -1
@@ -1 +1 @@ -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
tools/perf/arch/sparc/util/Build +1 -1
@@ -1 +1 @@ -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
tools/perf/arch/x86/util/Build +1 -1
@@ -12,7 +12,7 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-y += env.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
tools/perf/arch/xtensa/util/Build +1 -1
@@ -1 +1 @@ -perf-$(CONFIG_DWARF) += dwarf-regs.o +perf-$(CONFIG_LIBDW) += dwarf-regs.o
tools/perf/util/Build +6 -6
@@ -199,11 +199,11 @@ ifndef CONFIG_SETNS perf-util-y += setns.o endif -perf-util-$(CONFIG_DWARF) += probe-finder.o -perf-util-$(CONFIG_DWARF) += dwarf-aux.o -perf-util-$(CONFIG_DWARF) += dwarf-regs.o -perf-util-$(CONFIG_DWARF) += debuginfo.o -perf-util-$(CONFIG_DWARF) += annotate-data.o +perf-util-$(CONFIG_LIBDW) += probe-finder.o +perf-util-$(CONFIG_LIBDW) += dwarf-aux.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += debuginfo.o +perf-util-$(CONFIG_LIBDW) += annotate-data.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind-local.o
@@ -234,7 +234,7 @@ perf-util-$(CONFIG_LIBLLVM) += llvm-c-helpers.o ifdef CONFIG_JITDUMP perf-util-$(CONFIG_LIBELF) += jitdump.o perf-util-$(CONFIG_LIBELF) += genelf.o -perf-util-$(CONFIG_DWARF) += genelf_debug.o +perf-util-$(CONFIG_LIBDW) += genelf_debug.o endif perf-util-y += perf-hooks.o
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 12/31 perf bpf-prologue: Remove unused file
In reply to Ian RogersCommit 4a73fca22692 ("perf bpf-prologue: Remove unused file") missed cleaning up the header file. The code was unnecessary as Commit 3d6dfae88917 ("perf parse-events: Remove BPF event support") removed building bpf-prologue.c.
--- tools/perf/util/bpf-prologue.h | 37 ---------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 tools/perf/util/bpf-prologue.h
tools/perf/util/bpf-prologue.h deleted +0 -37
@@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2015, He Kuang <[email protected]> -* Copyright (C) 2015, Huawei Inc. -*/ -#ifndef __BPF_PROLOGUE_H -#define __BPF_PROLOGUE_H - -struct probe_trace_arg ; -struct bpf_insn ; - -#define BPF_PROLOGUE_MAX_ARGS 3 -#define BPF_PROLOGUE_START_ARG_REG BPF_REG_3 -#define BPF_PROLOGUE_FETCH_RESULT_REG BPF_REG_2 - -#ifdef HAVE_BPF_PROLOGUE -int bpf__gen_prologue (struct probe_trace_arg *args,int nargs, -struct bpf_insn *new_prog,size_t *new_cnt, -size_t cnt_space); -#else -#include <linux/compiler.h> -#include <errno.h> - -static inline int -bpf__gen_prologue (struct probe_trace_arg *args__maybe_unused , -int nargs__maybe_unused , -struct bpf_insn *new_prog__maybe_unused , -size_t *new_cnt, -size_t cnt_space__maybe_unused ) -{ -if (!new_cnt) -return -EINVAL ; - *new_cnt =0 ; -return -ENOTSUP ; -} -#endif -#endif /* __BPF_PROLOGUE_H */
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 13/31 perf dwarf-regs: Remove PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
In reply to Ian RogersPERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET was used for BPF prologue support which was removed in Commit 3d6dfae88917 ("perf parse-events:
Remove BPF event support"). The code is no longer used so remove.
Remove the offset from various dwarf-regs.c tables and the dependence on ptrace.h. Rename structs starting pt_ as the ptrace derived offset is now removed.
--- tools/perf/Makefile.config | 4 - tools/perf/arch/arm64/Makefile | 1 - tools/perf/arch/arm64/util/dwarf-regs.c | 20 +--- tools/perf/arch/loongarch/Makefile | 1 - tools/perf/arch/loongarch/util/dwarf-regs.c | 10 -- tools/perf/arch/powerpc/Makefile | 1 - tools/perf/arch/powerpc/util/dwarf-regs.c | 26 ++--- tools/perf/arch/riscv/Makefile | 1 - tools/perf/arch/riscv/util/dwarf-regs.c | 14 +-- tools/perf/arch/s390/Makefile | 1 - tools/perf/arch/s390/util/dwarf-regs.c | 27 ----- tools/perf/arch/x86/Makefile | 1 - tools/perf/arch/x86/util/dwarf-regs.c | 109 +++----------------- tools/perf/util/include/dwarf-regs.h | 8 -- 14 files changed, 27 insertions(+), 197 deletions(-)
tools/perf/Makefile.config +0 -4
@@ -200,10 +200,6 @@ FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arc # include ARCH specific config -include $(src-perf)/arch/$(SRCARCH)/Makefile -ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET - CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET -endif - include $(srctree)/tools/scripts/utilities.mak ifeq ($(call get-executable,$(FLEX)),)
tools/perf/arch/arm64/Makefile +0 -1
@@ -3,7 +3,6 @@ ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif PERF_HAVE_JITDUMP := 1 -PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 HAVE_KVM_STAT_SUPPORT := 1 #
tools/perf/arch/arm64/util/dwarf-regs.c +4 -16
@@ -9,10 +9,9 @@#include <stddef.h> #include <string.h> #include <dwarf-regs.h> -#include <linux/ptrace.h> /* for struct user_pt_regs */ #include <linux/stringify.h> -struct pt_regs_dwarfnum { +struct regs_dwarfnum {const char *name;unsigned int dwarfnum; };
@@ -21,14 +20,12 @@ struct pt_regs_dwarfnum {#define GPR_DWARFNUM_NAME (num) \ {.name = __stringify(%x##num), .dwarfnum = num}#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0} -#define DWARFNUM2OFFSET (index) \ - (index * sizeof((struct user_pt_regs *)0)->regs[0])/* * Reference: * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0057b/IHI0057B_aadwarf64.pdf */ -static const struct pt_regs_dwarfnum regdwarfnum_table[] = { +static const struct regs_dwarfnum regdwarfnum_table[] = {GPR_DWARFNUM_NAME (0 ),GPR_DWARFNUM_NAME (1 ),GPR_DWARFNUM_NAME (2 ),
@@ -74,19 +71,10 @@ static const struct pt_regs_dwarfnum regdwarfnum_table[] = {*/ const char *get_arch_regstr (unsigned int n) { -const struct pt_regs_dwarfnum *roff; +const struct regs_dwarfnum *roff; +for (roff = regdwarfnum_table; roff->name !=NULL ; roff++)if (roff->dwarfnum == n)return roff->name;return NULL ; } - -int regs_query_register_offset (const char *name) -{ -const struct pt_regs_dwarfnum *roff; - -for (roff = regdwarfnum_table; roff->name !=NULL ; roff++) -if (!strcmp (roff->name, name)) -return DWARFNUM2OFFSET (roff->dwarfnum); -return -EINVAL ; -}
tools/perf/arch/loongarch/Makefile +0 -1
@@ -2,7 +2,6 @@ ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif -PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/loongarch/util/dwarf-regs.c +0 -10
@@ -32,13 +32,3 @@ const char *get_arch_regstr(unsigned int n) n %=32 ;return loongarch_gpr_table[n].name; } - -int regs_query_register_offset (const char *name) -{ -const struct pt_regs_dwarfnum *roff; - -for (roff = loongarch_gpr_table; roff->name !=NULL ; roff++) -if (!strcmp (roff->name, name)) -return roff->dwarfnum; -return -EINVAL ; -}
tools/perf/arch/powerpc/Makefile +0 -1
@@ -4,7 +4,6 @@ PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 -PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 #
tools/perf/arch/powerpc/util/dwarf-regs.c +7 -19
@@ -9,29 +9,25 @@#include <errno.h> #include <string.h> #include <dwarf-regs.h> -#include <linux/ptrace.h> #include <linux/kernel.h> #include <linux/stringify.h> -struct pt_regs_dwarfnum { +struct regs_dwarfnum {const char *name;unsigned int dwarfnum; -unsigned int ptregs_offset; };#define REG_DWARFNUM_NAME (r, num) \ - {.name = __stringify(%)__stringify(r), .dwarfnum = num, \ - .ptregs_offset = offsetof(struct pt_regs, r)} + {.name = __stringify(%)__stringify(r), .dwarfnum = num}#define GPR_DWARFNUM_NAME (num) \ - {.name = __stringify(%gpr##num), .dwarfnum = num, \ - .ptregs_offset = offsetof(struct pt_regs, gpr[num])} -#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0, .ptregs_offset = 0} + {.name = __stringify(%gpr##num), .dwarfnum = num} +#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}/* * Reference: * http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html */ -static const struct pt_regs_dwarfnum regdwarfnum_table[] = { +static const struct regs_dwarfnum regdwarfnum_table[] = {GPR_DWARFNUM_NAME (0 ),GPR_DWARFNUM_NAME (1 ),GPR_DWARFNUM_NAME (2 ),
@@ -83,22 +79,14 @@ static const struct pt_regs_dwarfnum regdwarfnum_table[] = {*/ const char *get_arch_regstr (unsigned int n) { -const struct pt_regs_dwarfnum *roff; +const struct regs_dwarfnum *roff; +for (roff = regdwarfnum_table; roff->name !=NULL ; roff++)if (roff->dwarfnum == n)return roff->name;return NULL ; } -int regs_query_register_offset (const char *name) -{ -const struct pt_regs_dwarfnum *roff; -for (roff = regdwarfnum_table; roff->name !=NULL ; roff++) -if (!strcmp (roff->name, name)) -return roff->ptregs_offset; -return -EINVAL ; -} -#define PPC_OP (op) (((op) >> 26) & 0x3F)#define PPC_RA (a) (((a) >> 16) & 0x1f)#define PPC_RT (t) (((t) >> 21) & 0x1f)
tools/perf/arch/riscv/Makefile +0 -1
@@ -1,6 +1,5 @@ ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif -PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/riscv/util/dwarf-regs.c +2 -12
@@ -9,7 +9,7 @@#include <string.h> /* for strcmp */ #include <dwarf-regs.h> -struct pt_regs_dwarfnum { +struct regs_dwarfnum {const char *name;unsigned int dwarfnum; };
@@ -17,7 +17,7 @@ struct pt_regs_dwarfnum {#define REG_DWARFNUM_NAME (r, num) {.name = r, .dwarfnum = num}#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0} -struct pt_regs_dwarfnum riscv_dwarf_regs_table[] = { +struct regs_dwarfnum riscv_dwarf_regs_table[] = {REG_DWARFNUM_NAME ("%zero" ,0 ),REG_DWARFNUM_NAME ("%ra" ,1 ),REG_DWARFNUM_NAME ("%sp" ,2 ),
@@ -60,13 +60,3 @@ const char *get_arch_regstr(unsigned int n) {return (n <RISCV_MAX_REGS ) ? riscv_dwarf_regs_table[n].name :NULL ; } - -int regs_query_register_offset (const char *name) -{ -const struct pt_regs_dwarfnum *roff; - -for (roff = riscv_dwarf_regs_table; roff->name; roff++) -if (!strcmp (roff->name, name)) -return roff->dwarfnum; -return -EINVAL ; -}
tools/perf/arch/s390/Makefile +0 -1
@@ -3,7 +3,6 @@ ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 -PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 #
tools/perf/arch/s390/util/dwarf-regs.c +0 -27
@@ -7,37 +7,10 @@* */ -#include <errno.h> -#include <stddef.h> -#include <stdlib.h> #include <linux/kernel.h> -#include <asm/ptrace.h> -#include <string.h> -#include <dwarf-regs.h> #include "dwarf-regs-table.h" const char *get_arch_regstr (unsigned int n) {return (n >=ARRAY_SIZE (s390_dwarf_regs)) ?NULL : s390_dwarf_regs[n]; } - -/* -* Convert the register name into an offset to struct pt_regs (kernel). -* This is required by the BPF prologue generator. The BPF -* program is called in the BPF overflow handler in the perf -* core. -*/ -int regs_query_register_offset (const char *name) -{ -unsigned long gpr; - -if (!name ||strncmp (name,"%r" ,2 )) -return -EINVAL ; - - errno =0 ; - gpr =strtoul (name +2 ,NULL ,10 ); -if (errno || gpr >=16 ) -return -EINVAL ; - -return offsetof(user_pt_regs , gprs) +8 * gpr; -}
tools/perf/arch/x86/Makefile +0 -1
@@ -3,7 +3,6 @@ ifndef NO_LIBDW PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 -PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 ###
tools/perf/arch/x86/util/dwarf-regs.c +14 -95
126 lines not on this page · raw message
tools/perf/util/include/dwarf-regs.h +0 -8
@@ -42,12 +42,4 @@ static inline void get_powerpc_regs(u32 raw_insn __maybe_unused, int is_source _void get_powerpc_regs (u32 raw_insn,int is_source,struct annotated_op_loc *op_loc);#endif -#ifdef HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET -/* -* Arch should support fetching the offset of a register in pt_regs -* by its name. See kernel's regs_query_register_offset in -* arch/xxx/kernel/ptrace.c. -*/ -int regs_query_register_offset (const char *name); -#endif #endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 14/31 perf dwarf-regs: Add EM_HOST and EF_HOST defines
In reply to Ian RogersComputed from the build architecture defines, EM_HOST and EF_HOST give values that can be used in dwarf register lookup. Place in dwarf-regs.h so the value can be shared. Move some dwarf-regs.c constants used for EM_HOST to dwarf-regs.h.
--- tools/perf/util/dwarf-regs.c | 8 ---- tools/perf/util/include/dwarf-regs.h | 72 ++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 8 deletions(-)
tools/perf/util/dwarf-regs.c +0 -8
@@ -13,14 +13,6 @@#include <errno.h> #include <linux/kernel.h> -#ifndef EM_AARCH64 -#define EM_AARCH64 183/* ARM 64 bit */ -#endif - -#ifndef EM_LOONGARCH -#define EM_LOONGARCH 258/* LoongArch */ -#endif -/* Define const char * {arch}_register_tbl[] */ #define DEFINE_DWARF_REGSTR_TABLE #include "../arch/x86/include/dwarf-regs-table.h"
tools/perf/util/include/dwarf-regs.h +72 -0
78 lines not on this page · raw message
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 15/31 perf disasm: Add e_machine/e_flags to struct arch
In reply to Ian RogersCurrently functions like get_dwarf_regnum only work with the host architecture. Carry the elf machine and flags in struct arch so that in disassembly these can be used to allow cross platform disassembly.
--- tools/perf/arch/arc/annotate/instructions.c | 2 ++ tools/perf/arch/arm/annotate/instructions.c | 2 ++ tools/perf/arch/arm64/annotate/instructions.c | 2 ++ tools/perf/arch/csky/annotate/instructions.c | 7 ++++++- tools/perf/arch/loongarch/annotate/instructions.c | 2 ++ tools/perf/arch/mips/annotate/instructions.c | 2 ++ tools/perf/arch/powerpc/annotate/instructions.c | 2 ++ tools/perf/arch/riscv64/annotate/instructions.c | 2 ++ tools/perf/arch/s390/annotate/instructions.c | 2 ++ tools/perf/arch/sparc/annotate/instructions.c | 2 ++ tools/perf/arch/x86/annotate/instructions.c | 3 ++- tools/perf/util/disasm.h | 4 ++++ 12 files changed, 30 insertions(+), 2 deletions(-)
tools/perf/arch/arc/annotate/instructions.c +2 -0
@@ -5,5 +5,7 @@ static int arc__annotate_init(struct arch *arch, char *cpuid __maybe_unused) { arch->initialized = true; arch->objdump.comment_char =';' ; + arch->e_machine =EM_ARC ; + arch->e_flags =0 ;return 0 ; }
tools/perf/arch/arm/annotate/instructions.c +2 -0
@@ -53,6 +53,8 @@ static int arm__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = arm__associate_instruction_ops; arch->objdump.comment_char =';' ; arch->objdump.skip_functions_char ='+' ; + arch->e_machine =EM_ARM ; + arch->e_flags =0 ;return 0 ; out_free_call:
tools/perf/arch/arm64/annotate/instructions.c +2 -0
@@ -113,6 +113,8 @@ static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = arm64__associate_instruction_ops; arch->objdump.comment_char ='/' ; arch->objdump.skip_functions_char ='+' ; + arch->e_machine =EM_AARCH64 ; + arch->e_flags =0 ;return 0 ; out_free_call:
tools/perf/arch/csky/annotate/instructions.c +6 -1
@@ -43,6 +43,11 @@ static int csky__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->initialized = true; arch->objdump.comment_char ='/' ; arch->associate_instruction_ops = csky__associate_ins_ops; - + arch->e_machine =EM_CSKY ; +#if defined(__CSKYABIV2__) + arch->e_flags =EF_CSKY_ABIV2 ; +#else + arch->e_flags =EF_CSKY_ABIV1 ; +#endif return 0 ; }
tools/perf/arch/loongarch/annotate/instructions.c +2 -0
@@ -131,6 +131,8 @@ int loongarch__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = loongarch__associate_ins_ops; arch->initialized = true; arch->objdump.comment_char ='#' ; + arch->e_machine =EM_LOONGARCH ; + arch->e_flags =0 ; }return 0 ;
tools/perf/arch/mips/annotate/instructions.c +2 -0
@@ -40,6 +40,8 @@ int mips__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = mips__associate_ins_ops; arch->initialized = true; arch->objdump.comment_char ='#' ; + arch->e_machine =EM_MIPS ; + arch->e_flags =0 ; }return 0 ;
tools/perf/arch/powerpc/annotate/instructions.c +2 -0
@@ -309,6 +309,8 @@ static int powerpc__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = powerpc__associate_instruction_ops; arch->objdump.comment_char ='#' ; annotate_opts.show_asm_raw = true; + arch->e_machine =EM_PPC ; + arch->e_flags =0 ; }return 0 ;
tools/perf/arch/riscv64/annotate/instructions.c +2 -0
@@ -28,6 +28,8 @@ int riscv64__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = riscv64__associate_ins_ops; arch->initialized = true; arch->objdump.comment_char ='#' ; + arch->e_machine =EM_RISCV ; + arch->e_flags =0 ; }return 0 ;
tools/perf/arch/s390/annotate/instructions.c +2 -0
@@ -166,6 +166,8 @@ static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused)if (s390__cpuid_parse (arch, cpuid)) err =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; } + arch->e_machine =EM_S390 ; + arch->e_flags =0 ; }return err;
tools/perf/arch/sparc/annotate/instructions.c +2 -0
@@ -163,6 +163,8 @@ static int sparc__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->initialized = true; arch->associate_instruction_ops = sparc__associate_instruction_ops; arch->objdump.comment_char ='#' ; + arch->e_machine =EM_SPARC ; + arch->e_flags =0 ; }return 0 ;
tools/perf/arch/x86/annotate/instructions.c +2 -1
@@ -202,7 +202,8 @@ static int x86__annotate_init(struct arch *arch, char *cpuid)if (x86__cpuid_parse (arch, cpuid)) err =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; } - + arch->e_machine =EM_X86_64 ; + arch->e_flags =0 ; arch->initialized = true;return err; }
tools/perf/util/disasm.h +4 -0
@@ -44,6 +44,10 @@ struct arch { struct data_loc_info *dloc, Dwarf_Die *cu_die, struct disasm_line *dl);#endif +/** @e_machine: ELF machine associated with arch. */ +unsigned int e_machine; +/** @e_flags: Optional ELF flags associated with arch. */ +unsigned int e_flags; };struct ins {
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 16/31 perf dwarf-regs: Pass accurate disassembly machine to get_dwarf_regnum
In reply to Ian RogersRather than pass 0/EM_NONE, use the value computed in the disasm struct arch. Switch the EM_NONE case to EM_HOST, rewriting EM_NONE if it were passed to get_dwarf_regnum. Pass a flags value as architectures like csky need the flags to determine the ABI variant.
--- tools/perf/util/annotate.c | 6 +++--- tools/perf/util/dwarf-regs.c | 8 ++++++-- tools/perf/util/include/dwarf-regs.h | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-)
tools/perf/util/annotate.c +3 -3
@@ -2292,7 +2292,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg1 =get_dwarf_regnum (regname,0 ); + op_loc->reg1 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname);/* Get the second register */
@@ -2305,7 +2305,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg2 =get_dwarf_regnum (regname,0 ); + op_loc->reg2 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname); }return 0 ;
@@ -2405,7 +2405,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl,return -1 ;if (*s == arch->objdump.register_char) - op_loc->reg1 =get_dwarf_regnum (s,0 ); + op_loc->reg1 =get_dwarf_regnum (s, arch->e_machine, arch->e_flags);else if (*s == arch->objdump.imm_char) { op_loc->offset =strtol (s +1 , &p,0 );if (p && p != s +1 )
tools/perf/util/dwarf-regs.c +6 -2
@@ -70,7 +70,7 @@ __weak int get_arch_regnum(const char *name __maybe_unused) }/* Return DWARF register number from architecture register name */ -int get_dwarf_regnum (const char *name,unsigned int machine) +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused ) {char *regname =strdup (name);int reg =-1 ;
@@ -84,8 +84,12 @@ int get_dwarf_regnum(const char *name, unsigned int machine)if (p) *p ='\0' ; +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + }switch (machine) { -case EM_NONE :/* Generic arch - use host arch */ +case EM_HOST : reg =get_arch_regnum (regname);break ;default :
tools/perf/util/include/dwarf-regs.h +3 -2
@@ -93,12 +93,13 @@ int get_arch_regnum(const char *name);* name: architecture register name * machine: ELF machine signature (EM_*) */ -int get_dwarf_regnum (const char *name,unsigned int machine); +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags);#else /* HAVE_LIBDW_SUPPORT */ static inline int get_dwarf_regnum (const char *name__maybe_unused , -unsigned int machine__maybe_unused ) +unsigned int machine__maybe_unused , +unsigned int flags__maybe_unused ) {return -1 ; }
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Re: [PATCH v2 16/31] perf dwarf-regs: Pass accurate disassembly machine to get_dwarf_regnum
Quoted 5 lines · On Sat, 5 Oct 2024 12:55:26 -0700 Ian Rogers <[email protected]> wrote:
Rather than pass 0/EM_NONE, use the value computed in the disasm struct arch. Switch the
EM_NONEcase toEM_HOST, rewritingEM_NONEif it were passed toget_dwarf_regnum. Pass a flags value as architectures like csky need the flags to determine the ABI variant.
Does this change the command output when we use it for cross-build environment? E.g. remote arch is different from host arch? If so, please add output examples with/without this change.
Thank you,
Quoted 88 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/annotate.c | 6 +++--- tools/perf/util/dwarf-regs.c | 8 ++++++-- tools/perf/util/include/dwarf-regs.h | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-)tools/perf/util/annotate.c +3
-3@@ -2292,7 +2292,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg1 =get_dwarf_regnum (regname,0 ); + op_loc->reg1 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname);/* Get the second register */ @@ -2305,7 +2305,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg2 =get_dwarf_regnum (regname,0 ); + op_loc->reg2 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname); }return 0 ;@@ -2405,7 +2405,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl,return -1 ;if (*s == arch->objdump.register_char) - op_loc->reg1 =get_dwarf_regnum (s,0 ); + op_loc->reg1 =get_dwarf_regnum (s, arch->e_machine, arch->e_flags);else if (*s == arch->objdump.imm_char) { op_loc->offset =strtol (s +1 , &p,0 );if (p && p != s +1 )tools/perf/util/dwarf-regs.c +6
-2@@ -70,7 +70,7 @@ __weak int get_arch_regnum(const char *name __maybe_unused) }/* Return DWARF register number from architecture register name */ -int get_dwarf_regnum (const char *name,unsigned int machine) +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused ) {char *regname =strdup (name);int reg =-1 ;@@ -84,8 +84,12 @@ int get_dwarf_regnum(const char *name, unsigned int machine)if (p) *p ='\0' ; +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + }switch (machine) { -case EM_NONE :/* Generic arch - use host arch */ +case EM_HOST : reg =get_arch_regnum (regname);break ;default :tools/perf/util/include/dwarf-regs.h +3
-2@@ -93,12 +93,13 @@ int get_arch_regnum(const char *name);* name: architecture register name * machine: ELF machine signature (EM_*) */ -int get_dwarf_regnum (const char *name,unsigned int machine); +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags);#else /* HAVE_LIBDW_SUPPORT */ static inline int get_dwarf_regnum (const char *name__maybe_unused , -unsigned int machine__maybe_unused ) +unsigned int machine__maybe_unused , +unsigned int flags__maybe_unused ) {return -1 ; }Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Ian Rogers
reviewerRe: [PATCH v2 16/31] perf dwarf-regs: Pass accurate disassembly machine to get_dwarf_regnum
Quoted 10 lines · Masami Hiramatsu
Quoted 5 lines · On Sat, 5 Oct 2024 12:55:26 -0700 Ian Rogers <[email protected]> wrote:
Rather than pass 0/EM_NONE, use the value computed in the disasm struct arch. Switch the
EM_NONEcase toEM_HOST, rewritingEM_NONEif it were passed toget_dwarf_regnum. Pass a flags value as architectures like csky need the flags to determine the ABI variant.
Quoted 3 lines
Does this change the command output when we use it for cross-build environment? E.g. remote arch is different from host arch? If so, please add output examples with/without this change.
The cases where this would apply are small as get_arch_regnum is only implemented for x86. get_dwarf_regnum likewise only works for x86 and it is only called by annotate.
In this code without this patch the behavior is to return -ENOTSUP, ie the code is set up to fail and this code just makes it not fail for the x86 case (when not on x86) with code that is well tested on x86. The code exists as x86 registers may be the same dwarf number but have different names: e.g. rax, eax, ax, al. I'm not sure this reaches a high complexity level for extensive testing. I'll see if I can grab an x86 perf.data file to analyze on ARM, but I don't think doing this should gate the series.
Thanks,
Ian
Quoted 92 lines
Quoted 86 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/annotate.c | 6 +++--- tools/perf/util/dwarf-regs.c | 8 ++++++-- tools/perf/util/include/dwarf-regs.h | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-)tools/perf/util/annotate.c +3
-3@@ -2292,7 +2292,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg1 =get_dwarf_regnum (regname,0 ); + op_loc->reg1 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname);/* Get the second register */ @@ -2305,7 +2305,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg2 =get_dwarf_regnum (regname,0 ); + op_loc->reg2 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname); }return 0 ;@@ -2405,7 +2405,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl,return -1 ;if (*s == arch->objdump.register_char) - op_loc->reg1 =get_dwarf_regnum (s,0 ); + op_loc->reg1 =get_dwarf_regnum (s, arch->e_machine, arch->e_flags);else if (*s == arch->objdump.imm_char) { op_loc->offset =strtol (s +1 , &p,0 );if (p && p != s +1 )tools/perf/util/dwarf-regs.c +6
-2@@ -70,7 +70,7 @@ __weak int get_arch_regnum(const char *name __maybe_unused) }/* Return DWARF register number from architecture register name */ -int get_dwarf_regnum (const char *name,unsigned int machine) +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused ) {char *regname =strdup (name);int reg =-1 ;@@ -84,8 +84,12 @@ int get_dwarf_regnum(const char *name, unsigned int machine)if (p) *p ='\0' ; +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + }switch (machine) { -case EM_NONE :/* Generic arch - use host arch */ +case EM_HOST : reg =get_arch_regnum (regname);break ;default :tools/perf/util/include/dwarf-regs.h +3
-3@@ -93,12 +93,13 @@ int get_arch_regnum(const char *name);* name: architecture register name * machine: ELF machine signature (EM_*) */ -int get_dwarf_regnum (const char *name,unsigned int machine); +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags);#else /* HAVE_LIBDW_SUPPORT */ static inline int get_dwarf_regnum (const char *name__maybe_unused , -unsigned int machine__maybe_unused ) +unsigned int machine__maybe_unused , +unsigned int flags__maybe_unused ) {return -1 ; } --Quoted 2 lines
2.47.0.rc0.187.ge670bccf7e-goog
--
Masami Hiramatsu (Google) <[email protected]>
Namhyung Kim
maintainerRe: [PATCH v2 16/31] perf dwarf-regs: Pass accurate disassembly machine to get_dwarf_regnum
Hello,
Sorry for the late reply.
Quoted 11 lines · Ian Rogers
Quoted 10 lines · Masami Hiramatsu
Quoted 5 lines · On Sat, 5 Oct 2024 12:55:26 -0700 Ian Rogers <[email protected]> wrote:
Rather than pass 0/EM_NONE, use the value computed in the disasm struct arch. Switch the
EM_NONEcase toEM_HOST, rewritingEM_NONEif it were passed toget_dwarf_regnum. Pass a flags value as architectures like csky need the flags to determine the ABI variant.
Quoted 7 lines
Quoted 3 lines
Does this change the command output when we use it for cross-build environment? E.g. remote arch is different from host arch? If so, please add output examples with/without this change.
The cases where this would apply are small as
get_arch_regnumis only implemented for x86.get_dwarf_regnumlikewise only works for x86 and it is only called by annotate.
Yep, it's used only in the data type profiling. I don't expect it to work in the cross environment yet. This change moves it closer to the working state though. :)
Quoted 8 lines
In this code without this patch the behavior is to return
-ENOTSUP, ie the code is set up to fail and this code just makes it not fail for the x86 case (when not on x86) with code that is well tested on x86. The code exists as x86 registers may be the same dwarf number but have different names: e.g. rax, eax, ax, al. I'm not sure this reaches a high complexity level for extensive testing. I'll see if I can grab an x86 perf.data file to analyze on ARM, but I don't think doing this should gate the series.
Yep, as I said it's not supported yet and I don't think that's the goal of this patch series. So probably it's ok to merge it without the extensive testing.
Thanks,
Namhyung
Quoted 93 lines
Quoted 93 lines
Quoted 87 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/annotate.c | 6 +++--- tools/perf/util/dwarf-regs.c | 8 ++++++-- tools/perf/util/include/dwarf-regs.h | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-)tools/perf/util/annotate.c +3
-3@@ -2292,7 +2292,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg1 =get_dwarf_regnum (regname,0 ); + op_loc->reg1 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname);/* Get the second register */ @@ -2305,7 +2305,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,if (regname ==NULL )return -1 ; - op_loc->reg2 =get_dwarf_regnum (regname,0 ); + op_loc->reg2 =get_dwarf_regnum (regname, arch->e_machine, arch->e_flags);free (regname); }return 0 ;@@ -2405,7 +2405,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl,return -1 ;if (*s == arch->objdump.register_char) - op_loc->reg1 =get_dwarf_regnum (s,0 ); + op_loc->reg1 =get_dwarf_regnum (s, arch->e_machine, arch->e_flags);else if (*s == arch->objdump.imm_char) { op_loc->offset =strtol (s +1 , &p,0 );if (p && p != s +1 )tools/perf/util/dwarf-regs.c +6
-2@@ -70,7 +70,7 @@ __weak int get_arch_regnum(const char *name __maybe_unused) }/* Return DWARF register number from architecture register name */ -int get_dwarf_regnum (const char *name,unsigned int machine) +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused ) {char *regname =strdup (name);int reg =-1 ;@@ -84,8 +84,12 @@ int get_dwarf_regnum(const char *name, unsigned int machine)if (p) *p ='\0' ; +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + }switch (machine) { -case EM_NONE :/* Generic arch - use host arch */ +case EM_HOST : reg =get_arch_regnum (regname);break ;default :tools/perf/util/include/dwarf-regs.h +3
-3@@ -93,12 +93,13 @@ int get_arch_regnum(const char *name);* name: architecture register name * machine: ELF machine signature (EM_*) */ -int get_dwarf_regnum (const char *name,unsigned int machine); +int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags);#else /* HAVE_LIBDW_SUPPORT */ static inline int get_dwarf_regnum (const char *name__maybe_unused , -unsigned int machine__maybe_unused ) +unsigned int machine__maybe_unused , +unsigned int flags__maybe_unused ) {return -1 ; } --Quoted 2 lines
2.47.0.rc0.187.ge670bccf7e-goog
--
Masami Hiramatsu (Google) <[email protected]>
Ian Rogers
reviewerPATCH v2 17/31 perf dwarf-regs: Pass ELF flags to get_dwarf_regstr
In reply to Ian RogersPass a flags value as architectures like csky need the flags to determine the ABI variant.
--- tools/perf/util/dwarf-regs.c | 3 ++- tools/perf/util/include/dwarf-regs.h | 11 ++++++----- tools/perf/util/probe-finder.c | 13 +++++++------ tools/perf/util/probe-finder.h | 3 ++- 4 files changed, 17 insertions(+), 13 deletions(-)
tools/perf/util/dwarf-regs.c +2 -1
@@ -29,7 +29,8 @@#define __get_dwarf_regstr (tbl, n) (((n) < ARRAY_SIZE(tbl)) ? (tbl)[(n)] : NULL)/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine) +const char *get_dwarf_regstr (unsigned int n,unsigned int machine, +unsigned int flags__maybe_unused ) {switch (machine) {case EM_NONE :/* Generic arch - use host arch */
tools/perf/util/include/dwarf-regs.h +6 -5
@@ -80,12 +80,13 @@#ifdef HAVE_LIBDW_SUPPORT const char *get_arch_regstr (unsigned int n); -/* -* get_dwarf_regstr - Returns ftrace register string from DWARF regnum -* n: DWARF register number -* machine: ELF machine signature (EM_*) +/** +* get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. +* @n: DWARF register number. +* @machine: ELF machine signature (EM_*). +* @flags: ELF flags for things like ABI differences. */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine); +const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags);int get_arch_regnum (const char *name);/*
tools/perf/util/probe-finder.c +7 -6
@@ -56,7 +56,7 @@ static struct probe_trace_arg_ref *alloc_trace_arg_ref(long offs)*/ static int convert_variable_location (Dwarf_Die *vr_die,Dwarf_Addr addr,Dwarf_Op *fb_ops,Dwarf_Die *sp_die, -unsigned int machine, +const struct probe_finder *pf,struct probe_trace_arg *tvar) {Dwarf_Attribute attr;
@@ -166,7 +166,7 @@ static int convert_variable_location(Dwarf_Die *vr_die, Dwarf_Addr addr,if (!tvar)return ret2; - regs =get_dwarf_regstr (regn, machine); + regs =get_dwarf_regstr (regn, pf->e_machine, pf->e_flags);if (!regs) {/* This should be a bug in DWARF or this tool */ pr_warning("Mapping for the register number %u "
@@ -451,7 +451,7 @@ static int convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf) dwarf_diename(vr_die)); ret =convert_variable_location (vr_die, pf->addr, pf->fb_ops, - &pf->sp_die, pf->machine, pf->tvar); + &pf->sp_die, pf, pf->tvar);if (ret == -ENOENT && pf->skip_empty_arg)/* This can be found in other place. skip it */ return 0 ;
@@ -1134,7 +1134,8 @@ static int debuginfo__find_probes(struct debuginfo *dbg,if (gelf_getehdr (elf, &ehdr) ==NULL )return -EINVAL ; - pf->machine = ehdr.e_machine; + pf->e_machine = ehdr.e_machine; + pf->e_flags = ehdr.e_flags; do { GElf_Shdr shdr;
@@ -1171,7 +1172,7 @@ static int copy_variables_cb(Dwarf_Die *die_mem, void *data) (tag == DW_TAG_variable && vf->vars)) {if (convert_variable_location (die_mem, vf->pf->addr, vf->pf->fb_ops, &pf->sp_die, - pf->machine,NULL ) ==0 ) { + pf,/*tvar=*/ NULL ) ==0 ) { vf->args[vf->nargs].var = (char *)dwarf_diename (die_mem);if (vf->args[vf->nargs].var ==NULL ) { vf->ret = -ENOMEM ;
@@ -1403,7 +1404,7 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) tag == DW_TAG_variable) { ret =convert_variable_location (die_mem, af->pf.addr, af->pf.fb_ops, &af->pf.sp_die, - af->pf.machine,NULL ); + &af->pf,/*tvar=*/ NULL );if (ret ==0 || ret == -ERANGE ) {int ret2;bool externs = !af->child;
tools/perf/util/probe-finder.h +2 -1
@@ -68,7 +68,8 @@ struct probe_finder {/* Call Frame Information from .debug_frame */ Dwarf_CFI *cfi_dbg;Dwarf_Op *fb_ops;/* Frame base attribute */ -unsigned int machine;/* Target machine arch */ +unsigned int e_machine;/* ELF target machine arch */ +unsigned int e_flags;/* ELF target machine flags */ struct perf_probe_arg *pvar;/* Current target variable */ struct probe_trace_arg *tvar;/* Current result variable */ bool skip_empty_arg;/* Skip non-exist args */
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Re: [PATCH v2 17/31] perf dwarf-regs: Pass ELF flags to get_dwarf_regstr
Quoted 3 lines · On Sat, 5 Oct 2024 12:55:27 -0700 Ian Rogers <[email protected]> wrote:
Pass a flags value as architectures like csky need the flags to determine the ABI variant.
Same here. I need some examples of this chaneg.
Thank you,
Quoted 121 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/dwarf-regs.c | 3 ++- tools/perf/util/include/dwarf-regs.h | 11 ++++++----- tools/perf/util/probe-finder.c | 13 +++++++------ tools/perf/util/probe-finder.h | 3 ++- 4 files changed, 17 insertions(+), 13 deletions(-)tools/perf/util/dwarf-regs.c +2
-1@@ -29,7 +29,8 @@#define __get_dwarf_regstr (tbl, n) (((n) < ARRAY_SIZE(tbl)) ? (tbl)[(n)] : NULL)/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine) +const char *get_dwarf_regstr (unsigned int n,unsigned int machine, +unsigned int flags__maybe_unused ) {switch (machine) {case EM_NONE :/* Generic arch - use host arch */ tools/perf/util/include/dwarf-regs.h +6
-5@@ -80,12 +80,13 @@#ifdef HAVE_LIBDW_SUPPORT const char *get_arch_regstr (unsigned int n); -/* -* get_dwarf_regstr - Returns ftrace register string from DWARF regnum -* n: DWARF register number -* machine: ELF machine signature (EM_*) +/** +* get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. +* @n: DWARF register number. +* @machine: ELF machine signature (EM_*). +* @flags: ELF flags for things like ABI differences. */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine); +const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags);int get_arch_regnum (const char *name);/* tools/perf/util/probe-finder.c +7
-6@@ -56,7 +56,7 @@ static struct probe_trace_arg_ref *alloc_trace_arg_ref(long offs)*/ static int convert_variable_location (Dwarf_Die *vr_die,Dwarf_Addr addr,Dwarf_Op *fb_ops,Dwarf_Die *sp_die, -unsigned int machine, +const struct probe_finder *pf,struct probe_trace_arg *tvar) {Dwarf_Attribute attr;@@ -166,7 +166,7 @@ static int convert_variable_location(Dwarf_Die *vr_die, Dwarf_Addr addr,if (!tvar)return ret2; - regs =get_dwarf_regstr (regn, machine); + regs =get_dwarf_regstr (regn, pf->e_machine, pf->e_flags);if (!regs) {/* This should be a bug in DWARF or this tool */ pr_warning("Mapping for the register number %u "@@ -451,7 +451,7 @@ static int convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf) dwarf_diename(vr_die)); ret =convert_variable_location (vr_die, pf->addr, pf->fb_ops, - &pf->sp_die, pf->machine, pf->tvar); + &pf->sp_die, pf, pf->tvar);if (ret == -ENOENT && pf->skip_empty_arg)/* This can be found in other place. skip it */ return 0 ;@@ -1134,7 +1134,8 @@ static int debuginfo__find_probes(struct debuginfo *dbg,if (gelf_getehdr (elf, &ehdr) ==NULL )return -EINVAL ; - pf->machine = ehdr.e_machine; + pf->e_machine = ehdr.e_machine; + pf->e_flags = ehdr.e_flags; do { GElf_Shdr shdr;@@ -1171,7 +1172,7 @@ static int copy_variables_cb(Dwarf_Die *die_mem, void *data) (tag == DW_TAG_variable && vf->vars)) {if (convert_variable_location (die_mem, vf->pf->addr, vf->pf->fb_ops, &pf->sp_die, - pf->machine,NULL ) ==0 ) { + pf,/*tvar=*/ NULL ) ==0 ) { vf->args[vf->nargs].var = (char *)dwarf_diename (die_mem);if (vf->args[vf->nargs].var ==NULL ) { vf->ret = -ENOMEM ;@@ -1403,7 +1404,7 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) tag == DW_TAG_variable) { ret =convert_variable_location (die_mem, af->pf.addr, af->pf.fb_ops, &af->pf.sp_die, - af->pf.machine,NULL ); + &af->pf,/*tvar=*/ NULL );if (ret ==0 || ret == -ERANGE ) {int ret2;bool externs = !af->child;tools/perf/util/probe-finder.h +2
-1@@ -68,7 +68,8 @@ struct probe_finder {/* Call Frame Information from .debug_frame */ Dwarf_CFI *cfi_dbg;Dwarf_Op *fb_ops;/* Frame base attribute */ -unsigned int machine;/* Target machine arch */ +unsigned int e_machine;/* ELF target machine arch */ +unsigned int e_flags;/* ELF target machine flags */ struct perf_probe_arg *pvar;/* Current target variable */ struct probe_trace_arg *tvar;/* Current result variable */ bool skip_empty_arg;/* Skip non-exist args */ Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Ian Rogers
reviewerRe: [PATCH v2 17/31] perf dwarf-regs: Pass ELF flags to get_dwarf_regstr
Quoted 9 lines · Masami Hiramatsu
Quoted 3 lines · On Sat, 5 Oct 2024 12:55:27 -0700 Ian Rogers <[email protected]> wrote:
Pass a flags value as architectures like csky need the flags to determine the ABI variant.
Same here. I need some examples of this chaneg.
The code here was already using the ELF machine, so dwarf-regs.c functions would already support cross building. There is the addition of ELF flags as on csky the registers change depending on the ABI version in the ELF flags.
Thanks,
Ian
Quoted 125 lines
Quoted 119 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/dwarf-regs.c | 3 ++- tools/perf/util/include/dwarf-regs.h | 11 ++++++----- tools/perf/util/probe-finder.c | 13 +++++++------ tools/perf/util/probe-finder.h | 3 ++- 4 files changed, 17 insertions(+), 13 deletions(-)tools/perf/util/dwarf-regs.c +2
-1@@ -29,7 +29,8 @@#define __get_dwarf_regstr (tbl, n) (((n) < ARRAY_SIZE(tbl)) ? (tbl)[(n)] : NULL)/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine) +const char *get_dwarf_regstr (unsigned int n,unsigned int machine, +unsigned int flags__maybe_unused ) {switch (machine) {case EM_NONE :/* Generic arch - use host arch */ tools/perf/util/include/dwarf-regs.h +6
-5@@ -80,12 +80,13 @@#ifdef HAVE_LIBDW_SUPPORT const char *get_arch_regstr (unsigned int n); -/* -* get_dwarf_regstr - Returns ftrace register string from DWARF regnum -* n: DWARF register number -* machine: ELF machine signature (EM_*) +/** +* get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. +* @n: DWARF register number. +* @machine: ELF machine signature (EM_*). +* @flags: ELF flags for things like ABI differences. */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine); +const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags);int get_arch_regnum (const char *name);/* tools/perf/util/probe-finder.c +7
-6@@ -56,7 +56,7 @@ static struct probe_trace_arg_ref *alloc_trace_arg_ref(long offs)*/ static int convert_variable_location (Dwarf_Die *vr_die,Dwarf_Addr addr,Dwarf_Op *fb_ops,Dwarf_Die *sp_die, -unsigned int machine, +const struct probe_finder *pf,struct probe_trace_arg *tvar) {Dwarf_Attribute attr;@@ -166,7 +166,7 @@ static int convert_variable_location(Dwarf_Die *vr_die, Dwarf_Addr addr,if (!tvar)return ret2; - regs =get_dwarf_regstr (regn, machine); + regs =get_dwarf_regstr (regn, pf->e_machine, pf->e_flags);if (!regs) {/* This should be a bug in DWARF or this tool */ pr_warning("Mapping for the register number %u "@@ -451,7 +451,7 @@ static int convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf) dwarf_diename(vr_die)); ret =convert_variable_location (vr_die, pf->addr, pf->fb_ops, - &pf->sp_die, pf->machine, pf->tvar); + &pf->sp_die, pf, pf->tvar);if (ret == -ENOENT && pf->skip_empty_arg)/* This can be found in other place. skip it */ return 0 ;@@ -1134,7 +1134,8 @@ static int debuginfo__find_probes(struct debuginfo *dbg,if (gelf_getehdr (elf, &ehdr) ==NULL )return -EINVAL ; - pf->machine = ehdr.e_machine; + pf->e_machine = ehdr.e_machine; + pf->e_flags = ehdr.e_flags; do { GElf_Shdr shdr;@@ -1171,7 +1172,7 @@ static int copy_variables_cb(Dwarf_Die *die_mem, void *data) (tag == DW_TAG_variable && vf->vars)) {if (convert_variable_location (die_mem, vf->pf->addr, vf->pf->fb_ops, &pf->sp_die, - pf->machine,NULL ) ==0 ) { + pf,/*tvar=*/ NULL ) ==0 ) { vf->args[vf->nargs].var = (char *)dwarf_diename (die_mem);if (vf->args[vf->nargs].var ==NULL ) { vf->ret = -ENOMEM ;@@ -1403,7 +1404,7 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) tag == DW_TAG_variable) { ret =convert_variable_location (die_mem, af->pf.addr, af->pf.fb_ops, &af->pf.sp_die, - af->pf.machine,NULL ); + &af->pf,/*tvar=*/ NULL );if (ret ==0 || ret == -ERANGE ) {int ret2;bool externs = !af->child;tools/perf/util/probe-finder.h +2
-2@@ -68,7 +68,8 @@ struct probe_finder {/* Call Frame Information from .debug_frame */ Dwarf_CFI *cfi_dbg;Dwarf_Op *fb_ops;/* Frame base attribute */ -unsigned int machine;/* Target machine arch */ +unsigned int e_machine;/* ELF target machine arch */ +unsigned int e_flags;/* ELF target machine flags */ struct perf_probe_arg *pvar;/* Current target variable */ struct probe_trace_arg *tvar;/* Current result variable */ bool skip_empty_arg;/* Skip non-exist args */ --Quoted 2 lines
2.47.0.rc0.187.ge670bccf7e-goog
--
Masami Hiramatsu (Google) <[email protected]>
Namhyung Kim
maintainerRe: [PATCH v2 17/31] perf dwarf-regs: Pass ELF flags to get_dwarf_regstr
Quoted 9 lines · Ian Rogers
Quoted 8 lines · Masami Hiramatsu
Quoted 3 lines · On Sat, 5 Oct 2024 12:55:27 -0700 Ian Rogers <[email protected]> wrote:
Pass a flags value as architectures like csky need the flags to determine the ABI variant.
Quoted 6 lines
Quoted 1 line
Same here. I need some examples of this chaneg.
The code here was already using the ELF machine, so
dwarf-regs.cfunctions would already support cross building. There is the addition of ELF flags as on csky the registers change depending on the ABI version in the ELF flags.
I think it's used by the probe-finder only which won't support cross-arch environment. So probably no changes to users at this point.
Thanks,
Namhyung
Ian Rogers
reviewerPATCH v2 18/31 perf dwarf-regs: Move x86 dwarf-regs out of arch
In reply to Ian RogersMove arch/x86/util/dwarf-regs.c to util/dwarf-regs-x86.c and compile in unconditionally. To avoid get_arch_regnum being duplicated, rename to get_x86_regnum and add to get_dwarf_regnum switch.
For get_arch_regstr, this was unused on x86 unless the machine type was EM_NONE. Map that case to EM_HOST and remove get_arch_regstr from dwarf-regs-x86.c.
---
tools/perf/arch/x86/util/Build | 3 ---
tools/perf/util/Build | 1 +
.../dwarf-regs.c => util/dwarf-regs-x86.c} | 24 +------------------
tools/perf/util/dwarf-regs.c | 17 +++++++++++++
tools/perf/util/include/dwarf-regs.h | 8 +++++++
5 files changed, 27 insertions(+), 26 deletions(-)
rename tools/perf/{arch/x86/util/dwarf-regs.c => util/dwarf-regs-x86.c} (77%)tools/perf/arch/x86/util/Build +0 -3
@@ -12,9 +12,6 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-y += env.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o -perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o - perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/util/Build +1 -0
@@ -202,6 +202,7 @@ endif perf-util-$(CONFIG_LIBDW) += probe-finder.o perf-util-$(CONFIG_LIBDW) += dwarf-aux.o perf-util-$(CONFIG_LIBDW) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.o
tools/perf/util/dwarf-regs-x86.c renamed from tools/perf/arch/x86/util/dwarf-regs.c +1 -23
@@ -11,28 +11,6 @@#include <linux/kernel.h> /* for ARRAY_SIZE */ #include <dwarf-regs.h> -#define DEFINE_DWARF_REGSTR_TABLE 1 -#include "dwarf-regs-table.h" - -/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_arch_regstr (unsigned int n) -{ -#if defined(__i386__) -size_t len =ARRAY_SIZE (x86_32_regstr_tbl); -#else -size_t len =ARRAY_SIZE (x86_64_regstr_tbl); -#endif - -if (n >= len) -return NULL ; - -#if defined(__i386__) -return x86_32_regstr_tbl[n]; -#else -return x86_64_regstr_tbl[n]; -#endif -} -struct dwarf_regs_idx {const char *name;int idx;
@@ -58,7 +36,7 @@ static const struct dwarf_regs_idx x86_regidx_table[] = { { "rip", DWARF_REG_PC }, }; -int get_arch_regnum (const char *name) +int get_x86_regnum (const char *name) {unsigned int i;
tools/perf/util/dwarf-regs.c +17 -0
@@ -32,9 +32,17 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags__maybe_unused ) { +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + } +#endif switch (machine) { +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n); +#endif case EM_386 :return __get_dwarf_regstr (x86_32_regstr_tbl, n);case EM_X86_64 :
@@ -65,10 +73,12 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine,return NULL ; } +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 __weak int get_arch_regnum (const char *name__maybe_unused ) {return -ENOTSUP ; } +#endif /* Return DWARF register number from architecture register name */ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused )
@@ -90,9 +100,16 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags machine =EM_HOST ; }switch (machine) { +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 case EM_HOST : reg =get_arch_regnum (regname);break ; +#endif +case EM_X86_64 : + fallthrough; +case EM_386 : + reg =get_x86_regnum (regname); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine); }
tools/perf/util/include/dwarf-regs.h +8 -0
@@ -79,7 +79,10 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT +#if !defined(__x86_64__) && !defined(__i386__)const char *get_arch_regstr (unsigned int n); +#endif +/** * get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. * @n: DWARF register number.
@@ -88,7 +91,12 @@ const char *get_arch_regstr(unsigned int n);*/ const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags); +int get_x86_regnum (const char *name); + +#if !defined(__x86_64__) && !defined(__i386__)int get_arch_regnum (const char *name); +#endif +/* * get_dwarf_regnum - Returns DWARF regnum from register name * name: architecture register name
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Re: [PATCH v2 18/31] perf dwarf-regs: Move x86 dwarf-regs out of arch
Quoted 8 lines · On Sat, 5 Oct 2024 12:55:28 -0700 Ian Rogers <[email protected]> wrote:
Move
arch/x86/util/dwarf-regs.ctoutil/dwarf-regs-x86.cand compile in unconditionally. To avoidget_arch_regnumbeing duplicated, rename toget_x86_regnumand add toget_dwarf_regnumswitch.For
get_arch_regstr, this was unused on x86 unless the machine type wasEM_NONE. Map that case toEM_HOSTand removeget_arch_regstrfromdwarf-regs-x86.c.
Hmm, I'm not sure this change. I feel like to keep the arch dependent part under arch/ directory. But if this is just for reverse mapping of regname -> regnum, since we already have regnum -> regname maps in the header file, we can reimplement get_dwarf_regnum() as a generic function. And that is what you does in this series, correct?
If so, can you make a generic get_dwarf_regnum() at first, and remove the architecture dependent part which is not needed anymore. That should be more simpler to review.
Thank you,
Quoted 164 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/x86/util/Build | 3 --- tools/perf/util/Build | 1 + .../dwarf-regs.c => util/dwarf-regs-x86.c} | 24 +------------------ tools/perf/util/dwarf-regs.c | 17 +++++++++++++ tools/perf/util/include/dwarf-regs.h | 8 +++++++ 5 files changed, 27 insertions(+), 26 deletions(-) rename tools/perf/{arch/x86/util/dwarf-regs.c => util/dwarf-regs-x86.c} (77%)tools/perf/arch/x86/util/Build +0
-3@@ -12,9 +12,6 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-y += env.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o -perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o - perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/util/Build +1
-0@@ -202,6 +202,7 @@ endif perf-util-$(CONFIG_LIBDW) += probe-finder.o perf-util-$(CONFIG_LIBDW) += dwarf-aux.o perf-util-$(CONFIG_LIBDW) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.otools/perf/util/dwarf-regs-x86.c renamed from tools/perf/arch/x86/util/dwarf-regs.c +1
-23@@ -11,28 +11,6 @@#include <linux/kernel.h> /* for ARRAY_SIZE */ #include <dwarf-regs.h> -#define DEFINE_DWARF_REGSTR_TABLE 1 -#include "dwarf-regs-table.h" - -/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_arch_regstr (unsigned int n) -{ -#if defined(__i386__) -size_t len =ARRAY_SIZE (x86_32_regstr_tbl); -#else -size_t len =ARRAY_SIZE (x86_64_regstr_tbl); -#endif - -if (n >= len) -return NULL ; - -#if defined(__i386__) -return x86_32_regstr_tbl[n]; -#else -return x86_64_regstr_tbl[n]; -#endif -} -struct dwarf_regs_idx {const char *name;int idx;@@ -58,7 +36,7 @@ static const struct dwarf_regs_idx x86_regidx_table[] = { { "rip", DWARF_REG_PC }, }; -int get_arch_regnum (const char *name) +int get_x86_regnum (const char *name) {unsigned int i;tools/perf/util/dwarf-regs.c +17
-0@@ -32,9 +32,17 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags__maybe_unused ) { +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + } +#endif switch (machine) { +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n); +#endif case EM_386 :return __get_dwarf_regstr (x86_32_regstr_tbl, n);case EM_X86_64 :@@ -65,10 +73,12 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine,return NULL ; } +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 __weak int get_arch_regnum (const char *name__maybe_unused ) {return -ENOTSUP ; } +#endif /* Return DWARF register number from architecture register name */ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused )@@ -90,9 +100,16 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags machine =EM_HOST ; }switch (machine) { +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 case EM_HOST : reg =get_arch_regnum (regname);break ; +#endif +case EM_X86_64 : + fallthrough; +case EM_386 : + reg =get_x86_regnum (regname); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine); }tools/perf/util/include/dwarf-regs.h +8
-0@@ -79,7 +79,10 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT +#if !defined(__x86_64__) && !defined(__i386__)const char *get_arch_regstr (unsigned int n); +#endif +/** * get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. * @n: DWARF register number. @@ -88,7 +91,12 @@ const char *get_arch_regstr(unsigned int n);*/ const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags); +int get_x86_regnum (const char *name); + +#if !defined(__x86_64__) && !defined(__i386__)int get_arch_regnum (const char *name); +#endif +/* * get_dwarf_regnum - Returns DWARF regnum from register name * name: architecture register name Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Ian Rogers
reviewerRe: [PATCH v2 18/31] perf dwarf-regs: Move x86 dwarf-regs out of arch
Quoted 8 lines · Masami Hiramatsu
Quoted 4 lines · On Sat, 5 Oct 2024 12:55:28 -0700 Ian Rogers <[email protected]> wrote:
Move
arch/x86/util/dwarf-regs.ctoutil/dwarf-regs-x86.cand compile in unconditionally. To avoidget_arch_regnumbeing duplicated, rename toget_x86_regnumand add toget_dwarf_regnumswitch.
Quoted 7 lines
Quoted 4 lines
For
get_arch_regstr, this was unused on x86 unless the machine type wasEM_NONE. Map that case toEM_HOSTand removeget_arch_regstrfromdwarf-regs-x86.c.Hmm, I'm not sure this change. I feel like to keep the arch dependent part under
arch/directory
Code in the arch directory is built with this condition:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/arch/Build?h=perf-tools-next
perf-util-y += $(SRCARCH)/
That is we only enter an arch directory if it matches the architecture we're building for.
I think what you are saying is that it'd be nice if x86 related code were in the arch directory, but with things as they are that means the x86 related code wouldn't be built on say ARM.
To workaround this there is plenty of architecture specific code in tools/perf/util:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util?h=perf-tools-nextamd-sample-raw.carm64-frame-pointer-unwind-support.c arm64-frame-pointer-unwind-support.harm-spe.c
arm-spe-decoderarm-spe.hintel-bts.cintel-bts.hintel-pt.c
intel-pt-decoderintel-pt.hintel-tpebs.cintel-tpebs.hs390-cpumcf-kernel.hs390-cpumsf.cs390-cpumsf.hs390-cpumsf-kernel.hs390-sample-raw.c
With this change added are:dwarf-regs-csky.cdwarf-regs-powerpc.cdwarf-regs-x86.c
So I feel this way of doing things is most consistent and achieves the best result.
In general I think the arch directory in perf is a mistake:
1) it breaks the profile on one platform, analyze on another model - in this series it is shown that using the ELF machine is just better than hard coding to the host architecture;
2) it is used as something of an ifdef __<arch>__ replacement but in a way that makes understanding behavior in the code harder to fathom as you need to understand weak functions (not a C feature) and the build logic;
3) much of the code is really PMU driver dependent rather than architecture dependent, moving such code out of arch would enable things like user space emulation of the perf tool.
Quoted 4 lines
But if this is just for reverse mapping of
regname -> regnum, since we already have regnum -> regname maps in the header file, we can reimplementget_dwarf_regnum()as a generic function. And that is what you does in this series, correct?
That work could be done for get_dwarf_regnum but isn't done in this series. Most architectures are missing get_arch_regnum. For get_dwarf_regstr and get_arch_regstr there was the redundancy as get_dwarf_regstr would compute a regstr if the machine wasn't E_NONE in most cases. get_arch_regstr was only used for E_NONE. This code changes E_NONE to E_HOST and then the get_arch_regstr code isn't needed. There are #ifdefs adding complexity as I didn't do a single monolithic patch - the maintainers usually complain if you do big monolithic patches. Patches at the end of the series remove all the #ifdefs, it is just without them the series will break cross compilation if you bisect into the middle of it.
Quoted 3 lines
If so, can you make a generic
get_dwarf_regnum()at first, and remove the architecture dependent part which is not needed anymore. That should be more simpler to review.
I think this is out of scope for this series, not least because of the testing challenge, but could be follow up work.
Thanks,
Ian
Quoted 168 lines
Quoted 162 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/x86/util/Build | 3 --- tools/perf/util/Build | 1 + .../dwarf-regs.c => util/dwarf-regs-x86.c} | 24 +------------------ tools/perf/util/dwarf-regs.c | 17 +++++++++++++ tools/perf/util/include/dwarf-regs.h | 8 +++++++ 5 files changed, 27 insertions(+), 26 deletions(-) rename tools/perf/{arch/x86/util/dwarf-regs.c => util/dwarf-regs-x86.c} (77%)tools/perf/arch/x86/util/Build +0
-3@@ -12,9 +12,6 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-y += env.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o -perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o - perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/util/Build +1
-0@@ -202,6 +202,7 @@ endif perf-util-$(CONFIG_LIBDW) += probe-finder.o perf-util-$(CONFIG_LIBDW) += dwarf-aux.o perf-util-$(CONFIG_LIBDW) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.otools/perf/util/dwarf-regs-x86.c renamed from tools/perf/arch/x86/util/dwarf-regs.c +1
-23@@ -11,28 +11,6 @@#include <linux/kernel.h> /* for ARRAY_SIZE */ #include <dwarf-regs.h> -#define DEFINE_DWARF_REGSTR_TABLE 1 -#include "dwarf-regs-table.h" - -/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_arch_regstr (unsigned int n) -{ -#if defined(__i386__) -size_t len =ARRAY_SIZE (x86_32_regstr_tbl); -#else -size_t len =ARRAY_SIZE (x86_64_regstr_tbl); -#endif - -if (n >= len) -return NULL ; - -#if defined(__i386__) -return x86_32_regstr_tbl[n]; -#else -return x86_64_regstr_tbl[n]; -#endif -} -struct dwarf_regs_idx {const char *name;int idx;@@ -58,7 +36,7 @@ static const struct dwarf_regs_idx x86_regidx_table[] = { { "rip", DWARF_REG_PC }, }; -int get_arch_regnum (const char *name) +int get_x86_regnum (const char *name) {unsigned int i;tools/perf/util/dwarf-regs.c +17
-0@@ -32,9 +32,17 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags__maybe_unused ) { +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 +if (machine ==EM_NONE ) { +/* Generic arch - use host arch */ + machine =EM_HOST ; + } +#endif switch (machine) { +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n); +#endif case EM_386 :return __get_dwarf_regstr (x86_32_regstr_tbl, n);case EM_X86_64 :@@ -65,10 +73,12 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine,return NULL ; } +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 __weak int get_arch_regnum (const char *name__maybe_unused ) {return -ENOTSUP ; } +#endif /* Return DWARF register number from architecture register name */ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused )@@ -90,9 +100,16 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags machine =EM_HOST ; }switch (machine) { +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 case EM_HOST : reg =get_arch_regnum (regname);break ; +#endif +case EM_X86_64 : + fallthrough; +case EM_386 : + reg =get_x86_regnum (regname); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine); }tools/perf/util/include/dwarf-regs.h +8
-1@@ -79,7 +79,10 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT +#if !defined(__x86_64__) && !defined(__i386__)const char *get_arch_regstr (unsigned int n); +#endif +/** * get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. * @n: DWARF register number. @@ -88,7 +91,12 @@ const char *get_arch_regstr(unsigned int n);*/ const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags); +int get_x86_regnum (const char *name); + +#if !defined(__x86_64__) && !defined(__i386__)int get_arch_regnum (const char *name); +#endif +/* * get_dwarf_regnum - Returns DWARF regnum from register name * name: architecture register name -- Quoted 2 lines
2.47.0.rc0.187.ge670bccf7e-goog
--
Masami Hiramatsu (Google) <[email protected]>
Ian Rogers
reviewerPATCH v2 19/31 perf arm64: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for arm64 in dwarf-regs.c.
--- tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/arm64/util/dwarf-regs.c | 80 ------------------------- tools/perf/util/dwarf-regs.c | 4 +- tools/perf/util/include/dwarf-regs.h | 2 +- 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 tools/perf/arch/arm64/util/dwarf-regs.c
tools/perf/arch/arm64/util/Build +0 -1
@@ -4,7 +4,6 @@ perf-util-y += perf_regs.o perf-util-y += tsc.o perf-util-y += pmu.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/arm64/util/dwarf-regs.c deleted +0 -80
80 lines not on this page · raw message
tools/perf/util/dwarf-regs.c +2 -2
@@ -32,14 +32,14 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags__maybe_unused ) { -#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ; }#endif switch (machine) { -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -79,7 +79,7 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT -#if !defined(__x86_64__) && !defined(__i386__) +#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Re: [PATCH v2 19/31] perf arm64: Remove dwarf-regs.c
Quoted 4 lines · On Sat, 5 Oct 2024 12:55:29 -0700 Ian Rogers <[email protected]> wrote:
The file just provides the function
get_arch_regstr, however, if in the only callerget_dwarf_regstrEM_HOSTis used for theEM_NONEcase the function can never be called. So remove as dead code. Tidy up theEM_NONEcases for arm64 indwarf-regs.c.
OK, this seems just a redundant information in tools/perf/arch/arm64/include/dwarf-regs-table.h (there is alredy register number -> name mapping table.)
Looks good to me.
Thank you,
Quoted 145 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/arm64/util/dwarf-regs.c | 80 ------------------------- tools/perf/util/dwarf-regs.c | 4 +- tools/perf/util/include/dwarf-regs.h | 2 +- 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 tools/perf/arch/arm64/util/dwarf-regs.ctools/perf/arch/arm64/util/Build +0
-1@@ -4,7 +4,6 @@ perf-util-y += perf_regs.o perf-util-y += tsc.o perf-util-y += pmu.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/arm64/util/dwarf-regs.c deleted +0
-80@@ -1,80 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* Mapping of DWARF debug register numbers into register names. -* -* Copyright (C) 2010 Will Deacon, ARM Ltd. -*/ - -#include <errno.h> -#include <stddef.h> -#include <string.h> -#include <dwarf-regs.h> -#include <linux/stringify.h> - -struct regs_dwarfnum { -const char *name; -unsigned int dwarfnum; -}; - -#define REG_DWARFNUM_NAME (r, num) {.name = r, .dwarfnum = num} -#define GPR_DWARFNUM_NAME (num) \ - {.name = __stringify(%x##num), .dwarfnum = num} -#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0} - -/* -* Reference: -* http://infocenter.arm.com/help/topic/com.arm.doc.ihi0057b/IHI0057B_aadwarf64.pdf -*/ -static const struct regs_dwarfnum regdwarfnum_table[] = { -GPR_DWARFNUM_NAME (0 ), -GPR_DWARFNUM_NAME (1 ), -GPR_DWARFNUM_NAME (2 ), -GPR_DWARFNUM_NAME (3 ), -GPR_DWARFNUM_NAME (4 ), -GPR_DWARFNUM_NAME (5 ), -GPR_DWARFNUM_NAME (6 ), -GPR_DWARFNUM_NAME (7 ), -GPR_DWARFNUM_NAME (8 ), -GPR_DWARFNUM_NAME (9 ), -GPR_DWARFNUM_NAME (10 ), -GPR_DWARFNUM_NAME (11 ), -GPR_DWARFNUM_NAME (12 ), -GPR_DWARFNUM_NAME (13 ), -GPR_DWARFNUM_NAME (14 ), -GPR_DWARFNUM_NAME (15 ), -GPR_DWARFNUM_NAME (16 ), -GPR_DWARFNUM_NAME (17 ), -GPR_DWARFNUM_NAME (18 ), -GPR_DWARFNUM_NAME (19 ), -GPR_DWARFNUM_NAME (20 ), -GPR_DWARFNUM_NAME (21 ), -GPR_DWARFNUM_NAME (22 ), -GPR_DWARFNUM_NAME (23 ), -GPR_DWARFNUM_NAME (24 ), -GPR_DWARFNUM_NAME (25 ), -GPR_DWARFNUM_NAME (26 ), -GPR_DWARFNUM_NAME (27 ), -GPR_DWARFNUM_NAME (28 ), -GPR_DWARFNUM_NAME (29 ), -REG_DWARFNUM_NAME ("%lr" ,30 ), -REG_DWARFNUM_NAME ("%sp" ,31 ), -REG_DWARFNUM_END , -}; - -/** -* get_arch_regstr() - lookup register name from it's DWARF register number -* @n: the DWARF register number -* -* get_arch_regstr() returns the name of the register in struct -* regdwarfnum_table from it's DWARF register number. If the register is not -* found in the table, this returns NULL; -*/ -const char *get_arch_regstr (unsigned int n) -{ -const struct regs_dwarfnum *roff; - -for (roff = regdwarfnum_table; roff->name !=NULL ; roff++) -if (roff->dwarfnum == n) -return roff->name; -return NULL ; -}tools/perf/util/dwarf-regs.c +2
-2@@ -32,14 +32,14 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags__maybe_unused ) { -#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ; }#endif switch (machine) { -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif tools/perf/util/include/dwarf-regs.h +1
-1@@ -79,7 +79,7 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT -#if !defined(__x86_64__) && !defined(__i386__) +#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__)const char *get_arch_regstr (unsigned int n);#endif Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Ian Rogers
reviewerPATCH v2 20/31 perf arm: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for arm in dwarf-regs.c.
--- tools/perf/arch/arm/util/Build | 2 - tools/perf/arch/arm/util/dwarf-regs.c | 61 --------------------------- tools/perf/util/dwarf-regs.c | 4 +- tools/perf/util/include/dwarf-regs.h | 2 +- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 tools/perf/arch/arm/util/dwarf-regs.c
tools/perf/arch/arm/util/Build +0 -2
@@ -1,7 +1,5 @@ perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o - perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/arm/util/dwarf-regs.c deleted +0 -61
61 lines not on this page · raw message
tools/perf/util/dwarf-regs.c +2 -2
@@ -32,14 +32,14 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags__maybe_unused ) { -#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ; }#endif switch (machine) { -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -79,7 +79,7 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT -#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) +#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 21/31 perf dwarf-regs: Move csky dwarf-regs out of arch
In reply to Ian RogersMove arch/csky/util/dwarf-regs.c to util/dwarf-regs-csky.c and compile in unconditionally. To avoid get_arch_regstr being duplicated, rename to get_csky_regstr and add to get_dwarf_regstr switch.
Update #ifdefs to allow ABI V1 and V2 tables at the same time. Determine the table from the ELF flags.
---
tools/perf/arch/csky/util/Build | 1 -
tools/perf/util/Build | 1 +
.../dwarf-regs.c => util/dwarf-regs-csky.c} | 19 ++++++++++---------
tools/perf/util/dwarf-regs.c | 11 +++++++----
tools/perf/util/include/dwarf-regs.h | 2 ++
5 files changed, 20 insertions(+), 14 deletions(-)
rename tools/perf/{arch/csky/util/dwarf-regs.c => util/dwarf-regs-csky.c} (74%)tools/perf/arch/csky/util/Build +0 -1
@@ -1,4 +1,3 @@ perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/util/Build +1 -0
@@ -202,6 +202,7 @@ endif perf-util-$(CONFIG_LIBDW) += probe-finder.o perf-util-$(CONFIG_LIBDW) += dwarf-aux.o perf-util-$(CONFIG_LIBDW) += dwarf-regs.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.o
tools/perf/util/dwarf-regs-csky.c renamed from tools/perf/arch/csky/util/dwarf-regs.c +10 -9
@@ -5,9 +5,8 @@#include <stddef.h> #include <dwarf-regs.h> -#if defined(__CSKYABIV2__) -#define CSKY_MAX_REGS 73 -const char *csky_dwarf_regs_table[CSKY_MAX_REGS ] = { +#define CSKY_ABIV2_MAX_REGS 73 +const char *csky_dwarf_regs_table_abiv2[CSKY_ABIV2_MAX_REGS ] = {/* r0 ~ r8 */ "%a0" ,"%a1" ,"%a2" ,"%a3" ,"%regs0" ,"%regs1" ,"%regs2" ,"%regs3" ,/* r9 ~ r15 */
@@ -26,9 +25,9 @@ const char *csky_dwarf_regs_table[CSKY_MAX_REGS] = {NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL , "%epc", }; -#else -#define CSKY_MAX_REGS 57 -const char *csky_dwarf_regs_table[CSKY_MAX_REGS ] = { + +#define CSKY_ABIV1_MAX_REGS 57 +const char *csky_dwarf_regs_table_abiv1[CSKY_ABIV1_MAX_REGS ] = {/* r0 ~ r8 */ "%sp" ,"%regs9" ,"%a0" ,"%a1" ,"%a2" ,"%a3" ,"%regs0" ,"%regs1" , /* r9 ~ r15 */
@@ -41,9 +40,11 @@ const char *csky_dwarf_regs_table[CSKY_MAX_REGS] = {NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL , "%epc", }; -#endif -const char *get_arch_regstr (unsigned int n) +const char *get_csky_regstr (unsigned int n,unsigned int flags) { -return (n <CSKY_MAX_REGS ) ? csky_dwarf_regs_table[n] :NULL ; +if (flags &EF_CSKY_ABIV2 ) +return (n <CSKY_ABIV2_MAX_REGS ) ? csky_dwarf_regs_table_abiv2[n] :NULL ; + +return (n <CSKY_ABIV1_MAX_REGS ) ? csky_dwarf_regs_table_abiv1[n] :NULL ; }
tools/perf/util/dwarf-regs.c +7 -4
@@ -29,17 +29,18 @@#define __get_dwarf_regstr (tbl, n) (((n) < ARRAY_SIZE(tbl)) ? (tbl)[(n)] : NULL)/* Return architecture dependent register string (for kprobe-tracer) */ -const char *get_dwarf_regstr (unsigned int n,unsigned int machine, -unsigned int flags__maybe_unused ) +const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags) { -#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM +#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ + ||EM_HOST ==EM_CSKY if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ; }#endif switch (machine) { -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM +#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ + &&EM_HOST !=EM_CSKY case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
@@ -51,6 +52,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine,return __get_dwarf_regstr (arm_regstr_tbl, n);case EM_AARCH64 :return __get_dwarf_regstr (aarch64_regstr_tbl, n); +case EM_CSKY : +return get_csky_regstr (n, flags);case EM_SH :return __get_dwarf_regstr (sh_regstr_tbl, n);case EM_S390 :
tools/perf/util/include/dwarf-regs.h +2 -0
@@ -83,6 +83,8 @@const char *get_arch_regstr (unsigned int n);#endif +const char *get_csky_regstr (unsigned int n,unsigned int flags); +/** * get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. * @n: DWARF register number.
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 22/31 perf loongarch: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for loongarch in dwarf-regs.c.
--- tools/perf/arch/loongarch/util/Build | 1 - tools/perf/arch/loongarch/util/dwarf-regs.c | 34 --------------------- tools/perf/util/dwarf-regs.c | 4 +-- tools/perf/util/include/dwarf-regs.h | 3 +- 4 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 tools/perf/arch/loongarch/util/dwarf-regs.c
tools/perf/arch/loongarch/util/Build +0 -1
@@ -1,7 +1,6 @@ perf-util-y += header.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
tools/perf/arch/loongarch/util/dwarf-regs.c deleted +0 -34
@@ -1,34 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* dwarf-regs.c : Mapping of DWARF debug register numbers into register names. -* -* Copyright (C) 2020-2023 Loongson Technology Corporation Limited -*/ - -#include <stdio.h> -#include <errno.h> /* for EINVAL */ -#include <string.h> /* for strcmp */ -#include <dwarf-regs.h> - -struct pt_regs_dwarfnum { -const char *name; -unsigned int dwarfnum; -}; - -static struct pt_regs_dwarfnum loongarch_gpr_table[] = { - {"%r0" ,0 }, {"%r1" ,1 }, {"%r2" ,2 }, {"%r3" ,3 }, - {"%r4" ,4 }, {"%r5" ,5 }, {"%r6" ,6 }, {"%r7" ,7 }, - {"%r8" ,8 }, {"%r9" ,9 }, {"%r10" ,10 }, {"%r11" ,11 }, - {"%r12" ,12 }, {"%r13" ,13 }, {"%r14" ,14 }, {"%r15" ,15 }, - {"%r16" ,16 }, {"%r17" ,17 }, {"%r18" ,18 }, {"%r19" ,19 }, - {"%r20" ,20 }, {"%r21" ,21 }, {"%r22" ,22 }, {"%r23" ,23 }, - {"%r24" ,24 }, {"%r25" ,25 }, {"%r26" ,26 }, {"%r27" ,27 }, - {"%r28" ,28 }, {"%r29" ,29 }, {"%r30" ,30 }, {"%r31" ,31 }, - {NULL ,0 } -}; - -const char *get_arch_regstr (unsigned int n) -{ - n %=32 ; -return loongarch_gpr_table[n].name; -}
tools/perf/util/dwarf-regs.c +2 -2
@@ -32,7 +32,7 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags) {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ - ||EM_HOST ==EM_CSKY + ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -40,7 +40,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int#endif switch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ - &&EM_HOST !=EM_CSKY + &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +2 -1
@@ -79,7 +79,8 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT -#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) +#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ + && !defined(__loongarch__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 23/31 perf mips: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for mips in dwarf-regs.c.
--- tools/perf/arch/mips/util/Build | 1 - tools/perf/arch/mips/util/dwarf-regs.c | 38 -------------------------- tools/perf/util/dwarf-regs.c | 4 +-- tools/perf/util/include/dwarf-regs.h | 2 +- 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 tools/perf/arch/mips/util/dwarf-regs.c
tools/perf/arch/mips/util/Build +0 -1
@@ -1,3 +1,2 @@ perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
tools/perf/arch/mips/util/dwarf-regs.c deleted +0 -38
@@ -1,38 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* dwarf-regs.c : Mapping of DWARF debug register numbers into register names. -* -* Copyright (C) 2013 Cavium, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -*/ - -#include <stdio.h> -#include <dwarf-regs.h> - -static const char *mips_gpr_names[32 ] = { -"$0" ,"$1" ,"$2" ,"$3" ,"$4" ,"$5" ,"$6" ,"$7" ,"$8" ,"$9" , -"$10" ,"$11" ,"$12" ,"$13" ,"$14" ,"$15" ,"$16" ,"$17" ,"$18" ,"$19" , -"$20" ,"$21" ,"$22" ,"$23" ,"$24" ,"$25" ,"$26" ,"$27" ,"$28" ,"$29" , -"$30" ,"$31" -}; - -const char *get_arch_regstr (unsigned int n) -{ -if (n <32 ) -return mips_gpr_names[n]; -if (n ==64 ) -return "hi" ; -if (n ==65 ) -return "lo" ; -return NULL ; -}
tools/perf/util/dwarf-regs.c +2 -2
@@ -32,7 +32,7 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags) {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ - ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH + ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -40,7 +40,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int#endif switch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ - &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH + &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -80,7 +80,7 @@#ifdef HAVE_LIBDW_SUPPORT #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ - && !defined(__loongarch__) + && !defined(__loongarch__) && !defined(__mips__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 24/31 perf dwarf-regs: Move powerpc dwarf-regs out of arch
In reply to Ian RogersMove arch/powerpc/util/dwarf-regs.c to util/dwarf-regs-powerpc.c and compile in unconditionally. get_arch_regstr is redundant when EM_NONE is treated as EM_HOST so remove and update dwarf-regs.c conditions. Make get_powerpc_regs unconditionally available whwn libdw is.
--- tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/powerpc/util/dwarf-regs.c | 141 ---------------------- tools/perf/util/Build | 1 + tools/perf/util/dwarf-regs-powerpc.c | 61 ++++++++++ tools/perf/util/dwarf-regs.c | 6 +- tools/perf/util/include/dwarf-regs.h | 9 +- 6 files changed, 70 insertions(+), 149 deletions(-) delete mode 100644 tools/perf/arch/powerpc/util/dwarf-regs.c create mode 100644 tools/perf/util/dwarf-regs-powerpc.c
tools/perf/arch/powerpc/util/Build +0 -1
@@ -7,7 +7,6 @@ perf-util-y += sym-handling.o perf-util-y += evsel.o perf-util-y += event.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
tools/perf/arch/powerpc/util/dwarf-regs.c deleted +0 -141
141 lines not on this page · raw message
tools/perf/util/Build +1 -0
@@ -203,6 +203,7 @@ perf-util-$(CONFIG_LIBDW) += probe-finder.o perf-util-$(CONFIG_LIBDW) += dwarf-aux.o perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.o
tools/perf/util/dwarf-regs-powerpc.c new file +61 -0
61 lines not on this page · raw message
tools/perf/util/dwarf-regs.c +4 -2
@@ -32,7 +32,8 @@const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags) {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ - ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS + ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ + ||EM_HOST ==EM_PPC64 if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -40,7 +41,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int#endif switch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ - &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS + &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ + &&EM_HOST !=EM_PPC64 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +4 -5
@@ -80,7 +80,8 @@#ifdef HAVE_LIBDW_SUPPORT #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ - && !defined(__loongarch__) && !defined(__mips__) + && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ + && !defined(__powerpc64__)const char *get_arch_regstr (unsigned int n);#endif
@@ -107,6 +108,8 @@ int get_arch_regnum(const char *name);*/ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags); +void get_powerpc_regs (u32 raw_insn,int is_source,struct annotated_op_loc *op_loc); +#else /* HAVE_LIBDW_SUPPORT */ static inline int get_dwarf_regnum(const char *name __maybe_unused,
@@ -115,16 +118,12 @@ static inline int get_dwarf_regnum(const char *name __maybe_unused, {return -1 ; } -#endif -#if !defined(__powerpc__) || !defined(HAVE_LIBDW_SUPPORT )static inline void get_powerpc_regs (u32 raw_insn__maybe_unused ,int is_source__maybe_unused ,struct annotated_op_loc *op_loc__maybe_unused ) {return ; } -#else -void get_powerpc_regs (u32 raw_insn,int is_source,struct annotated_op_loc *op_loc);#endif #endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 25/31 perf riscv: Remove dwarf-regs.c and add dwarf-regs-table.h
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case, and the register table is provided in a header file, the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for riscv in dwarf-regs.c.
---
.../dwarf-regs-table.h} | 32 ++++---------------
tools/perf/arch/riscv/util/Build | 1 -
tools/perf/util/dwarf-regs.c | 7 ++--
tools/perf/util/include/dwarf-regs.h | 2 +-
4 files changed, 12 insertions(+), 30 deletions(-)
rename tools/perf/arch/riscv/{util/dwarf-regs.c => include/dwarf-regs-table.h} (56%)tools/perf/arch/riscv/include/dwarf-regs-table.h renamed from tools/perf/arch/riscv/util/dwarf-regs.c +6 -26
@@ -1,23 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. -* Mapping of DWARF debug register numbers into register names. -*/ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifdef DEFINE_DWARF_REGSTR_TABLE +/* This is included in perf/util/dwarf-regs.c */ -#include <stddef.h> -#include <errno.h> /* for EINVAL */ -#include <string.h> /* for strcmp */ -#include <dwarf-regs.h> +#define REG_DWARFNUM_NAME (reg, idx) [idx] = "%" #reg -struct regs_dwarfnum { -const char *name; -unsigned int dwarfnum; -}; - -#define REG_DWARFNUM_NAME (r, num) {.name = r, .dwarfnum = num} -#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0} - -struct regs_dwarfnum riscv_dwarf_regs_table[] = { +static const char *const riscv_regstr_tbl[] = {REG_DWARFNUM_NAME ("%zero" ,0 ),REG_DWARFNUM_NAME ("%ra" ,1 ), REG_DWARFNUM_NAME("%sp", 2),
@@ -50,13 +37,6 @@ struct regs_dwarfnum riscv_dwarf_regs_table[] = {REG_DWARFNUM_NAME ("%t4" ,29 ),REG_DWARFNUM_NAME ("%t5" ,30 ), REG_DWARFNUM_NAME("%t6", 31), - REG_DWARFNUM_END, }; -#define RISCV_MAX_REGS ((sizeof(riscv_dwarf_regs_table) / \ - sizeof(riscv_dwarf_regs_table[0])) - 1) - -const char *get_arch_regstr (unsigned int n) -{ -return (n <RISCV_MAX_REGS ) ? riscv_dwarf_regs_table[n].name :NULL ; -} +#endif
tools/perf/arch/riscv/util/Build +0 -1
@@ -2,5 +2,4 @@ perf-util-y += perf_regs.o perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/util/dwarf-regs.c +5 -2
@@ -20,6 +20,7 @@#include "../arch/arm64/include/dwarf-regs-table.h" #include "../arch/sh/include/dwarf-regs-table.h" #include "../arch/powerpc/include/dwarf-regs-table.h" +#include "../arch/riscv/include/dwarf-regs-table.h" #include "../arch/s390/include/dwarf-regs-table.h" #include "../arch/sparc/include/dwarf-regs-table.h" #include "../arch/xtensa/include/dwarf-regs-table.h"
@@ -33,7 +34,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ - ||EM_HOST ==EM_PPC64 + ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -42,7 +43,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intswitch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ - &&EM_HOST !=EM_PPC64 + &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
@@ -63,6 +64,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intcase EM_PPC :case EM_PPC64 :return __get_dwarf_regstr (powerpc_regstr_tbl, n); +case EM_RISCV : +return __get_dwarf_regstr (riscv_regstr_tbl, n);case EM_SPARC :case EM_SPARCV9 :return __get_dwarf_regstr (sparc_regstr_tbl, n);
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -81,7 +81,7 @@#ifdef HAVE_LIBDW_SUPPORT #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ - && !defined(__powerpc64__) + && !defined(__powerpc64__) && !defined(__riscv__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 26/31 perf s390: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for s390 in dwarf-regs.c.
--- tools/perf/arch/s390/util/Build | 1 - tools/perf/arch/s390/util/dwarf-regs.c | 16 ---------------- tools/perf/util/dwarf-regs.c | 4 ++-- tools/perf/util/include/dwarf-regs.h | 2 +- 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 tools/perf/arch/s390/util/dwarf-regs.c
tools/perf/arch/s390/util/Build +0 -1
@@ -2,7 +2,6 @@ perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += machine.o
tools/perf/arch/s390/util/dwarf-regs.c deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Mapping of DWARF debug register numbers into register names. -* -* Copyright IBM Corp. 2010, 2017 -* Author(s): Hendrik Brueckner <[email protected]> -* -*/ - -#include <linux/kernel.h> -#include "dwarf-regs-table.h" - -const char *get_arch_regstr (unsigned int n) -{ -return (n >=ARRAY_SIZE (s390_dwarf_regs)) ?NULL : s390_dwarf_regs[n]; -}
tools/perf/util/dwarf-regs.c +2 -2
@@ -34,7 +34,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ - ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV + ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -43,7 +43,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intswitch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ - &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV + &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -81,7 +81,7 @@#ifdef HAVE_LIBDW_SUPPORT #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ - && !defined(__powerpc64__) && !defined(__riscv__) + && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 27/31 perf sh: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. As this is the only file in the arch/sh/util clean up Build files. Tidy up the EM_NONE cases for sh in dwarf-regs.c.
--- tools/perf/arch/sh/Build | 1 - tools/perf/arch/sh/util/Build | 1 - tools/perf/arch/sh/util/dwarf-regs.c | 41 ---------------------------- tools/perf/util/dwarf-regs.c | 4 +-- tools/perf/util/include/dwarf-regs.h | 2 +- 5 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 tools/perf/arch/sh/Build delete mode 100644 tools/perf/arch/sh/util/Build delete mode 100644 tools/perf/arch/sh/util/dwarf-regs.c
tools/perf/arch/sh/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-util-y += util/
tools/perf/arch/sh/util/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
tools/perf/arch/sh/util/dwarf-regs.c deleted +0 -41
41 lines not on this page · raw message
tools/perf/util/dwarf-regs.c +2 -2
@@ -34,7 +34,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ - ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 + ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 ||EM_HOST ==EM_SH if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -43,7 +43,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intswitch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ - &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 + &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 &&EM_HOST !=EM_SH case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -81,7 +81,7 @@#ifdef HAVE_LIBDW_SUPPORT #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ - && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) + && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) && !defined(__sh__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 28/31 perf sparc: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. As this is the only file in the arch/sparc/util clean up Build files. Tidy up the EM_NONE cases for sparc in dwarf-regs.c.
--- tools/perf/arch/sparc/Build | 1 - tools/perf/arch/sparc/util/Build | 1 - tools/perf/arch/sparc/util/dwarf-regs.c | 39 ------------------------- tools/perf/util/dwarf-regs.c | 6 ++-- tools/perf/util/include/dwarf-regs.h | 3 +- 5 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 tools/perf/arch/sparc/Build delete mode 100644 tools/perf/arch/sparc/util/Build delete mode 100644 tools/perf/arch/sparc/util/dwarf-regs.c
tools/perf/arch/sparc/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-util-y += util/
tools/perf/arch/sparc/util/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
tools/perf/arch/sparc/util/dwarf-regs.c deleted +0 -39
@@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Mapping of DWARF debug register numbers into register names. -* -* Copyright (C) 2010 David S. Miller <[email protected]> -*/ - -#include <stddef.h> -#include <dwarf-regs.h> - -#define SPARC_MAX_REGS 96 - -const char *sparc_regs_table[SPARC_MAX_REGS ] = { -"%g0" ,"%g1" ,"%g2" ,"%g3" ,"%g4" ,"%g5" ,"%g6" ,"%g7" , -"%o0" ,"%o1" ,"%o2" ,"%o3" ,"%o4" ,"%o5" ,"%sp" ,"%o7" , -"%l0" ,"%l1" ,"%l2" ,"%l3" ,"%l4" ,"%l5" ,"%l6" ,"%l7" , -"%i0" ,"%i1" ,"%i2" ,"%i3" ,"%i4" ,"%i5" ,"%fp" ,"%i7" , -"%f0" ,"%f1" ,"%f2" ,"%f3" ,"%f4" ,"%f5" ,"%f6" ,"%f7" , -"%f8" ,"%f9" ,"%f10" ,"%f11" ,"%f12" ,"%f13" ,"%f14" ,"%f15" , -"%f16" ,"%f17" ,"%f18" ,"%f19" ,"%f20" ,"%f21" ,"%f22" ,"%f23" , -"%f24" ,"%f25" ,"%f26" ,"%f27" ,"%f28" ,"%f29" ,"%f30" ,"%f31" , -"%f32" ,"%f33" ,"%f34" ,"%f35" ,"%f36" ,"%f37" ,"%f38" ,"%f39" , -"%f40" ,"%f41" ,"%f42" ,"%f43" ,"%f44" ,"%f45" ,"%f46" ,"%f47" , -"%f48" ,"%f49" ,"%f50" ,"%f51" ,"%f52" ,"%f53" ,"%f54" ,"%f55" , -"%f56" ,"%f57" ,"%f58" ,"%f59" ,"%f60" ,"%f61" ,"%f62" ,"%f63" , -}; - -/** -* get_arch_regstr() - lookup register name from it's DWARF register number -* @n: the DWARF register number -* -* get_arch_regstr() returns the name of the register in struct -* regdwarfnum_table from it's DWARF register number. If the register is not -* found in the table, this returns NULL; -*/ -const char *get_arch_regstr (unsigned int n) -{ -return (n <SPARC_MAX_REGS ) ? sparc_regs_table[n] :NULL ; -}
tools/perf/util/dwarf-regs.c +4 -2
@@ -34,7 +34,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int {#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ - ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 ||EM_HOST ==EM_SH + ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 ||EM_HOST ==EM_SH \ + ||EM_HOST ==EM_SPARC ||EM_HOST ==EM_SPARCV9 if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -43,7 +44,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intswitch (machine) {#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ - &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 &&EM_HOST !=EM_SH + &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 &&EM_HOST !=EM_SH \ + &&EM_HOST !=EM_SPARC &&EM_HOST !=EM_SPARCV9 case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +2 -1
@@ -81,7 +81,8 @@#ifdef HAVE_LIBDW_SUPPORT #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ - && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) && !defined(__sh__) + && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) && !defined(__sh__) \ + && !defined(__sparc64__) && !defined(__sparc__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 29/31 perf xtensa: Remove dwarf-regs.c
In reply to Ian RogersThe file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. As this is the only file in the arch/xtensa/util clean up Build files. Tidy up the EM_NONE cases for xtensa in dwarf-regs.c.
--- tools/perf/arch/xtensa/Build | 1 - tools/perf/arch/xtensa/util/Build | 1 - tools/perf/arch/xtensa/util/dwarf-regs.c | 21 --------------------- tools/perf/util/dwarf-regs.c | 4 ++-- tools/perf/util/include/dwarf-regs.h | 2 +- 5 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 tools/perf/arch/xtensa/Build delete mode 100644 tools/perf/arch/xtensa/util/Build delete mode 100644 tools/perf/arch/xtensa/util/dwarf-regs.c
tools/perf/arch/xtensa/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-util-y += util/
tools/perf/arch/xtensa/util/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-$(CONFIG_LIBDW) += dwarf-regs.o
tools/perf/arch/xtensa/util/dwarf-regs.c deleted +0 -21
@@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Mapping of DWARF debug register numbers into register names. -* -* Copyright (c) 2015 Cadence Design Systems Inc. -*/ - -#include <stddef.h> -#include <dwarf-regs.h> - -#define XTENSA_MAX_REGS 16 - -const char *xtensa_regs_table[XTENSA_MAX_REGS ] = { -"a0" ,"a1" ,"a2" ,"a3" ,"a4" ,"a5" ,"a6" ,"a7" , -"a8" ,"a9" ,"a10" ,"a11" ,"a12" ,"a13" ,"a14" ,"a15" , -}; - -const char *get_arch_regstr (unsigned int n) -{ -return n <XTENSA_MAX_REGS ? xtensa_regs_table[n] :NULL ; -}
tools/perf/util/dwarf-regs.c +2 -2
@@ -35,7 +35,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 ||EM_HOST ==EM_SH \ - ||EM_HOST ==EM_SPARC ||EM_HOST ==EM_SPARCV9 + ||EM_HOST ==EM_SPARC ||EM_HOST ==EM_SPARCV9 ||EM_HOST ==EM_XTENSA if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ;
@@ -45,7 +45,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 &&EM_HOST !=EM_SH \ - &&EM_HOST !=EM_SPARC &&EM_HOST !=EM_SPARCV9 + &&EM_HOST !=EM_SPARC &&EM_HOST !=EM_SPARCV9 &&EM_HOST !=EM_XTENSA case EM_NONE :/* Generic arch - use host arch */ return get_arch_regstr (n);#endif
tools/perf/util/include/dwarf-regs.h +1 -1
@@ -82,7 +82,7 @@#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) && !defined(__sh__) \ - && !defined(__sparc64__) && !defined(__sparc__) + && !defined(__sparc64__) && !defined(__sparc__) && !defined(__xtensa__)const char *get_arch_regstr (unsigned int n);#endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 30/31 perf dwarf-regs: Remove get_arch_regstr code
In reply to Ian Rogersget_arch_regstr no longer exists so remove declaration. Associated ifs and switches are made unconditional.
--- tools/perf/util/dwarf-regs.c | 12 ------------ tools/perf/util/include/dwarf-regs.h | 7 ------- 2 files changed, 19 deletions(-)
tools/perf/util/dwarf-regs.c +0 -12
@@ -32,23 +32,11 @@/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags) { -#if EM_HOST ==EM_X86_64 ||EM_HOST ==EM_386 ||EM_HOST ==EM_AARCH64 ||EM_HOST ==EM_ARM \ - ||EM_HOST ==EM_CSKY ||EM_HOST ==EM_LOONGARCH ||EM_HOST ==EM_MIPS ||EM_HOST ==EM_PPC \ - ||EM_HOST ==EM_PPC64 ||EM_HOST ==EM_RISCV ||EM_HOST ==EM_S390 ||EM_HOST ==EM_SH \ - ||EM_HOST ==EM_SPARC ||EM_HOST ==EM_SPARCV9 ||EM_HOST ==EM_XTENSA if (machine ==EM_NONE ) {/* Generic arch - use host arch */ machine =EM_HOST ; } -#endif switch (machine) { -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 &&EM_HOST !=EM_AARCH64 &&EM_HOST !=EM_ARM \ - &&EM_HOST !=EM_CSKY &&EM_HOST !=EM_LOONGARCH &&EM_HOST !=EM_MIPS &&EM_HOST !=EM_PPC \ - &&EM_HOST !=EM_PPC64 &&EM_HOST !=EM_RISCV &&EM_HOST !=EM_S390 &&EM_HOST !=EM_SH \ - &&EM_HOST !=EM_SPARC &&EM_HOST !=EM_SPARCV9 &&EM_HOST !=EM_XTENSA -case EM_NONE :/* Generic arch - use host arch */ -return get_arch_regstr (n); -#endif case EM_386 :return __get_dwarf_regstr (x86_32_regstr_tbl, n);case EM_X86_64 :
tools/perf/util/include/dwarf-regs.h +0 -7
@@ -79,13 +79,6 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT -#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ - && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ - && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) && !defined(__sh__) \ - && !defined(__sparc64__) && !defined(__sparc__) && !defined(__xtensa__) -const char *get_arch_regstr (unsigned int n); -#endif -const char *get_csky_regstr (unsigned int n,unsigned int flags);/**
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerPATCH v2 31/31 perf build: Remove PERF_HAVE_DWARF_REGS
In reply to Ian RogersPERF_HAVE_DWARF_REGS was true when an architecture had a dwarf-regs.c file. There are no more architecture dwarf-regs.c files, selection is done using constants from the ELF file rather than conditional compilation. When removing PERF_HAVE_DWARF_REGS was the only variable in the Makefile, remove the Makefile.
Add missing SPDX for RISC-V Makefile.
--- tools/perf/Makefile.config | 13 ++++--------- tools/perf/arch/arm/Makefile | 3 --- tools/perf/arch/arm64/Makefile | 3 --- tools/perf/arch/csky/Makefile | 4 ---- tools/perf/arch/loongarch/Makefile | 3 --- tools/perf/arch/mips/Makefile | 4 ---- tools/perf/arch/powerpc/Makefile | 4 ---- tools/perf/arch/riscv/Makefile | 4 +--- tools/perf/arch/s390/Makefile | 3 --- tools/perf/arch/sh/Makefile | 4 ---- tools/perf/arch/sparc/Makefile | 4 ---- tools/perf/arch/x86/Makefile | 3 --- tools/perf/arch/xtensa/Makefile | 4 ---- 13 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 tools/perf/arch/csky/Makefile delete mode 100644 tools/perf/arch/sh/Makefile delete mode 100644 tools/perf/arch/xtensa/Makefile
tools/perf/Makefile.config +4 -9
@@ -548,15 +548,10 @@ ifndef NO_LIBELF endif ifndef NO_LIBDW - ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) - $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled) - NO_LIBDW := 1 - else - CFLAGS += -DHAVE_LIBDW_SUPPORT $(LIBDW_CFLAGS) - LDFLAGS += $(LIBDW_LDFLAGS) - EXTLIBS += ${DWARFLIBS} - $(call detected,CONFIG_LIBDW) - endif # PERF_HAVE_DWARF_REGS + CFLAGS += -DHAVE_LIBDW_SUPPORT $(LIBDW_CFLAGS) + LDFLAGS += $(LIBDW_LDFLAGS) + EXTLIBS += ${DWARFLIBS} + $(call detected,CONFIG_LIBDW) endif # NO_LIBDW ifndef NO_LIBBPF
tools/perf/arch/arm/Makefile +0 -3
@@ -1,5 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif PERF_HAVE_JITDUMP := 1
tools/perf/arch/arm64/Makefile +0 -3
@@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/csky/Makefile deleted +0 -4
@@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif
tools/perf/arch/loongarch/Makefile +0 -3
@@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/mips/Makefile +0 -4
@@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif - # Syscall table generation for perf out := $(OUTPUT)arch/mips/include/generated/asm header := $(out)/syscalls_n64.c
tools/perf/arch/powerpc/Makefile +0 -4
@@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif - HAVE_KVM_STAT_SUPPORT := 1 PERF_HAVE_JITDUMP := 1
tools/perf/arch/riscv/Makefile +1 -3
@@ -1,5 +1,3 @@ -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif +# SPDX-License-Identifier: GPL-2.0 PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1
tools/perf/arch/s390/Makefile +0 -3
@@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif HAVE_KVM_STAT_SUPPORT := 1 PERF_HAVE_JITDUMP := 1
tools/perf/arch/sh/Makefile deleted +0 -4
@@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif
tools/perf/arch/sparc/Makefile +0 -4
@@ -1,6 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif - PERF_HAVE_JITDUMP := 1
tools/perf/arch/x86/Makefile +0 -3
@@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif HAVE_KVM_STAT_SUPPORT := 1 PERF_HAVE_JITDUMP := 1
tools/perf/arch/xtensa/Makefile deleted +0 -4
@@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -ifndef NO_LIBDW -PERF_HAVE_DWARF_REGS := 1 -endif
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog
Ian Rogers
reviewerQuoted 9 lines · Ian Rogers
There patches are on top of:
https://lore.kernel.org/lkml/[email protected]/
where it was pointed out that a lot of the libdw conditional compilation was due to features that have now been standard for 10 or 15 years. The patches remove the conditional compilation assuming the features are in libdw where the feature test is expanded to check there pressence.
Quoted 14 lines
In the
Makefilecode, and forperf record --call-graph, dwarf tends to mean unwind or libdw support for dwarf things. To make it clearer when dwarf really just means libdw numerous build variables and defines are renamed.PERF_HAVE_DWARF_REGSwas particularly tricky and has been removed as it isn't necessary as was somewhat inversely guarding libdw support. TheMakefilevariable indicated an architecture having adwarf-regs.cfile. This file contained code for BPF prologues, which were removed with BPF event support. The files also often just contained a redundantget_arch_regstrfunction. The function was redundant asget_dwarf_regstrwould do the appropriate thing if the ELF machine were given. To removeget_arch_regstrthe ELF machine is computed for the host machine. This now makes the logic work across platforms, but the testing I was able to do across platforms was minimal.
It would be nice if these patches could land as they remove quite a bit of code and complexity. To recap:
1) there are initial patches trying to renaming dwarfy things to libdw things to be more intention revealing. There was some initial concern wrt PERF_HAVE_DWARF_REGS and so the series has now removed that variable as explained next. I believe landing the first part of the patches was agreed upon as okay (Masami/Namhyung).
2) PERF_HAVE_DWARF_REGS indicated the presence of dwarf-regs.c in the arch directory. dwarf-regs.c provided upto 3 functions:
2.1) regs_query_register_offset would translate a register name into a pt_regs offset and was used by BPF prologues. BPF prologues existed for BPF events and support for these was removed many releases ago. This code was dead and could be removed.
2.2) get_arch_regstr duplicated get_dwarf_regstr and so it could be removed as Masami agreed:
https://lore.kernel.org/lkml/[email protected]/
The case for csky was a little more complicated as the ABI controlled the string. The callers of get_dwarf_regstr were updated to also pass the ELF flags so that on csky the appropriate table could be used. As the argument is only used on csky this a no-op for everything else.
2.3) get_arch_regnum translated a register name back to a dwarf number and only existed on x86 where "al", "ax", "eax" and "rax" could all mean register 0. This code was moved to util with similar machine/flags logic to get_arch_regstr and for consistency with it.
2.2 and 2.3 required the wiring through of the ELF machine and flags in callers to get_dwarf_regstr and get_dwarf_regnum. When these values weren't dependent on an ELF file a new EM_HOST and EF_HOST were added to give the host ELF machine and flags. These 2 #defines got rid of the existing separate arch files and #ifdefs.
So what's changed? On most architectures we're now passing ELF flags to get_dwarf_regstr/regnum but these are unused unless we're on csky. There's the get_dwarf_regstr simplification in 2.2, but I think we're agreed that's fine. For 2.3 most of the concern seemed to be whether we should put it in the arch directory or util, I prefer util so that cross-platform perf.data recording/reporting is supported. Other than this there was a call for demonstrating what happens with the wiring up the cross-platform ELF machine/flags. To some extent this worked before this series, this series really just fixes the plumbing so it will work in more EM_NONE machine type cases, etc. Fixing cross-platform isn't the intent of the series, cleaning up the code base is, so I don't think this should gate landing the work. The code is all well tested on the normal non-cross-platform case.
Removing 21 files, 703 lines of code and making the build variables and defines more intention revealing feels like progress, so I'd like for this to land.
Thanks,
Ian
Quoted 159 lines
There is some tech debt in the changes as perf check still reports the values using the old name and for features that are no longer tested. This can be cleanup for another day.
v2: Instead of renaming
PERF_HAVE_DWARF_REGStoPERF_HAVE_LIBDW_REGS,
remove it.Ian Rogers (31):
perf build: Fix !HAVE_DWARF_GETLOCATIONS_SUPPORT
perf build: RenameNO_DWARFtoNO_LIBDW
perf build: Remove defined but never used variable
perf build: Rename test-dwarf to test-libdw
perf build: Combine libdw-dwarf-unwind into libdw feature tests perf build: Combine test-dwarf-getlocations into test-libdw perf build: Combine test-dwarf-getcfi into test-libdw
perf probe: Move elfutils support check to libdw check perf libdw: Remove unnecessary defines
perf build: RenameHAVE_DWARF_SUPPORTtoHAVE_LIBDW_SUPPORTperf build: RenameCONFIG_DWARFtoCONFIG_LIBDW
perf bpf-prologue: Remove unused file
perf dwarf-regs: RemovePERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSETperf dwarf-regs: AddEM_HOSTandEF_HOSTdefines
perf disasm: Add e_machine/e_flags to struct arch
perf dwarf-regs: Pass accurate disassembly machine toget_dwarf_regnumperf dwarf-regs: Pass ELF flags toget_dwarf_regstr
perf dwarf-regs: Move x86 dwarf-regs out of arch
perf arm64: Removedwarf-regs.c
perf arm: Removedwarf-regs.c
perf dwarf-regs: Move csky dwarf-regs out of arch
perf loongarch: Removedwarf-regs.c
perf mips: Removedwarf-regs.c
perf dwarf-regs: Move powerpc dwarf-regs out of arch
perf riscv: Removedwarf-regs.cand adddwarf-regs-table.hperf s390: Removedwarf-regs.c
perf sh: Removedwarf-regs.c
perf sparc: Removedwarf-regs.c
perf xtensa: Removedwarf-regs.c
perf dwarf-regs: Removeget_arch_regstrcode
perf build: RemovePERF_HAVE_DWARF_REGStools/build/Makefile.feature | 11 +- tools/build/feature/Makefile | 24 +-- tools/build/feature/test-all.c | 16 +- tools/build/feature/test-dwarf.c | 11 -- tools/build/feature/test-dwarf_getcfi.c | 9 -- tools/build/feature/test-dwarf_getlocations.c | 13 -- tools/build/feature/test-libdw-dwarf-unwind.c | 14 -- tools/build/feature/test-libdw.c | 56 +++++++ tools/perf/Documentation/perf-check.txt | 6 +- tools/perf/Makefile.config | 58 ++----- tools/perf/Makefile.perf | 2 +- tools/perf/arch/arc/annotate/instructions.c | 2 + tools/perf/arch/arm/Makefile | 3 - tools/perf/arch/arm/annotate/instructions.c | 2 + tools/perf/arch/arm/util/Build | 2 - tools/perf/arch/arm/util/dwarf-regs.c | 61 ------- tools/perf/arch/arm64/Makefile | 4 - tools/perf/arch/arm64/annotate/instructions.c | 2 + tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/arm64/util/dwarf-regs.c | 92 ----------- tools/perf/arch/csky/Makefile | 4 - tools/perf/arch/csky/annotate/instructions.c | 7 +- tools/perf/arch/csky/util/Build | 1 - tools/perf/arch/loongarch/Makefile | 4 - .../arch/loongarch/annotate/instructions.c | 2 + tools/perf/arch/loongarch/util/Build | 1 - tools/perf/arch/loongarch/util/dwarf-regs.c | 44 ----- tools/perf/arch/mips/Makefile | 4 - tools/perf/arch/mips/annotate/instructions.c | 2 + tools/perf/arch/mips/util/Build | 1 - tools/perf/arch/mips/util/dwarf-regs.c | 38 ----- tools/perf/arch/powerpc/Makefile | 5 - .../perf/arch/powerpc/annotate/instructions.c | 6 +- tools/perf/arch/powerpc/util/Build | 3 +- tools/perf/arch/powerpc/util/dwarf-regs.c | 153 ------------------ tools/perf/arch/riscv/Makefile | 5 +- .../arch/riscv/include/dwarf-regs-table.h | 42 +++++ tools/perf/arch/riscv/util/Build | 1 - tools/perf/arch/riscv/util/dwarf-regs.c | 72 --------- .../perf/arch/riscv64/annotate/instructions.c | 2 + tools/perf/arch/s390/Makefile | 4 - tools/perf/arch/s390/annotate/instructions.c | 2 + tools/perf/arch/s390/util/Build | 1 - tools/perf/arch/s390/util/dwarf-regs.c | 43 ----- tools/perf/arch/sh/Build | 1 - tools/perf/arch/sh/Makefile | 4 - tools/perf/arch/sh/util/Build | 1 - tools/perf/arch/sh/util/dwarf-regs.c | 41 ----- tools/perf/arch/sparc/Build | 1 - tools/perf/arch/sparc/Makefile | 4 - tools/perf/arch/sparc/annotate/instructions.c | 2 + tools/perf/arch/sparc/util/Build | 1 - tools/perf/arch/sparc/util/dwarf-regs.c | 39 ----- tools/perf/arch/x86/Makefile | 4 - tools/perf/arch/x86/annotate/instructions.c | 5 +- tools/perf/arch/x86/util/Build | 3 - tools/perf/arch/x86/util/dwarf-regs.c | 153 ------------------ tools/perf/arch/xtensa/Build | 1 - tools/perf/arch/xtensa/Makefile | 4 - tools/perf/arch/xtensa/util/Build | 1 - tools/perf/arch/xtensa/util/dwarf-regs.c | 21 --- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-check.c | 6 +- tools/perf/builtin-probe.c | 14 +- tools/perf/builtin-report.c | 4 +- tools/perf/util/Build | 15 +- tools/perf/util/annotate-data.h | 8 +- tools/perf/util/annotate.c | 6 +- tools/perf/util/bpf-prologue.h | 37 ----- tools/perf/util/debuginfo.h | 6 +- tools/perf/util/disasm.c | 4 +- tools/perf/util/disasm.h | 8 +- tools/perf/util/dwarf-aux.c | 6 - tools/perf/util/dwarf-aux.h | 53 ------ .../dwarf-regs.c => util/dwarf-regs-csky.c} | 19 +-- tools/perf/util/dwarf-regs-powerpc.c | 61 +++++++ tools/perf/util/dwarf-regs-x86.c | 50 ++++++ tools/perf/util/dwarf-regs.c | 38 +++-- tools/perf/util/genelf.c | 4 +- tools/perf/util/genelf.h | 2 +- tools/perf/util/include/dwarf-regs.h | 114 ++++++++++--- tools/perf/util/probe-event.c | 4 +- tools/perf/util/probe-finder.c | 19 +-- tools/perf/util/probe-finder.h | 9 +- 84 files changed, 454 insertions(+), 1157 deletions(-) delete mode 100644 tools/build/feature/test-dwarf.c delete mode 100644 tools/build/feature/test-dwarf_getcfi.c delete mode 100644 tools/build/feature/test-dwarf_getlocations.c delete mode 100644 tools/build/feature/test-libdw-dwarf-unwind.c create mode 100644 tools/build/feature/test-libdw.c delete mode 100644 tools/perf/arch/arm/util/dwarf-regs.c delete mode 100644 tools/perf/arch/arm64/util/dwarf-regs.c delete mode 100644 tools/perf/arch/csky/Makefile delete mode 100644 tools/perf/arch/loongarch/util/dwarf-regs.c delete mode 100644 tools/perf/arch/mips/util/dwarf-regs.c delete mode 100644 tools/perf/arch/powerpc/util/dwarf-regs.c create mode 100644 tools/perf/arch/riscv/include/dwarf-regs-table.h delete mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c delete mode 100644 tools/perf/arch/s390/util/dwarf-regs.c delete mode 100644 tools/perf/arch/sh/Build delete mode 100644 tools/perf/arch/sh/Makefile delete mode 100644 tools/perf/arch/sh/util/Build delete mode 100644 tools/perf/arch/sh/util/dwarf-regs.c delete mode 100644 tools/perf/arch/sparc/Build delete mode 100644 tools/perf/arch/sparc/util/Build delete mode 100644 tools/perf/arch/sparc/util/dwarf-regs.c delete mode 100644 tools/perf/arch/x86/util/dwarf-regs.c delete mode 100644 tools/perf/arch/xtensa/Build delete mode 100644 tools/perf/arch/xtensa/Makefile delete mode 100644 tools/perf/arch/xtensa/util/Build delete mode 100644 tools/perf/arch/xtensa/util/dwarf-regs.c delete mode 100644 tools/perf/util/bpf-prologue.h rename tools/perf/{arch/csky/util/dwarf-regs.c => util/dwarf-regs-csky.c} (74%) create mode 100644 tools/perf/util/dwarf-regs-powerpc.c create mode 100644 tools/perf/util/dwarf-regs-x86.c--
2.47.0.rc0.187.ge670bccf7e-goog