perf record: fix link time error with sample_reg_masks on non x86
PATCH 1/1 perf record: fix link time error with sample_reg_masks on non x86
This patch makes perf compile on non x86 platforms by defining a weak symbol for sample_reg_masks[] in util/perf_regs.c.
The patch also moves the REG() and REG_END() macros into the util/per_regs.h header file. The macros are renamed to SMPL_REG/SMPL_REG_END to avoid clashes with other header files.
--- tools/perf/arch/x86/util/perf_regs.c | 44 +++++++++++++++++------------------- tools/perf/util/perf_regs.c | 4 ++++ tools/perf/util/perf_regs.h | 2 ++ 3 files changed, 27 insertions(+), 23 deletions(-)
tools/perf/arch/x86/util/perf_regs.c +21 -23
@@ -1,30 +1,28 @@#include "../../perf.h" #include "../../util/perf_regs.h" -#define REG (n, b) { .name = #n, .mask = 1ULL << (b) } -#define REG_END { .name = NULL }const struct sample_reg sample_reg_masks[] = { -REG (AX ,PERF_REG_X86_AX ), -REG (BX ,PERF_REG_X86_BX ), -REG (CX ,PERF_REG_X86_CX ), -REG (DX ,PERF_REG_X86_DX ), -REG (SI ,PERF_REG_X86_SI ), -REG (DI ,PERF_REG_X86_DI ), -REG (BP ,PERF_REG_X86_BP ), -REG (SP ,PERF_REG_X86_SP ), -REG (IP ,PERF_REG_X86_IP ), -REG (FLAGS ,PERF_REG_X86_FLAGS ), -REG (CS ,PERF_REG_X86_CS ), -REG (SS ,PERF_REG_X86_SS ), +SMPL_REG (AX ,PERF_REG_X86_AX ), +SMPL_REG (BX ,PERF_REG_X86_BX ), +SMPL_REG (CX ,PERF_REG_X86_CX ), +SMPL_REG (DX ,PERF_REG_X86_DX ), +SMPL_REG (SI ,PERF_REG_X86_SI ), +SMPL_REG (DI ,PERF_REG_X86_DI ), +SMPL_REG (BP ,PERF_REG_X86_BP ), +SMPL_REG (SP ,PERF_REG_X86_SP ), +SMPL_REG (IP ,PERF_REG_X86_IP ), +SMPL_REG (FLAGS ,PERF_REG_X86_FLAGS ), +SMPL_REG (CS ,PERF_REG_X86_CS ), +SMPL_REG (SS ,PERF_REG_X86_SS ), #ifdef HAVE_ARCH_X86_64_SUPPORT -REG (R8 ,PERF_REG_X86_R8 ), -REG (R9 ,PERF_REG_X86_R9 ), -REG (R10 ,PERF_REG_X86_R10 ), -REG (R11 ,PERF_REG_X86_R11 ), -REG (R12 ,PERF_REG_X86_R12 ), -REG (R13 ,PERF_REG_X86_R13 ), -REG (R14 ,PERF_REG_X86_R14 ), -REG (R15 ,PERF_REG_X86_R15 ), +SMPL_REG (R8 ,PERF_REG_X86_R8 ), +SMPL_REG (R9 ,PERF_REG_X86_R9 ), +SMPL_REG (R10 ,PERF_REG_X86_R10 ), +SMPL_REG (R11 ,PERF_REG_X86_R11 ), +SMPL_REG (R12 ,PERF_REG_X86_R12 ), +SMPL_REG (R13 ,PERF_REG_X86_R13 ), +SMPL_REG (R14 ,PERF_REG_X86_R14 ), +SMPL_REG (R15 ,PERF_REG_X86_R15 ), #endif -REG_END +SMPL_REG_END };
tools/perf/util/perf_regs.c +4 -0
@@ -2,6 +2,10 @@#include "perf_regs.h" #include "event.h" +const struct sample_reg __weak sample_reg_masks[] = { +SMPL_REG_END +}; +int perf_reg_value (u64 *valp,struct regs_dump *regs,int id) {int i, idx =0 ;
tools/perf/util/perf_regs.h +2 -0
@@ -9,6 +9,8 @@ struct sample_reg {const char *name;uint64_t mask; }; +#define SMPL_REG (n, b) { .name = #n, .mask = 1ULL << (b) } +#define SMPL_REG_END { .name = NULL }extern const struct sample_reg sample_reg_masks[];
Signature · 1 line
1.9.1
Quoted 8 lines · Stephane Eranian
This patch makes perf compile on non x86 platforms by defining a weak symbol for sample_reg_masks[] in
util/perf_regs.c.The patch also moves the
REG()andREG_END()macros into theutil/per_regs.hheader file. The macros are renamed to SMPL_REG/SMPL_REG_END to avoid clashes with other header files.Signed-off-by Stephane Eranian <[email protected]>
thanks,
jirka
tip-bot for Stephane Eranian
merge bot[tip:perf/urgent] perf tools: Fix link time error with sample_reg_masks on non x86
In reply to Stephane Eranianperf tools: Fix link time error with sample_reg_masks on non x86
Commit-ID: af4aeadd8c04303c0aa2d112145c3627e2ebd026 Gitweb: http://git.kernel.org/tip/af4aeadd8c04303c0aa2d112145c3627e2ebd026 Author: Stephane Eranian <[email protected]> AuthorDate: Tue, 1 Sep 2015 11:30:14 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 1 Sep 2015 13:04:41 -0300
perf tools: Fix link time error with sample_reg_masks on non x86
This patch makes perf compile on non x86 platforms by defining a weak symbol for sample_reg_masks[] in util/perf_regs.c.
The patch also moves the REG() and REG_END() macros into the util/per_regs.h header file. The macros are renamed to SMPL_REG/SMPL_REG_END to avoid clashes with other header files.
--- tools/perf/arch/x86/util/perf_regs.c | 44 +++++++++++++++++------------------- tools/perf/util/perf_regs.c | 4 ++++ tools/perf/util/perf_regs.h | 2 ++ 3 files changed, 27 insertions(+), 23 deletions(-)
tools/perf/arch/x86/util/perf_regs.c +21 -23
@@ -1,30 +1,28 @@#include "../../perf.h" #include "../../util/perf_regs.h" -#define REG (n, b) { .name = #n, .mask = 1ULL << (b) } -#define REG_END { .name = NULL }const struct sample_reg sample_reg_masks[] = { -REG (AX ,PERF_REG_X86_AX ), -REG (BX ,PERF_REG_X86_BX ), -REG (CX ,PERF_REG_X86_CX ), -REG (DX ,PERF_REG_X86_DX ), -REG (SI ,PERF_REG_X86_SI ), -REG (DI ,PERF_REG_X86_DI ), -REG (BP ,PERF_REG_X86_BP ), -REG (SP ,PERF_REG_X86_SP ), -REG (IP ,PERF_REG_X86_IP ), -REG (FLAGS ,PERF_REG_X86_FLAGS ), -REG (CS ,PERF_REG_X86_CS ), -REG (SS ,PERF_REG_X86_SS ), +SMPL_REG (AX ,PERF_REG_X86_AX ), +SMPL_REG (BX ,PERF_REG_X86_BX ), +SMPL_REG (CX ,PERF_REG_X86_CX ), +SMPL_REG (DX ,PERF_REG_X86_DX ), +SMPL_REG (SI ,PERF_REG_X86_SI ), +SMPL_REG (DI ,PERF_REG_X86_DI ), +SMPL_REG (BP ,PERF_REG_X86_BP ), +SMPL_REG (SP ,PERF_REG_X86_SP ), +SMPL_REG (IP ,PERF_REG_X86_IP ), +SMPL_REG (FLAGS ,PERF_REG_X86_FLAGS ), +SMPL_REG (CS ,PERF_REG_X86_CS ), +SMPL_REG (SS ,PERF_REG_X86_SS ), #ifdef HAVE_ARCH_X86_64_SUPPORT -REG (R8 ,PERF_REG_X86_R8 ), -REG (R9 ,PERF_REG_X86_R9 ), -REG (R10 ,PERF_REG_X86_R10 ), -REG (R11 ,PERF_REG_X86_R11 ), -REG (R12 ,PERF_REG_X86_R12 ), -REG (R13 ,PERF_REG_X86_R13 ), -REG (R14 ,PERF_REG_X86_R14 ), -REG (R15 ,PERF_REG_X86_R15 ), +SMPL_REG (R8 ,PERF_REG_X86_R8 ), +SMPL_REG (R9 ,PERF_REG_X86_R9 ), +SMPL_REG (R10 ,PERF_REG_X86_R10 ), +SMPL_REG (R11 ,PERF_REG_X86_R11 ), +SMPL_REG (R12 ,PERF_REG_X86_R12 ), +SMPL_REG (R13 ,PERF_REG_X86_R13 ), +SMPL_REG (R14 ,PERF_REG_X86_R14 ), +SMPL_REG (R15 ,PERF_REG_X86_R15 ), #endif -REG_END +SMPL_REG_END };
tools/perf/util/perf_regs.c +4 -0
@@ -2,6 +2,10 @@#include "perf_regs.h" #include "event.h" +const struct sample_reg __weak sample_reg_masks[] = { +SMPL_REG_END +}; +int perf_reg_value (u64 *valp,struct regs_dump *regs,int id) {int i, idx =0 ;
tools/perf/util/perf_regs.h +2 -0
@@ -9,6 +9,8 @@ struct sample_reg {const char *name;uint64_t mask; }; +#define SMPL_REG (n, b) { .name = #n, .mask = 1ULL << (b) } +#define SMPL_REG_END { .name = NULL }extern const struct sample_reg sample_reg_masks[];
Adrian Hunter
reviewerQuoted 8 lines · Stephane Eranian
This patch makes perf compile on non x86 platforms by defining a weak symbol for sample_reg_masks[] in
util/perf_regs.c.The patch also moves the
REG()andREG_END()macros into theutil/per_regs.hheader file. The macros are renamed to SMPL_REG/SMPL_REG_END to avoid clashes with other header files.Signed-off-by Stephane Eranian <[email protected]>
Doesn't seem to work on powerpc, presumably because util/perf_regs.c is not built?
$ make CROSS_COMPILE=powerpc-linux-gnu- ARCH=powerpc -C tools/perf >/dev/null config/Makefile:245: No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev config/Makefile:329: Disabling post unwind, no support found. config/Makefile:370: No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev config/Makefile:385: slang not found, disables TUI support. Please install slang-devel or libslang-dev config/Makefile:399: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev config/Makefile:427: Missing perl devel files. Disabling perl scripting support, please install perl-ExtUtils-Embed/libperl-dev config/Makefile:470: No 'Python.h' (for Python 2.x support) was found: disables Python support - please install python-devel/python-dev config/Makefile:560: No liblzma found, disables xz kernel module decompression, please install xz-devel/liblzma-dev config/Makefile:573: No numa.h found, disables 'perf bench numa mem' benchmark, please install numactl-devel/libnuma-devel/libnuma-dev PERF_VERSION = 4.2.g02f9f7 libperf.a(libperf-in.o): In function `parse_regs': /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/parse-regs-options.c:28: undefined reference to `sample_reg_masks' /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/parse-regs-options.c:28: undefined reference to `sample_reg_masks' /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/parse-regs-options.c:45: undefined reference to `sample_reg_masks' /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/parse-regs-options.c:38: undefined reference to `sample_reg_masks' /mnt/ssd/ahunter/git/linux-perf/tools/perf/util/parse-regs-options.c:38: undefined reference to `sample_reg_masks' collect2: error: ld returned 1 exit status make[1]: *** [perf] Error 1 make: *** [all] Error 2