Re: [PATCH v1 13/15] perf tests: Add tool PMU test

[Namhyung Kim <namhyung@kernel.org>]

On Fri, Sep 06, 2024 at 10:08:28PM -0700, Ian Rogers wrote:
> Ensure parsing with and without PMU creates events with the expected
> config values. This ensures the tool.json doesn't get out of sync with
> tool_pmu_event enum.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/tests/Build          |   1 +
>  tools/perf/tests/builtin-test.c |   1 +
>  tools/perf/tests/tests.h        |   1 +
>  tools/perf/tests/tool_pmu.c     | 111 ++++++++++++++++++++++++++++++++
>  4 files changed, 114 insertions(+)
>  create mode 100644 tools/perf/tests/tool_pmu.c
> 
> diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
> index 5671ee530019..a771e4928247 100644
> --- a/tools/perf/tests/Build
> +++ b/tools/perf/tests/Build
> @@ -67,6 +67,7 @@ perf-test-y += sigtrap.o
>  perf-test-y += event_groups.o
>  perf-test-y += symbols.o
>  perf-test-y += util.o
> +perf-test-y += tool_pmu.o
>  
>  ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc))
>  perf-test-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index 470a9709427d..3b30f258c395 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -73,6 +73,7 @@ static struct test_suite *generic_tests[] = {
>  	&suite__PERF_RECORD,
>  	&suite__pmu,
>  	&suite__pmu_events,
> +	&suite__tool_pmu,
>  	&suite__dso_data,
>  	&suite__perf_evsel__roundtrip_name_test,
>  #ifdef HAVE_LIBTRACEEVENT
> diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> index 6ea2be86b7bf..1ed76d4156b6 100644
> --- a/tools/perf/tests/tests.h
> +++ b/tools/perf/tests/tests.h
> @@ -83,6 +83,7 @@ DECLARE_SUITE(perf_evsel__tp_sched_test);
>  DECLARE_SUITE(syscall_openat_tp_fields);
>  DECLARE_SUITE(pmu);
>  DECLARE_SUITE(pmu_events);
> +DECLARE_SUITE(tool_pmu);
>  DECLARE_SUITE(attr);
>  DECLARE_SUITE(dso_data);
>  DECLARE_SUITE(dso_data_cache);
> diff --git a/tools/perf/tests/tool_pmu.c b/tools/perf/tests/tool_pmu.c
> new file mode 100644
> index 000000000000..94d0dd8fd3cb
> --- /dev/null
> +++ b/tools/perf/tests/tool_pmu.c
> @@ -0,0 +1,111 @@
> +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
> +#include "debug.h"
> +#include "evlist.h"
> +#include "parse-events.h"
> +#include "tests.h"
> +#include "tool_pmu.h"
> +
> +static int do_test(enum tool_pmu_event ev, bool with_pmu)
> +{
> +	struct evlist *evlist = evlist__new();
> +	struct evsel *evsel;
> +	struct parse_events_error err;
> +	int ret;
> +	char str[128];
> +	bool found = false;
> +
> +	if (!evlist) {
> +		pr_err("evlist allocation failed\n");
> +		return TEST_FAIL;
> +	}
> +
> +	if (with_pmu)
> +		snprintf(str, sizeof(str), "tool/%s/", tool_pmu__event_to_str(ev));
> +	else
> +		strncpy(str, tool_pmu__event_to_str(ev), sizeof(str));
> +
> +	parse_events_error__init(&err);
> +	ret = parse_events(evlist, str, &err);
> +	if (ret) {
> +		evlist__delete(evlist);
> +		if (tool_pmu__skip_event(tool_pmu__event_to_str(ev))) {
> +			ret = TEST_OK;
> +			goto out;
> +		}
> +
> +		pr_debug("FAILED %s:%d failed to parse event '%s', err %d\n",
> +			 __FILE__, __LINE__, str, ret);
> +		parse_events_error__print(&err, str);
> +		ret = TEST_FAIL;
> +		goto out;
> +	}
> +
> +	ret = TEST_OK;
> +	if (with_pmu ? (evlist->core.nr_entries != 1) : (evlist->core.nr_entries < 1)) {
> +		pr_debug("FAILED %s:%d Unexpected number of events for '%s' of %d\n",
> +			 __FILE__, __LINE__, str, evlist->core.nr_entries);
> +		ret = TEST_FAIL;
> +		goto out;
> +	}
> +
> +	evlist__for_each_entry(evlist, evsel) {
> +		if (perf_pmu__is_tool(evsel->pmu)) {
> +			if (evsel->core.attr.config != ev) {
> +				pr_debug("FAILED %s:%d Unexpected config for '%s', %lld != %d\n",
> +					__FILE__, __LINE__, str, evsel->core.attr.config, ev);
> +				ret = TEST_FAIL;
> +				goto out;
> +			}
> +			found = true;
> +		}
> +	}
> +
> +	if (!found && !tool_pmu__skip_event(tool_pmu__event_to_str(ev))) {
> +		pr_debug("FAILED %s:%d Didn't find tool event '%s' in parsed evsels\n",
> +			 __FILE__, __LINE__, str);
> +		ret = TEST_FAIL;
> +	}
> +
> +out:
> +	evlist__delete(evlist);
> +	return ret;
> +}
> +
> +static int test__tool_pmu_without_pmu(struct test_suite *test __maybe_unused,
> +				      int subtest __maybe_unused)
> +{
> +	int i;
> +
> +	tool_pmu__for_each_event(i) {
> +		int ret = do_test(i, /*with_pmu=*/false);
> +
> +		if (ret != TEST_OK)
> +			return ret;
> +	}
> +	return TEST_OK;
> +}
> +
> +static int test__tool_pmu_with_pmu(struct test_suite *test __maybe_unused,
> +				   int subtest __maybe_unused)
> +{
> +	int i;
> +
> +	tool_pmu__for_each_event(i) {
> +		int ret = do_test(i, /*with_pmu=*/true);
> +
> +		if (ret != TEST_OK)
> +			return ret;
> +	}
> +	return TEST_OK;
> +}
> +
> +static struct test_case tests__tool_pmu[] = {
> +	TEST_CASE("Parsing without PMU name", tool_pmu_without_pmu),
> +	TEST_CASE("Parsing with PMU name", tool_pmu_with_pmu),
> +	{	.name = NULL, }

An unusual indentation.

Thanks,
Namhyung


> +};
> +
> +struct test_suite suite__tool_pmu = {
> +	.desc = "Tool PMU",
> +	.test_cases = tests__tool_pmu,
> +};
> -- 
> 2.46.0.469.g59c65b2a67-goog
>