perf evsel: Add accessor for tool_event

Currently tool events use a dedicated variable within the evsel. Later
changes will move this to the unused struct perf_event_attr config for
these events. Add an accessor to allow the later change to be well
typed and avoid changing all uses.

Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20240907050830.6752-4-irogers@google.com
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Yang Jihong <yangjihong@bytedance.com>
Cc: Dominique Martinet <asmadeus@codewreck.org>
Cc: Clément Le Goffic <clement.legoffic@foss.st.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ze Gao <zegao2021@gmail.com>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Junhao He <hejunhao3@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: James Clark <james.clark@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Benjamin Gray <bgray@linux.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Xu Yang <xu.yang_2@nxp.com>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Veronika Molnarova <vmolnaro@redhat.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-perf-users@vger.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index cf985cdb9a6ee58802c3d7c31fbbbdbf0376acc3..689a3d43c2584fe39b42192ef0c4fae6bfb9e937 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -294,14 +294,14 @@ static int read_single_counter(struct evsel *counter, int cpu_map_idx, int threa
         * terminates. Use the wait4 values in that case.
         */
        if (err && cpu_map_idx == 0 &&
-           (counter->tool_event == PERF_TOOL_USER_TIME ||
-            counter->tool_event == PERF_TOOL_SYSTEM_TIME)) {
+           (evsel__tool_event(counter) == PERF_TOOL_USER_TIME ||
+            evsel__tool_event(counter) == PERF_TOOL_SYSTEM_TIME)) {
                u64 val, *start_time;
                struct perf_counts_values *count =
                        perf_counts(counter->counts, cpu_map_idx, thread);
 
                start_time = xyarray__entry(counter->start_times, cpu_map_idx, thread);
-               if (counter->tool_event == PERF_TOOL_USER_TIME)
+               if (evsel__tool_event(counter) == PERF_TOOL_USER_TIME)
                        val = ru_stats.ru_utime_usec_stat.mean;
                else
                        val = ru_stats.ru_stime_usec_stat.mean;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 49cc71511c0c8ce898ad7f1474802762d4ae36a3..dbf9c8cee3c5658f48de3da9ea99ee17e68c5629 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -773,7 +773,7 @@ const char *evsel__name(struct evsel *evsel)
 
        case PERF_TYPE_SOFTWARE:
                if (evsel__is_tool(evsel))
-                       evsel__tool_name(evsel->tool_event, bf, sizeof(bf));
+                       evsel__tool_name(evsel__tool_event(evsel), bf, sizeof(bf));
                else
                        evsel__sw_name(evsel, bf, sizeof(bf));
                break;
@@ -811,7 +811,7 @@ const char *evsel__metric_id(const struct evsel *evsel)
                return evsel->metric_id;
 
        if (evsel__is_tool(evsel))
-               return perf_tool_event__to_str(evsel->tool_event);
+               return perf_tool_event__to_str(evsel__tool_event(evsel));
 
        return "unknown";
 }
@@ -1503,8 +1503,8 @@ void evsel__exit(struct evsel *evsel)
        evsel->per_pkg_mask = NULL;
        zfree(&evsel->metric_events);
        perf_evsel__object.fini(evsel);
-       if (evsel->tool_event == PERF_TOOL_SYSTEM_TIME ||
-           evsel->tool_event == PERF_TOOL_USER_TIME)
+       if (evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME ||
+           evsel__tool_event(evsel) == PERF_TOOL_USER_TIME)
                xyarray__delete(evsel->start_times);
 }
 
@@ -1785,7 +1785,7 @@ static int evsel__read_tool(struct evsel *evsel, int cpu_map_idx, int thread)
 
        count = perf_counts(evsel->counts, cpu_map_idx, thread);
 
-       switch (evsel->tool_event) {
+       switch (evsel__tool_event(evsel)) {
        case PERF_TOOL_DURATION_TIME:
                /*
                 * Pretend duration_time is only on the first CPU and thread, or
@@ -1800,7 +1800,7 @@ static int evsel__read_tool(struct evsel *evsel, int cpu_map_idx, int thread)
                break;
        case PERF_TOOL_USER_TIME:
        case PERF_TOOL_SYSTEM_TIME: {
-               bool system = evsel->tool_event == PERF_TOOL_SYSTEM_TIME;
+               bool system = evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME;
 
                start_time = xyarray__entry(evsel->start_times, cpu_map_idx, thread);
                fd = FD(evsel, cpu_map_idx, thread);
@@ -2072,8 +2072,8 @@ static int __evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,
            perf_evsel__alloc_fd(&evsel->core, perf_cpu_map__nr(cpus), nthreads) < 0)
                return -ENOMEM;
 
-       if ((evsel->tool_event == PERF_TOOL_SYSTEM_TIME ||
-            evsel->tool_event == PERF_TOOL_USER_TIME) &&
+       if ((evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME ||
+            evsel__tool_event(evsel) == PERF_TOOL_USER_TIME) &&
            !evsel->start_times) {
                evsel->start_times = xyarray__new(perf_cpu_map__nr(cpus), nthreads, sizeof(__u64));
                if (!evsel->start_times)
@@ -2262,7 +2262,7 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
        int pid = -1, err, old_errno;
        enum rlimit_action set_rlimit = NO_CHANGE;
 
-       if (evsel->tool_event == PERF_TOOL_DURATION_TIME) {
+       if (evsel__tool_event(evsel) == PERF_TOOL_DURATION_TIME) {
                if (evsel->core.attr.sample_period) /* no sampling */
                        return -EINVAL;
                evsel->start_time = rdclock();
@@ -2304,9 +2304,9 @@ retry_open:
                        if (!evsel->cgrp && !evsel->core.system_wide)
                                pid = perf_thread_map__pid(threads, thread);
 
-                       if (evsel->tool_event == PERF_TOOL_USER_TIME ||
-                           evsel->tool_event == PERF_TOOL_SYSTEM_TIME) {
-                               bool system = evsel->tool_event == PERF_TOOL_SYSTEM_TIME;
+                       if (evsel__tool_event(evsel) == PERF_TOOL_USER_TIME ||
+                           evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME) {
+                               bool system = evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME;
                                __u64 *start_time = NULL;
 
                                if (evsel->core.attr.sample_period) {

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 15acf293e12af71304447473a4e7de0244d2961c..15e745a9a798fa29ef67cef9f03d2bb9616a891d 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -330,6 +330,11 @@ static inline bool evsel__is_retire_lat(const struct evsel *evsel)
        return evsel->retire_lat;
 }
 
+static inline enum perf_tool_event evsel__tool_event(const struct evsel *evsel)
+{
+       return evsel->tool_event;
+}
+
 const char *evsel__group_name(struct evsel *evsel);
 int evsel__group_desc(struct evsel *evsel, char *buf, size_t size);
 

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index 6bb975e46de37e957e1b40b7e0463d4c88b8cdd2..99376c12dd8ec95afca98ce49de7cbadcfcad493 100644 (file)
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -380,7 +380,7 @@ static int prepare_metric(const struct metric_expr *mexp,
                        struct stats *stats;
                        double scale;
 
-                       switch (metric_events[i]->tool_event) {
+                       switch (evsel__tool_event(metric_events[i])) {
                        case PERF_TOOL_DURATION_TIME:
                                stats = &walltime_nsecs_stats;
                                scale = 1e-9;