From: "Liang, Kan" <kan.liang@linux.intel.com>
To: Ian Rogers <irogers@google.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Ahmad Yasin <ahmad.yasin@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Stephane Eranian <eranian@google.com>,
Andi Kleen <ak@linux.intel.com>,
Perry Taylor <perry.taylor@intel.com>,
Samantha Alt <samantha.alt@intel.com>,
Caleb Biggers <caleb.biggers@intel.com>,
Weilin Wang <weilin.wang@intel.com>,
Edward Baker <edward.baker@intel.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Florian Fischer <florian.fischer@muhq.space>,
Rob Herring <robh@kernel.org>,
Zhengjun Xing <zhengjun.xing@linux.intel.com>,
John Garry <john.g.garry@oracle.com>,
Kajol Jain <kjain@linux.ibm.com>,
Sumanth Korikkar <sumanthk@linux.ibm.com>,
Thomas Richter <tmricht@linux.ibm.com>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Leo Yan <leo.yan@linaro.org>,
Yang Jihong <yangjihong1@huawei.com>,
James Clark <james.clark@arm.com>,
Suzuki Poulouse <suzuki.poulose@arm.com>,
Kang Minchul <tegongkang@gmail.com>,
Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1 18/40] perf test: Move x86 hybrid tests to arch/x86
Date: Thu, 27 Apr 2023 17:42:30 -0400 [thread overview]
Message-ID: <4fbbe5bf-2f7d-8aa3-62b1-72829f75e009@linux.intel.com> (raw)
In-Reply-To: <20230426070050.1315519-19-irogers@google.com>
On 2023-04-26 3:00 a.m., Ian Rogers wrote:
> The tests use x86 hybrid specific PMUs.
Failed on my ADL.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/arch/x86/include/arch-tests.h | 1 +
> tools/perf/arch/x86/tests/Build | 1 +
> tools/perf/arch/x86/tests/arch-tests.c | 10 +
> tools/perf/arch/x86/tests/hybrid.c | 277 +++++++++++++++++++++++
> tools/perf/tests/parse-events.c | 181 ---------------
> 5 files changed, 289 insertions(+), 181 deletions(-)
> create mode 100644 tools/perf/arch/x86/tests/hybrid.c
>
> diff --git a/tools/perf/arch/x86/include/arch-tests.h b/tools/perf/arch/x86/include/arch-tests.h
> index 902e9ea9b99e..33d39c1d3e64 100644
> --- a/tools/perf/arch/x86/include/arch-tests.h
> +++ b/tools/perf/arch/x86/include/arch-tests.h
> @@ -11,6 +11,7 @@ int test__intel_pt_pkt_decoder(struct test_suite *test, int subtest);
> int test__intel_pt_hybrid_compat(struct test_suite *test, int subtest);
> int test__bp_modify(struct test_suite *test, int subtest);
> int test__x86_sample_parsing(struct test_suite *test, int subtest);
> +int test__hybrid(struct test_suite *test, int subtest);
>
> extern struct test_suite *arch_tests[];
>
> diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Build
> index 6f4e8636c3bf..08cc8b9c931e 100644
> --- a/tools/perf/arch/x86/tests/Build
> +++ b/tools/perf/arch/x86/tests/Build
> @@ -3,5 +3,6 @@ perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
>
> perf-y += arch-tests.o
> perf-y += sample-parsing.o
> +perf-y += hybrid.o
> perf-$(CONFIG_AUXTRACE) += insn-x86.o intel-pt-test.o
> perf-$(CONFIG_X86_64) += bp-modify.o
> diff --git a/tools/perf/arch/x86/tests/arch-tests.c b/tools/perf/arch/x86/tests/arch-tests.c
> index aae6ea0fe52b..147ad0638bbb 100644
> --- a/tools/perf/arch/x86/tests/arch-tests.c
> +++ b/tools/perf/arch/x86/tests/arch-tests.c
> @@ -22,6 +22,15 @@ struct test_suite suite__intel_pt = {
> DEFINE_SUITE("x86 bp modify", bp_modify);
> #endif
> DEFINE_SUITE("x86 Sample parsing", x86_sample_parsing);
> +static struct test_case hybrid_tests[] = {
> + TEST_CASE_REASON("x86 hybrid event parsing", hybrid, "not hybrid"),
> + { .name = NULL, }
> +};
> +
> +struct test_suite suite__hybrid = {
> + .desc = "x86 hybrid",
> + .test_cases = hybrid_tests,
> +};
>
> struct test_suite *arch_tests[] = {
> #ifdef HAVE_DWARF_UNWIND_SUPPORT
> @@ -35,5 +44,6 @@ struct test_suite *arch_tests[] = {
> &suite__bp_modify,
> #endif
> &suite__x86_sample_parsing,
> + &suite__hybrid,
> NULL,
> };
> diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests/hybrid.c
> new file mode 100644
> index 000000000000..0f99cfd116ee
> --- /dev/null
> +++ b/tools/perf/arch/x86/tests/hybrid.c
> @@ -0,0 +1,277 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include "arch-tests.h"
> +#include "debug.h"
> +#include "evlist.h"
> +#include "evsel.h"
> +#include "pmu-hybrid.h"
> +#include "tests/tests.h"
> +
> +static bool test_config(const struct evsel *evsel, __u64 expected_config)
> +{
> + return (evsel->core.attr.config & PERF_HW_EVENT_MASK) == expected_config;
> +}
> +
> +static int test__hybrid_hw_event_with_pmu(struct evlist *evlist)
> +{
> + struct evsel *evsel = evlist__first(evlist);
> +
> + TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_hw_group_event(struct evlist *evlist)
> +{
> + struct evsel *evsel, *leader;
> +
> + evsel = leader = evlist__first(evlist);
> + TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
The type should be PERF_TYPE_HARDWARE not PERF_TYPE_RAW. The real hybrid
PMU type can be found in the high 32 of attr.config.
/*
* attr.config layout for type PERF_TYPE_HARDWARE and PERF_TYPE_HW_CACHE
* PERF_TYPE_HARDWARE: 0xEEEEEEEE000000AA
* AA: hardware event ID
* EEEEEEEE: PMU type ID
Something as below should work.
diff --git a/tools/perf/arch/x86/tests/hybrid.c
b/tools/perf/arch/x86/tests/hybrid.c
index 66486335652f..6497c3f0801a 100644
--- a/tools/perf/arch/x86/tests/hybrid.c
+++ b/tools/perf/arch/x86/tests/hybrid.c
@@ -16,13 +16,19 @@ static bool test_perf_config(const struct perf_evsel
*evsel, __u64 expected_conf
return (evsel->attr.config & PERF_HW_EVENT_MASK) == expected_config;
}
+static bool test_hybrid_type(const struct evsel *evsel, __u64
expected_config)
+{
+ return (evsel->core.attr.config >> PERF_PMU_TYPE_SHIFT) ==
expected_config;
+}
+
static int test__hybrid_hw_event_with_pmu(struct evlist *evlist)
{
struct evsel *evsel = evlist__first(evlist);
TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_CPU_CYCLES));
return TEST_OK;
}
@@ -32,13 +38,15 @@ static int test__hybrid_hw_group_event(struct evlist
*evlist)
evsel = leader = evlist__first(evlist);
TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_CPU_CYCLES));
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
evsel = evsel__next(evsel);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0xc0));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_INSTRUCTIONS));
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
return TEST_OK;
}
@@ -51,10 +59,10 @@ static int test__hybrid_sw_hw_group_event(struct
evlist *evlist)
TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE ==
evsel->core.attr.type);
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
-
evsel = evsel__next(evsel);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_CPU_CYCLES));
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
return TEST_OK;
}
@@ -65,8 +73,9 @@ static int test__hybrid_hw_sw_group_event(struct
evlist *evlist)
evsel = leader = evlist__first(evlist);
TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_CPU_CYCLES));
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
evsel = evsel__next(evsel);
@@ -81,15 +90,17 @@ static int test__hybrid_group_modifier1(struct
evlist *evlist)
evsel = leader = evlist__first(evlist);
TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_CPU_CYCLES));
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
TEST_ASSERT_VAL("wrong exclude_user", evsel->core.attr.exclude_user);
TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);
evsel = evsel__next(evsel);
- TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
- TEST_ASSERT_VAL("wrong config", test_config(evsel, 0xc0));
+ TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE ==
evsel->core.attr.type);
+ TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel,
PERF_TYPE_RAW));
+ TEST_ASSERT_VAL("wrong config", test_config(evsel,
PERF_COUNT_HW_INSTRUCTIONS));
TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
Thanks,
Kan
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> +
> + evsel = evsel__next(evsel);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0xc0));
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_sw_hw_group_event(struct evlist *evlist)
> +{
> + struct evsel *evsel, *leader;
> +
> + evsel = leader = evlist__first(evlist);
> + TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> +
> + evsel = evsel__next(evsel);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_hw_sw_group_event(struct evlist *evlist)
> +{
> + struct evsel *evsel, *leader;
> +
> + evsel = leader = evlist__first(evlist);
> + TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> +
> + evsel = evsel__next(evsel);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_group_modifier1(struct evlist *evlist)
> +{
> + struct evsel *evsel, *leader;
> +
> + evsel = leader = evlist__first(evlist);
> + TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->core.attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);
> +
> + evsel = evsel__next(evsel);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0xc0));
> + TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> + TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_raw1(struct evlist *evlist)
> +{
> + struct evsel *evsel = evlist__first(evlist);
> +
> + if (!perf_pmu__hybrid_mounted("cpu_atom")) {
> + TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> + return TEST_OK;
> + }
> +
> + TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> +
> + /* The type of second event is randome value */
> + evsel = evsel__next(evsel);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_raw2(struct evlist *evlist)
> +{
> + struct evsel *evsel = evlist__first(evlist);
> +
> + TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> + return TEST_OK;
> +}
> +
> +static int test__hybrid_cache_event(struct evlist *evlist)
> +{
> + struct evsel *evsel = evlist__first(evlist);
> +
> + TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", 0x2 == (evsel->core.attr.config & 0xffffffff));
> + return TEST_OK;
> +}
> +
> +static int test__checkevent_pmu(struct evlist *evlist)
> +{
> +
> + struct evsel *evsel = evlist__first(evlist);
> +
> + TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", 10 == evsel->core.attr.config);
> + TEST_ASSERT_VAL("wrong config1", 1 == evsel->core.attr.config1);
> + TEST_ASSERT_VAL("wrong config2", 3 == evsel->core.attr.config2);
> + TEST_ASSERT_VAL("wrong config3", 0 == evsel->core.attr.config3);
> + /*
> + * The period value gets configured within evlist__config,
> + * while this test executes only parse events method.
> + */
> + TEST_ASSERT_VAL("wrong period", 0 == evsel->core.attr.sample_period);
> +
> + return TEST_OK;
> +}
> +
> +struct evlist_test {
> + const char *name;
> + bool (*valid)(void);
> + int (*check)(struct evlist *evlist);
> +};
> +
> +static const struct evlist_test test__hybrid_events[] = {
> + {
> + .name = "cpu_core/cpu-cycles/",
> + .check = test__hybrid_hw_event_with_pmu,
> + /* 0 */
> + },
> + {
> + .name = "{cpu_core/cpu-cycles/,cpu_core/instructions/}",
> + .check = test__hybrid_hw_group_event,
> + /* 1 */
> + },
> + {
> + .name = "{cpu-clock,cpu_core/cpu-cycles/}",
> + .check = test__hybrid_sw_hw_group_event,
> + /* 2 */
> + },
> + {
> + .name = "{cpu_core/cpu-cycles/,cpu-clock}",
> + .check = test__hybrid_hw_sw_group_event,
> + /* 3 */
> + },
> + {
> + .name = "{cpu_core/cpu-cycles/k,cpu_core/instructions/u}",
> + .check = test__hybrid_group_modifier1,
> + /* 4 */
> + },
> + {
> + .name = "r1a",
> + .check = test__hybrid_raw1,
> + /* 5 */
> + },
> + {
> + .name = "cpu_core/r1a/",
> + .check = test__hybrid_raw2,
> + /* 6 */
> + },
> + {
> + .name = "cpu_core/config=10,config1,config2=3,period=1000/u",
> + .check = test__checkevent_pmu,
> + /* 7 */
> + },
> + {
> + .name = "cpu_core/LLC-loads/",
> + .check = test__hybrid_cache_event,
> + /* 8 */
> + },
> +};
> +
> +static int test_event(const struct evlist_test *e)
> +{
> + struct parse_events_error err;
> + struct evlist *evlist;
> + int ret;
> +
> + if (e->valid && !e->valid()) {
> + pr_debug("... SKIP\n");
> + return TEST_OK;
> + }
> +
> + evlist = evlist__new();
> + if (evlist == NULL) {
> + pr_err("Failed allocation");
> + return TEST_FAIL;
> + }
> + parse_events_error__init(&err);
> + ret = parse_events(evlist, e->name, &err);
> + if (ret) {
> + pr_debug("failed to parse event '%s', err %d, str '%s'\n",
> + e->name, ret, err.str);
> + parse_events_error__print(&err, e->name);
> + ret = TEST_FAIL;
> + if (strstr(err.str, "can't access trace events"))
> + ret = TEST_SKIP;
> + } else {
> + ret = e->check(evlist);
> + }
> + parse_events_error__exit(&err);
> + evlist__delete(evlist);
> +
> + return ret;
> +}
> +
> +static int combine_test_results(int existing, int latest)
> +{
> + if (existing == TEST_FAIL)
> + return TEST_FAIL;
> + if (existing == TEST_SKIP)
> + return latest == TEST_OK ? TEST_SKIP : latest;
> + return latest;
> +}
> +
> +static int test_events(const struct evlist_test *events, int cnt)
> +{
> + int ret = TEST_OK;
> +
> + for (int i = 0; i < cnt; i++) {
> + const struct evlist_test *e = &events[i];
> + int test_ret;
> +
> + pr_debug("running test %d '%s'\n", i, e->name);
> + test_ret = test_event(e);
> + if (test_ret != TEST_OK) {
> + pr_debug("Event test failure: test %d '%s'", i, e->name);
> + ret = combine_test_results(ret, test_ret);
> + }
> + }
> +
> + return ret;
> +}
> +
> +int test__hybrid(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
> +{
> + if (!perf_pmu__has_hybrid())
> + return TEST_SKIP;
> +
> + return test_events(test__hybrid_events, ARRAY_SIZE(test__hybrid_events));
> +}
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index cb976765b8b0..15fec7f01315 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -6,7 +6,6 @@
> #include "tests.h"
> #include "debug.h"
> #include "pmu.h"
> -#include "pmu-hybrid.h"
> #include "pmus.h"
> #include <dirent.h>
> #include <errno.h>
> @@ -1509,127 +1508,6 @@ static int test__all_tracepoints(struct evlist *evlist)
> }
> #endif /* HAVE_LIBTRACEVENT */
>
> -static int test__hybrid_hw_event_with_pmu(struct evlist *evlist)
> -{
> - struct evsel *evsel = evlist__first(evlist);
> -
> - TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_hw_group_event(struct evlist *evlist)
> -{
> - struct evsel *evsel, *leader;
> -
> - evsel = leader = evlist__first(evlist);
> - TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> -
> - evsel = evsel__next(evsel);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0xc0));
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_sw_hw_group_event(struct evlist *evlist)
> -{
> - struct evsel *evsel, *leader;
> -
> - evsel = leader = evlist__first(evlist);
> - TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> -
> - evsel = evsel__next(evsel);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_hw_sw_group_event(struct evlist *evlist)
> -{
> - struct evsel *evsel, *leader;
> -
> - evsel = leader = evlist__first(evlist);
> - TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> -
> - evsel = evsel__next(evsel);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_group_modifier1(struct evlist *evlist)
> -{
> - struct evsel *evsel, *leader;
> -
> - evsel = leader = evlist__first(evlist);
> - TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x3c));
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> - TEST_ASSERT_VAL("wrong exclude_user", evsel->core.attr.exclude_user);
> - TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);
> -
> - evsel = evsel__next(evsel);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0xc0));
> - TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> - TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
> - TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_raw1(struct evlist *evlist)
> -{
> - struct evsel *evsel = evlist__first(evlist);
> -
> - if (!perf_pmu__hybrid_mounted("cpu_atom")) {
> - TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> - return TEST_OK;
> - }
> -
> - TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> -
> - /* The type of second event is randome value */
> - evsel = evsel__next(evsel);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_raw2(struct evlist *evlist)
> -{
> - struct evsel *evsel = evlist__first(evlist);
> -
> - TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> - return TEST_OK;
> -}
> -
> -static int test__hybrid_cache_event(struct evlist *evlist)
> -{
> - struct evsel *evsel = evlist__first(evlist);
> -
> - TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
> - TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->core.attr.type);
> - TEST_ASSERT_VAL("wrong config", 0x2 == (evsel->core.attr.config & 0xffffffff));
> - return TEST_OK;
> -}
> -
> struct evlist_test {
> const char *name;
> bool (*valid)(void);
> @@ -1997,54 +1875,6 @@ static const struct terms_test test__terms[] = {
> },
> };
>
> -static const struct evlist_test test__hybrid_events[] = {
> - {
> - .name = "cpu_core/cpu-cycles/",
> - .check = test__hybrid_hw_event_with_pmu,
> - /* 0 */
> - },
> - {
> - .name = "{cpu_core/cpu-cycles/,cpu_core/instructions/}",
> - .check = test__hybrid_hw_group_event,
> - /* 1 */
> - },
> - {
> - .name = "{cpu-clock,cpu_core/cpu-cycles/}",
> - .check = test__hybrid_sw_hw_group_event,
> - /* 2 */
> - },
> - {
> - .name = "{cpu_core/cpu-cycles/,cpu-clock}",
> - .check = test__hybrid_hw_sw_group_event,
> - /* 3 */
> - },
> - {
> - .name = "{cpu_core/cpu-cycles/k,cpu_core/instructions/u}",
> - .check = test__hybrid_group_modifier1,
> - /* 4 */
> - },
> - {
> - .name = "r1a",
> - .check = test__hybrid_raw1,
> - /* 5 */
> - },
> - {
> - .name = "cpu_core/r1a/",
> - .check = test__hybrid_raw2,
> - /* 6 */
> - },
> - {
> - .name = "cpu_core/config=10,config1,config2=3,period=1000/u",
> - .check = test__checkevent_pmu,
> - /* 7 */
> - },
> - {
> - .name = "cpu_core/LLC-loads/",
> - .check = test__hybrid_cache_event,
> - /* 8 */
> - },
> -};
> -
> static int test_event(const struct evlist_test *e)
> {
> struct parse_events_error err;
> @@ -2307,14 +2137,6 @@ static bool test_alias(char **event, char **alias)
> return false;
> }
>
> -static int test__hybrid(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
> -{
> - if (!perf_pmu__has_hybrid())
> - return TEST_SKIP;
> -
> - return test_events(test__hybrid_events, ARRAY_SIZE(test__hybrid_events));
> -}
> -
> static int test__checkevent_pmu_events_alias(struct evlist *evlist)
> {
> struct evsel *evsel1 = evlist__first(evlist);
> @@ -2378,9 +2200,6 @@ static struct test_case tests__parse_events[] = {
> TEST_CASE_REASON("Test event parsing",
> events2,
> "permissions"),
> - TEST_CASE_REASON("Test parsing of \"hybrid\" CPU events",
> - hybrid,
> - "not hybrid"),
> TEST_CASE_REASON("Parsing of all PMU events from sysfs",
> pmu_events,
> "permissions"),
next prev parent reply other threads:[~2023-04-27 21:44 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-26 7:00 [PATCH v1 00/40] Fix perf on Intel hybrid CPUs Ian Rogers
2023-04-26 7:00 ` [PATCH v1 01/40] perf stat: Introduce skippable evsels Ian Rogers
2023-04-26 23:26 ` Yasin, Ahmad
2023-04-27 0:37 ` Ian Rogers
2023-04-27 2:03 ` Ian Rogers
2023-04-27 18:52 ` Liang, Kan
2023-04-27 20:21 ` Ian Rogers
2023-04-27 21:00 ` Namhyung Kim
2023-04-27 21:09 ` Ian Rogers
2023-04-26 7:00 ` [PATCH v1 02/40] perf vendor events intel: Add alderlake metric constraints Ian Rogers
2023-04-26 7:00 ` [PATCH v1 03/40] perf vendor events intel: Add icelake " Ian Rogers
2023-04-27 19:06 ` Liang, Kan
2023-04-27 20:22 ` Ian Rogers
2023-04-26 7:00 ` [PATCH v1 04/40] perf vendor events intel: Add icelakex " Ian Rogers
2023-04-26 7:00 ` [PATCH v1 05/40] perf vendor events intel: Add sapphirerapids " Ian Rogers
2023-04-26 7:00 ` [PATCH v1 06/40] perf vendor events intel: Add tigerlake " Ian Rogers
2023-04-26 7:00 ` [PATCH v1 07/40] perf stat: Avoid segv on counter->name Ian Rogers
2023-04-27 19:11 ` Liang, Kan
2023-04-27 19:34 ` Arnaldo Carvalho de Melo
2023-04-26 7:00 ` [PATCH v1 08/40] perf test: Test more sysfs events Ian Rogers
2023-04-27 19:38 ` Liang, Kan
2023-04-27 20:23 ` Ian Rogers
2023-04-26 7:00 ` [PATCH v1 09/40] perf test: Use valid for PMU tests Ian Rogers
2023-04-27 19:39 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 10/40] perf test: Mask config then test Ian Rogers
2023-04-27 19:39 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 11/40] perf test: Test more with config_cache Ian Rogers
2023-04-27 19:40 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 12/40] perf test: Roundtrip name, don't assume 1 event per name Ian Rogers
2023-04-27 19:44 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 13/40] perf parse-events: Set attr.type to PMU type early Ian Rogers
2023-04-27 20:00 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 14/40] perf print-events: Avoid unnecessary strlist Ian Rogers
2023-04-27 20:01 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 15/40] perf parse-events: Avoid scanning PMUs before parsing Ian Rogers
2023-04-27 20:06 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 16/40] perf test: Validate events with hyphens in Ian Rogers
2023-04-27 20:08 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 17/40] perf evsel: Modify group pmu name for software events Ian Rogers
2023-04-27 20:12 ` Liang, Kan
2023-04-26 7:00 ` [PATCH v1 18/40] perf test: Move x86 hybrid tests to arch/x86 Ian Rogers
2023-04-27 21:42 ` Liang, Kan [this message]
2023-04-26 7:00 ` [PATCH v1 19/40] perf test x86 hybrid: Don't assume evlist order Ian Rogers
2023-04-26 7:00 ` [PATCH v1 20/40] perf parse-events: Support PMUs for legacy cache events Ian Rogers
2023-04-26 7:00 ` [PATCH v1 21/40] perf parse-events: Wildcard " Ian Rogers
2023-04-26 10:11 ` James Clark
2023-04-27 5:50 ` Ian Rogers
2023-04-27 21:02 ` Ian Rogers
2023-04-26 7:00 ` [PATCH v1 22/40] perf print-events: Print legacy cache events for each PMU Ian Rogers
2023-04-26 7:00 ` [PATCH v1 23/40] perf parse-events: Support wildcards on raw events Ian Rogers
2023-04-26 7:00 ` [PATCH v1 24/40] perf parse-events: Remove now unused hybrid logic Ian Rogers
2023-04-26 7:00 ` [PATCH v1 25/40] perf parse-events: Minor type safety cleanup Ian Rogers
2023-04-26 7:00 ` [PATCH v1 26/40] perf parse-events: Add pmu filter Ian Rogers
2023-04-26 7:00 ` [PATCH v1 27/40] perf stat: Make cputype filter generic Ian Rogers
2023-04-26 7:00 ` [PATCH v1 28/40] perf test: Add cputype testing to perf stat Ian Rogers
2023-04-26 7:00 ` [PATCH v1 29/40] perf test: Fix parse-events tests for >1 core PMU Ian Rogers
2023-04-26 7:00 ` [PATCH v1 30/40] perf parse-events: Support hardware events as terms Ian Rogers
2023-04-26 7:00 ` [PATCH v1 31/40] perf parse-events: Avoid error when assigning a term Ian Rogers
2023-04-26 7:00 ` [PATCH v1 32/40] perf parse-events: Avoid error when assigning a legacy cache term Ian Rogers
2023-04-26 7:00 ` [PATCH v1 33/40] perf parse-events: Don't auto merge hybrid wildcard events Ian Rogers
2023-04-26 7:00 ` [PATCH v1 34/40] perf parse-events: Don't reorder atom cpu events Ian Rogers
2023-04-26 7:00 ` [PATCH v1 35/40] perf metrics: Be PMU specific for referenced metrics Ian Rogers
2023-04-26 7:00 ` [PATCH v1 36/40] perf metric: Json flag to not group events if gathering a metric group Ian Rogers
2023-04-26 7:00 ` [PATCH v1 37/40] perf stat: Command line PMU metric filtering Ian Rogers
2023-04-26 7:00 ` [PATCH v1 38/40] perf vendor events intel: Correct alderlake metrics Ian Rogers
2023-04-26 7:00 ` [PATCH v1 39/40] perf jevents: Don't rewrite metrics across PMUs Ian Rogers
2023-04-26 7:00 ` [PATCH v1 40/40] perf metrics: Be PMU specific in event match Ian Rogers
2023-04-26 13:53 ` [PATCH v1 00/40] Fix perf on Intel hybrid CPUs Liang, Kan
2023-04-26 21:09 ` Arnaldo Carvalho de Melo
2023-04-26 21:33 ` Arnaldo Carvalho de Melo
2023-04-26 22:07 ` Liang, Kan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4fbbe5bf-2f7d-8aa3-62b1-72829f75e009@linux.intel.com \
--to=kan.liang@linux.intel.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ahmad.yasin@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=caleb.biggers@intel.com \
--cc=edward.baker@intel.com \
--cc=eranian@google.com \
--cc=florian.fischer@muhq.space \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kjain@linux.ibm.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=perry.taylor@intel.com \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=robh@kernel.org \
--cc=samantha.alt@intel.com \
--cc=sumanthk@linux.ibm.com \
--cc=suzuki.poulose@arm.com \
--cc=tegongkang@gmail.com \
--cc=tmricht@linux.ibm.com \
--cc=weilin.wang@intel.com \
--cc=yangjihong1@huawei.com \
--cc=yangtiezhu@loongson.cn \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®