lkml.org 
[lkml]   [2023]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 4/5] perf parse-regs: Remove PERF_REGS_{MAX|MASK} from common code
    Date
    The macros PERF_REGS_MAX and PERF_REGS_MASK are architecture specific,
    let's remove them from the common file util/perf_regs.c.

    As a side effect, the weak functions arch__intr_reg_mask() and
    arch__user_reg_mask() just return zeros, every arch defines its own
    functions in the 'arch' folder for returning right values.

    Signed-off-by: Leo Yan <leo.yan@linaro.org>
    ---
    tools/perf/arch/arm/util/perf_regs.c | 10 ++++++++++
    tools/perf/arch/arm64/util/perf_regs.c | 5 +++++
    tools/perf/arch/csky/util/perf_regs.c | 10 ++++++++++
    tools/perf/arch/mips/util/perf_regs.c | 10 ++++++++++
    tools/perf/arch/powerpc/util/perf_regs.c | 5 +++++
    tools/perf/arch/riscv/util/perf_regs.c | 10 ++++++++++
    tools/perf/arch/s390/util/perf_regs.c | 10 ++++++++++
    tools/perf/arch/x86/util/perf_regs.c | 5 +++++
    tools/perf/util/evsel.c | 2 +-
    tools/perf/util/perf_regs.c | 4 ++--
    tools/perf/util/perf_regs.h | 4 +---
    11 files changed, 69 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/arch/arm/util/perf_regs.c b/tools/perf/arch/arm/util/perf_regs.c
    index 37aa3a2091bd..0d669dba08c4 100644
    --- a/tools/perf/arch/arm/util/perf_regs.c
    +++ b/tools/perf/arch/arm/util/perf_regs.c
    @@ -5,6 +5,16 @@ const struct sample_reg sample_reg_masks[] = {
    SMPL_REG_END
    };

    +uint64_t arch__intr_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_ARM_PC;
    diff --git a/tools/perf/arch/arm64/util/perf_regs.c b/tools/perf/arch/arm64/util/perf_regs.c
    index dbe7f00b222b..4490c1b5ea51 100644
    --- a/tools/perf/arch/arm64/util/perf_regs.c
    +++ b/tools/perf/arch/arm64/util/perf_regs.c
    @@ -139,6 +139,11 @@ int arch_sdt_arg_parse_op(char *old_op, char **new_op)
    return SDT_ARG_VALID;
    }

    +uint64_t arch__intr_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__user_reg_mask(void)
    {
    struct perf_event_attr attr = {
    diff --git a/tools/perf/arch/csky/util/perf_regs.c b/tools/perf/arch/csky/util/perf_regs.c
    index d230d7e640fd..35755811316e 100644
    --- a/tools/perf/arch/csky/util/perf_regs.c
    +++ b/tools/perf/arch/csky/util/perf_regs.c
    @@ -5,6 +5,16 @@ const struct sample_reg sample_reg_masks[] = {
    SMPL_REG_END
    };

    +uint64_t arch__intr_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_CSKY_PC;
    diff --git a/tools/perf/arch/mips/util/perf_regs.c b/tools/perf/arch/mips/util/perf_regs.c
    index 64882ebc9287..2d2bfbb96182 100644
    --- a/tools/perf/arch/mips/util/perf_regs.c
    +++ b/tools/perf/arch/mips/util/perf_regs.c
    @@ -5,6 +5,16 @@ const struct sample_reg sample_reg_masks[] = {
    SMPL_REG_END
    };

    +uint64_t arch__intr_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_MIPS_PC;
    diff --git a/tools/perf/arch/powerpc/util/perf_regs.c b/tools/perf/arch/powerpc/util/perf_regs.c
    index c84cd79986a8..e48622d1bc59 100644
    --- a/tools/perf/arch/powerpc/util/perf_regs.c
    +++ b/tools/perf/arch/powerpc/util/perf_regs.c
    @@ -227,6 +227,11 @@ uint64_t arch__intr_reg_mask(void)
    return mask;
    }

    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_POWERPC_NIP;
    diff --git a/tools/perf/arch/riscv/util/perf_regs.c b/tools/perf/arch/riscv/util/perf_regs.c
    index 13bbddd139d0..a2aaa46ef741 100644
    --- a/tools/perf/arch/riscv/util/perf_regs.c
    +++ b/tools/perf/arch/riscv/util/perf_regs.c
    @@ -5,6 +5,16 @@ const struct sample_reg sample_reg_masks[] = {
    SMPL_REG_END
    };

    +uint64_t arch__intr_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_RISCV_PC;
    diff --git a/tools/perf/arch/s390/util/perf_regs.c b/tools/perf/arch/s390/util/perf_regs.c
    index 9b2297471090..8d79f8c50f4c 100644
    --- a/tools/perf/arch/s390/util/perf_regs.c
    +++ b/tools/perf/arch/s390/util/perf_regs.c
    @@ -5,6 +5,16 @@ const struct sample_reg sample_reg_masks[] = {
    SMPL_REG_END
    };

    +uint64_t arch__intr_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_S390_PC;
    diff --git a/tools/perf/arch/x86/util/perf_regs.c b/tools/perf/arch/x86/util/perf_regs.c
    index c752a6e9cba6..a7e21f2a8964 100644
    --- a/tools/perf/arch/x86/util/perf_regs.c
    +++ b/tools/perf/arch/x86/util/perf_regs.c
    @@ -313,6 +313,11 @@ uint64_t arch__intr_reg_mask(void)
    return PERF_REGS_MASK;
    }

    +uint64_t arch__user_reg_mask(void)
    +{
    + return PERF_REGS_MASK;
    +}
    +
    uint64_t arch__reg_ip(void)
    {
    return PERF_REG_X86_IP;
    diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
    index 356c07f03be6..bef415072a27 100644
    --- a/tools/perf/util/evsel.c
    +++ b/tools/perf/util/evsel.c
    @@ -933,7 +933,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o
    if (!function) {
    evsel__set_sample_bit(evsel, REGS_USER);
    evsel__set_sample_bit(evsel, STACK_USER);
    - if (opts->sample_user_regs && DWARF_MINIMAL_REGS != PERF_REGS_MASK) {
    + if (opts->sample_user_regs && DWARF_MINIMAL_REGS != arch__user_reg_mask()) {
    attr->sample_regs_user |= DWARF_MINIMAL_REGS;
    pr_warning("WARNING: The use of --call-graph=dwarf may require all the user registers, "
    "specifying a subset with --user-regs may render DWARF unwinding unreliable, "
    diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c
    index 334c9a2b785d..6698b9d2b32a 100644
    --- a/tools/perf/util/perf_regs.c
    +++ b/tools/perf/util/perf_regs.c
    @@ -12,12 +12,12 @@ int __weak arch_sdt_arg_parse_op(char *old_op __maybe_unused,

    uint64_t __weak arch__intr_reg_mask(void)
    {
    - return PERF_REGS_MASK;
    + return 0;
    }

    uint64_t __weak arch__user_reg_mask(void)
    {
    - return PERF_REGS_MASK;
    + return 0;
    }

    uint64_t __weak arch__reg_ip(void)
    diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h
    index 0a1460aaad37..43b5a6d40e58 100644
    --- a/tools/perf/util/perf_regs.h
    +++ b/tools/perf/util/perf_regs.h
    @@ -48,10 +48,8 @@ const char *__perf_reg_name_s390(int id);
    const char *__perf_reg_name_x86(int id);

    #else
    -#define PERF_REGS_MASK 0
    -#define PERF_REGS_MAX 0

    -#define DWARF_MINIMAL_REGS PERF_REGS_MASK
    +#define DWARF_MINIMAL_REGS 0

    static inline const char *perf_reg_name(int id __maybe_unused, const char *arch __maybe_unused)
    {
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-05-20 04:57    [W:2.408 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site