lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 4/5] perf/tools: Pass pmu_event structure as a parameter for arch_get_runtimeparam
    Date
    This patch adds passing of  pmu_event as a parameter in function
    'arch_get_runtimeparam' which can be used to get details like
    if the event is percore/perchip.

    Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
    Acked-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/arch/powerpc/util/header.c | 7 +++++--
    tools/perf/util/metricgroup.c | 5 ++---
    tools/perf/util/metricgroup.h | 3 ++-
    3 files changed, 9 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
    index d4870074f14c..c8a33120a7a3 100644
    --- a/tools/perf/arch/powerpc/util/header.c
    +++ b/tools/perf/arch/powerpc/util/header.c
    @@ -47,8 +47,11 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
    return bufp;
    }

    -int arch_get_runtimeparam(void)
    +int arch_get_runtimeparam(struct pmu_event *pe)
    {
    int count;
    - return sysfs__read_int("/devices/hv_24x7/interface/sockets", &count) < 0 ? 1 : count;
    + char path[PATH_MAX] = "/devices/hv_24x7/interface/";
    +
    + atoi(pe->aggr_mode) == PerChip ? strcat(path, "sockets") : strcat(path, "coresperchip");
    + return sysfs__read_int(path, &count) < 0 ? 1 : count;
    }
    diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
    index 82fecb5a302d..58054588f599 100644
    --- a/tools/perf/util/metricgroup.c
    +++ b/tools/perf/util/metricgroup.c
    @@ -15,7 +15,6 @@
    #include "rblist.h"
    #include <string.h>
    #include <errno.h>
    -#include "pmu-events/pmu-events.h"
    #include "strlist.h"
    #include <assert.h>
    #include <linux/ctype.h>
    @@ -566,7 +565,7 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)
    return false;
    }

    -int __weak arch_get_runtimeparam(void)
    +int __weak arch_get_runtimeparam(struct pmu_event *pe __maybe_unused)
    {
    return 1;
    }
    @@ -650,7 +649,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,
    } else {
    int j, count;

    - count = arch_get_runtimeparam();
    + count = arch_get_runtimeparam(pe);

    /* This loop is added to create multiple
    * events depend on count value and add
    diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
    index 8315bd1a7da4..3917b5e43ebb 100644
    --- a/tools/perf/util/metricgroup.h
    +++ b/tools/perf/util/metricgroup.h
    @@ -5,6 +5,7 @@
    #include <linux/list.h>
    #include <linux/rbtree.h>
    #include <stdbool.h>
    +#include "pmu-events/pmu-events.h"

    struct evsel;
    struct evlist;
    @@ -46,6 +47,6 @@ int metricgroup__parse_groups_test(struct evlist *evlist,
    void metricgroup__print(bool metrics, bool groups, char *filter,
    bool raw, bool details);
    bool metricgroup__has_metric(const char *metric);
    -int arch_get_runtimeparam(void);
    +int arch_get_runtimeparam(struct pmu_event *pe __maybe_unused);
    void metricgroup__rblist_exit(struct rblist *metric_events);
    #endif
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-07-20 09:03    [W:2.355 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site