mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
a8af6e48c6
Opening hardware names and a legacy cache event on a hybrid PMU opens it on each PMU. Parsing and checking indexes fails, as the parsed index is double the expected. Avoid checking the index by just comparing the names immediately after the parse. This change removes hard coded hybrid logic and removes assumptions about the expansion of an event. On hybrid the PMUs may or may not support an event and so using a distance isn't a consistent solution. Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Kan Liang <kan.liang@linux.intel.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ahmad Yasin <ahmad.yasin@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Caleb Biggers <caleb.biggers@intel.com> Cc: Edward Baker <edward.baker@intel.com> Cc: Florian Fischer <florian.fischer@muhq.space> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kang Minchul <tegongkang@gmail.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Perry Taylor <perry.taylor@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Rob Herring <robh@kernel.org> Cc: Samantha Alt <samantha.alt@intel.com> Cc: Stephane Eranian <eranian@google.com> Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Weilin Wang <weilin.wang@intel.com> Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com> Cc: Yang Jihong <yangjihong1@huawei.com> Link: https://lore.kernel.org/r/20230502223851.2234828-15-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
104 lines
2.4 KiB
C
104 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "evlist.h"
|
|
#include "evsel.h"
|
|
#include "parse-events.h"
|
|
#include "tests.h"
|
|
#include "debug.h"
|
|
#include <linux/kernel.h>
|
|
|
|
static int perf_evsel__roundtrip_cache_name_test(void)
|
|
{
|
|
int ret = TEST_OK;
|
|
|
|
for (int type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
|
|
for (int op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
|
|
/* skip invalid cache type */
|
|
if (!evsel__is_cache_op_valid(type, op))
|
|
continue;
|
|
|
|
for (int res = 0; res < PERF_COUNT_HW_CACHE_RESULT_MAX; res++) {
|
|
char name[128];
|
|
struct evlist *evlist = evlist__new();
|
|
struct evsel *evsel;
|
|
int err;
|
|
|
|
if (evlist == NULL) {
|
|
pr_debug("Failed to alloc evlist");
|
|
return TEST_FAIL;
|
|
}
|
|
__evsel__hw_cache_type_op_res_name(type, op, res,
|
|
name, sizeof(name));
|
|
|
|
err = parse_event(evlist, name);
|
|
if (err) {
|
|
pr_debug("Failure to parse cache event '%s' possibly as PMUs don't support it",
|
|
name);
|
|
evlist__delete(evlist);
|
|
continue;
|
|
}
|
|
evlist__for_each_entry(evlist, evsel) {
|
|
if (strcmp(evsel__name(evsel), name)) {
|
|
pr_debug("%s != %s\n", evsel__name(evsel), name);
|
|
ret = TEST_FAIL;
|
|
}
|
|
}
|
|
evlist__delete(evlist);
|
|
}
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int perf_evsel__name_array_test(const char *const names[], int nr_names)
|
|
{
|
|
int ret = TEST_OK;
|
|
|
|
for (int i = 0; i < nr_names; ++i) {
|
|
struct evlist *evlist = evlist__new();
|
|
struct evsel *evsel;
|
|
int err;
|
|
|
|
if (evlist == NULL) {
|
|
pr_debug("Failed to alloc evlist");
|
|
return TEST_FAIL;
|
|
}
|
|
err = parse_event(evlist, names[i]);
|
|
if (err) {
|
|
pr_debug("failed to parse event '%s', err %d\n",
|
|
names[i], err);
|
|
evlist__delete(evlist);
|
|
ret = TEST_FAIL;
|
|
continue;
|
|
}
|
|
evlist__for_each_entry(evlist, evsel) {
|
|
if (strcmp(evsel__name(evsel), names[i])) {
|
|
pr_debug("%s != %s\n", evsel__name(evsel), names[i]);
|
|
ret = TEST_FAIL;
|
|
}
|
|
}
|
|
evlist__delete(evlist);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int test__perf_evsel__roundtrip_name_test(struct test_suite *test __maybe_unused,
|
|
int subtest __maybe_unused)
|
|
{
|
|
int err = 0, ret = TEST_OK;
|
|
|
|
err = perf_evsel__name_array_test(evsel__hw_names, PERF_COUNT_HW_MAX);
|
|
if (err)
|
|
ret = err;
|
|
|
|
err = perf_evsel__name_array_test(evsel__sw_names, PERF_COUNT_SW_DUMMY + 1);
|
|
if (err)
|
|
ret = err;
|
|
|
|
err = perf_evsel__roundtrip_cache_name_test();
|
|
if (err)
|
|
ret = err;
|
|
|
|
return ret;
|
|
}
|
|
|
|
DEFINE_SUITE("Roundtrip evsel->name", perf_evsel__roundtrip_name_test);
|