iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf test: Convert pfm tests to use test cases.

Browse Source 
Use null terminated array of test cases rather than the previous sub
test functions.

Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Brendan Higgins <brendanhiggins@google.com>
Cc: Daniel Latypov <dlatypov@google.com>
Cc: David Gow <davidgow@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20211104064208.3156807-10-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers
2021-11-03 23:41:55 -07:00
committed by Arnaldo Carvalho de Melo
parent 9be56d3080
commit 039f355545
1 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tools/perf/tests/pfm.c
View File

@@ -11,27 +11,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#ifdef HAVE_LIBPFM
static int test__pfm_events(void);
static int test__pfm_group(void);
#endif
static const struct {
int (*func)(void);
const char *desc;
} pfm_testcase_table[] = {
#ifdef HAVE_LIBPFM
{
.func = test__pfm_events,
.desc = "test of individual --pfm-events",
},
{
.func = test__pfm_group,
.desc = "test groups of --pfm-events",
},
#endif
};
#ifdef HAVE_LIBPFM #ifdef HAVE_LIBPFM
static int count_pfm_events(struct perf_evlist *evlist) static int count_pfm_events(struct perf_evlist *evlist)
{ {
@@ -44,7 +23,8 @@ static int count_pfm_events(struct perf_evlist *evlist)
return count; return count;
} }
static int test__pfm_events(void) static int test__pfm_events(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{ {
struct evlist *evlist; struct evlist *evlist;
struct option opt; struct option opt;
@@ -104,7 +84,8 @@ static int test__pfm_events(void)
return 0; return 0;
} }
static int test__pfm_group(void) static int test__pfm_group(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{ {
struct evlist *evlist; struct evlist *evlist;
struct option opt; struct option opt;
@@ -187,37 +168,28 @@ static int test__pfm_group(void)
} }
return 0; return 0;
} }
#endif
static const char *test__pfm_subtest_get_desc(int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(pfm_testcase_table))
return NULL;
return pfm_testcase_table[i].desc;
}
static int test__pfm_subtest_get_nr(void)
{
return (int)ARRAY_SIZE(pfm_testcase_table);
}
static int test__pfm(struct test_suite *test __maybe_unused, int i __maybe_unused)
{
#ifdef HAVE_LIBPFM
if (i < 0 || i >= (int)ARRAY_SIZE(pfm_testcase_table))
return TEST_FAIL;
return pfm_testcase_table[i].func();
#else #else
static int test__pfm_events(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{
return TEST_SKIP; return TEST_SKIP;
#endif
} }
static int test__pfm_group(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{
return TEST_SKIP;
}
#endif
static struct test_case pfm_tests[] = {
TEST_CASE_REASON("test of individual --pfm-events", pfm_events, "not compiled in"),
TEST_CASE_REASON("test groups of --pfm-events", pfm_group, "not compiled in"),
{ .name = NULL, }
};
struct test_suite suite__pfm = { struct test_suite suite__pfm = {
.desc = "Test libpfm4 support", .desc = "Test libpfm4 support",
.func = test__pfm, .test_cases = pfm_tests,
.subtest = { .subtest = { .skip_if_fail = true }
.skip_if_fail = true,
.get_nr = test__pfm_subtest_get_nr,
.get_desc = test__pfm_subtest_get_desc,
}
}; };