From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Jin Yao <yao.jin@linux.intel.com>,
John Garry <john.garry@huawei.com>,
"Paul A . Clarke" <pc@us.ibm.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Brendan Higgins <brendanhiggins@google.com>,
Daniel Latypov <dlatypov@google.com>,
David Gow <davidgow@google.com>,
Sohaib Mohamed <sohaib.amhmd@gmail.com>
Cc: eranian@google.com, Ian Rogers <irogers@google.com>
Subject: [PATCH v3 07/22] perf test: Add test case struct.
Date: Wed, 3 Nov 2021 23:41:53 -0700 [thread overview]
Message-ID: <20211104064208.3156807-8-irogers@google.com> (raw)
In-Reply-To: <20211104064208.3156807-1-irogers@google.com>
Add a test case struct mirroring the 'struct kunit_case'. Use the struct
with the DEFINE_SUITE macro, where the single test is turned into a test
case. Update the helpers in builtin-test to handle test cases.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/builtin-test.c | 30 ++++++++++++++++++++++++------
tools/perf/tests/tests.h | 26 ++++++++++++++++++++++----
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 96eb486ffbc9..a6d84feba483 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -117,10 +117,19 @@ static struct test_suite **tests[] = {
static int num_subtests(const struct test_suite *t)
{
+ int num;
+
if (t->subtest.get_nr)
return t->subtest.get_nr();
- return 0;
+ if (!t->test_cases)
+ return 0;
+
+ num = 0;
+ while (t->test_cases[num].name)
+ num++;
+
+ return num;
}
static bool has_subtests(const struct test_suite *t)
@@ -138,10 +147,13 @@ static const char *skip_reason(const struct test_suite *t, int subtest)
static const char *test_description(const struct test_suite *t, int subtest)
{
- if (subtest < 0 || !t->subtest.get_desc)
- return t->desc;
+ if (t->test_cases && subtest >= 0)
+ return t->test_cases[subtest].desc;
- return t->subtest.get_desc(subtest);
+ if (t->subtest.get_desc && subtest >= 0)
+ return t->subtest.get_desc(subtest);
+
+ return t->desc;
}
static bool is_supported(const struct test_suite *t)
@@ -149,9 +161,15 @@ static bool is_supported(const struct test_suite *t)
return !t->is_supported || t->is_supported();
}
-static test_fnptr test_function(const struct test_suite *t, int subtest __maybe_unused)
+static test_fnptr test_function(const struct test_suite *t, int subtest)
{
- return t->func;
+ if (t->func)
+ return t->func;
+
+ if (subtest <= 0)
+ return t->test_cases[0].run_case;
+
+ return t->test_cases[subtest].run_case;
}
static bool perf_test__matches(const char *desc, int curr, int argc, const char *argv[])
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 5139e24973cc..71b8d2c88e5c 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -31,6 +31,12 @@ struct test_suite;
typedef int (*test_fnptr)(struct test_suite *, int);
+struct test_case {
+ const char *name;
+ const char *desc;
+ test_fnptr run_case;
+};
+
struct test_suite {
const char *desc;
test_fnptr func;
@@ -40,6 +46,7 @@ struct test_suite {
const char *(*get_desc)(int subtest);
const char *(*skip_reason)(int subtest);
} subtest;
+ struct test_case *test_cases;
bool (*is_supported)(void);
void *priv;
};
@@ -47,10 +54,21 @@ struct test_suite {
#define DECLARE_SUITE(name) \
extern struct test_suite suite__##name;
-#define DEFINE_SUITE(description, name) \
- struct test_suite suite__##name = { \
- .desc = description, \
- .func = test__##name, \
+#define TEST_CASE(description, _name) \
+ { \
+ .name = #_name, \
+ .desc = description, \
+ .run_case = test__##_name, \
+ }
+
+#define DEFINE_SUITE(description, _name) \
+ struct test_case tests__##_name[] = { \
+ TEST_CASE(description, _name), \
+ { .name = NULL, } \
+ }; \
+ struct test_suite suite__##_name = { \
+ .desc = description, \
+ .test_cases = tests__##_name, \
}
/* Tests */
--
2.33.1.1089.g2158813163f-goog
next prev parent reply other threads:[~2021-11-04 6:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 6:41 [PATCH v3 00/22] Start aligning perf test with kunit style Ian Rogers
2021-11-04 6:41 ` [PATCH v3 01/22] perf test: Use macro for "suite" declarations Ian Rogers
2021-11-04 6:41 ` [PATCH v3 02/22] perf test: Use macro for "suite" definitions Ian Rogers
2021-11-04 6:41 ` [PATCH v3 03/22] perf test: Make each test/suite its own struct Ian Rogers
2021-11-13 13:06 ` Arnaldo Carvalho de Melo
2021-11-13 13:29 ` Arnaldo Carvalho de Melo
2021-11-04 6:41 ` [PATCH v3 04/22] perf test: Move each test suite struct to its test Ian Rogers
2021-11-04 6:41 ` [PATCH v3 05/22] perf test: Rename struct test to test_suite Ian Rogers
2021-11-04 6:41 ` [PATCH v3 06/22] perf test: Add helper functions for abstraction Ian Rogers
2021-11-04 6:41 ` Ian Rogers [this message]
2021-11-04 6:41 ` [PATCH v3 08/22] perf test: Add skip reason to test case Ian Rogers
2021-11-04 6:41 ` [PATCH v3 09/22] perf test: Convert pfm tests to use test cases Ian Rogers
2021-11-04 6:41 ` [PATCH v3 10/22] perf test: Convert pmu event tests to " Ian Rogers
2021-11-04 6:41 ` [PATCH v3 11/22] perf test: Convert watch point " Ian Rogers
2021-11-04 6:41 ` [PATCH v3 12/22] perf test: Convert clang " Ian Rogers
2021-11-04 6:41 ` [PATCH v3 13/22] perf test: Convert bpf " Ian Rogers
2021-11-04 6:42 ` [PATCH v3 14/22] perf test: Convert llvm " Ian Rogers
2021-11-04 6:42 ` [PATCH v3 15/22] perf test: Remove now unused subtest helpers Ian Rogers
2021-11-04 6:42 ` [PATCH v3 16/22] perf test: bp tests use test case Ian Rogers
2021-11-04 6:42 ` [PATCH v3 17/22] perf test: Convert time to tsc test to " Ian Rogers
2021-11-04 6:42 ` [PATCH v3 18/22] perf test: Remove non test case style support Ian Rogers
2021-11-04 6:42 ` [PATCH v3 19/22] perf test: BP tests, remove is_supported use Ian Rogers
2021-11-04 6:42 ` [PATCH v3 20/22] perf test: TSC test, " Ian Rogers
2021-11-04 6:42 ` [PATCH v3 21/22] perf test: Remove is_supported function Ian Rogers
2021-11-04 6:42 ` [PATCH v3 22/22] perf test: Remove skip_if_fail Ian Rogers
2021-11-04 13:51 ` Sohaib Mohamed
2021-11-09 14:32 ` Arnaldo Carvalho de Melo
2021-11-10 15:44 ` Sohaib Mohamed
2021-11-09 11:08 ` [PATCH v3 00/22] Start aligning perf test with kunit style Jiri Olsa
2021-11-10 12:20 ` Arnaldo Carvalho de Melo
2021-11-10 16:12 ` Sohaib Mohamed
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=20211104064208.3156807-8-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=dlatypov@google.com \
--cc=eranian@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--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=pc@us.ibm.com \
--cc=peterz@infradead.org \
--cc=sohaib.amhmd@gmail.com \
--cc=yao.jin@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;
as well as URLs for NNTP newsgroup(s).