Re: [PATCH v2 21/43] perf test x86 hybrid: Update test expectations

Liang, Kan
2023-04-28T13:58:04Z

On 2023-04-28 3:37 a.m., Ian Rogers wrote:
> Don't assume evlist order. Switch to a loop rather than depend on
> evlist order for raw events test.
>
> Update hybrid event expectations. Previous values were based on
> parsing legacy hardware events from sysfs, update to the correct PMU
> specific legacy values.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/arch/x86/tests/hybrid.c | 54 ++++++++++++++----------------
> 1 file changed, 26 insertions(+), 28 deletions(-)
>
> diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests/hybrid.c
> index 0f99cfd116ee..d2a173ba3db9 100644
> --- a/tools/perf/arch/x86/tests/hybrid.c
> +++ b/tools/perf/arch/x86/tests/hybrid.c
> @@ -11,13 +11,18 @@ static bool test_config(const struct evsel *evsel, __u64 expected_config)
> return (evsel->core.attr.config & PERF_HW_EVENT_MASK) == expected_config;
> }
>
> +static bool test_perf_config(const struct perf_evsel *evsel, __u64 expected_config)
> +{
> + return (evsel->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));
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->core.attr.type);
> + TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCLES));

Can you please add the "hybrid type" check as well?

https://lore.kernel.org/lkml/4fbbe5bf-2f7d-8aa3-62b1-72829f75e009@linux.intel.com/

It's part of the attr.config layout design. We should test it as well.

Thanks,
Kan

> return TEST_OK;
> }
>
> @@ -27,13 +32,13 @@ 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 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 config", test_config(evsel, PERF_COUNT_HW_INSTRUCTIONS));
> TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> return TEST_OK;
> }
> @@ -48,8 +53,8 @@ static int test__hybrid_sw_hw_group_event(struct evlist *evlist)
> 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 config", test_config(evsel, PERF_COUNT_HW_CPU_CYCLES));
> TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
> return TEST_OK;
> }
> @@ -60,8 +65,8 @@ 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 config", test_config(evsel, PERF_COUNT_HW_CPU_CYCLES));
> TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
>
> evsel = evsel__next(evsel);
> @@ -76,15 +81,15 @@ 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 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 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);
> @@ -93,22 +98,15 @@ static int test__hybrid_group_modifier1(struct evlist *evlist)
>
> static int test__hybrid_raw1(struct evlist *evlist)
> {
> - struct evsel *evsel = evlist__first(evlist);
> + struct perf_evsel *evsel;
>
> - 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));
> + perf_evlist__for_each_evsel(&evlist->core, evsel) {
> + struct perf_pmu *pmu = perf_pmu__find_by_type(evsel->attr.type);
>
> - /* The type of second event is randome value */
> - evsel = evsel__next(evsel);
> - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a));
> + TEST_ASSERT_VAL("missing pmu", pmu);
> + TEST_ASSERT_VAL("unexpected pmu", !strncmp(pmu->name, "cpu_", 4));
> + TEST_ASSERT_VAL("wrong config", test_perf_config(evsel, 0x1a));
> + }
> return TEST_OK;
> }
>