Re: [PATCH] perf tests: Fix tests in 'Parse event definition strings'

From: Liang, Kan
Date: Tue Apr 11 2023 - 09:34:01 EST




On 2023-04-11 5:43 a.m., tinghao.zhang@xxxxxxxxx wrote:
> From: Tinghao Zhang <tinghao.zhang@xxxxxxxxx>
>
> The 'Test event parsing' test set under 'Parse event definion strings'
> does not apply to hybrid events. Since hybrid events have a dedicated
> test set 'Test parsing of hybrid CPU events', skip these tests on hybrid
> platforms.
>
> Fixes: 7741e03e808a ("perf test: Parse events break apart tests")
> Reported-by: Yi Ammy <ammy.yi@xxxxxxxxx>
> Signed-off-by: Tinghao Zhang <tinghao.zhang@xxxxxxxxx>


This patch looks good to me.

Reviewed-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>

Thanks,
Kan

> ---
> tools/perf/tests/parse-events.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index 71a5cb343311..c6949e458e61 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -2146,6 +2146,9 @@ static int test_events(const struct evlist_test *events, int cnt)
>
> static int test__events2(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
> {
> + if (perf_pmu__has_hybrid())
> + return TEST_SKIP;
> +
> return test_events(test__events, ARRAY_SIZE(test__events));
> }
>
> @@ -2421,7 +2424,7 @@ static int test__pmu_events_alias2(struct test_suite *test __maybe_unused,
> static struct test_case tests__parse_events[] = {
> TEST_CASE_REASON("Test event parsing",
> events2,
> - "permissions"),
> + "permissions or hybrid"),
> TEST_CASE_REASON("Test parsing of \"hybrid\" CPU events",
> hybrid,
> "not hybrid"),