Commit 31b6753f authored by Matt Fleming's avatar Matt Fleming Committed by Arnaldo Carvalho de Melo

perf tests: Add arch tests

Tests that only make sense for some architectures currently live in
the same place as the generic tests. Move out the x86-specific tests
into tools/perf/arch/x86/tests and define an 'arch_tests' array, which
is the list of tests that only apply to the build architecture.

The main idea is to encourage developers to add arch tests to build
out perf's test coverage, without dumping everything in
tools/perf/tests.
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kanaka Juvva <kanaka.d.juvva@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Vikas Shivappa <vikas.shivappa@intel.com>
Cc: Vince Weaver <vince@deater.net>
Link: http://lkml.kernel.org/n/tip-p4uc1c15ssbj8xj7ku5slpa6@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a1853e2c
libperf-y += util/ libperf-y += util/
libperf-$(CONFIG_DWARF_UNWIND) += tests/ libperf-y += tests/
#ifndef ARCH_TESTS_H
#define ARCH_TESTS_H
extern struct test arch_tests[];
#endif
libperf-y += regs_load.o libperf-$(CONFIG_DWARF_UNWIND) += regs_load.o
libperf-y += dwarf-unwind.o libperf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
libperf-y += arch-tests.o
#include <string.h>
#include "tests/tests.h"
#include "arch-tests.h"
struct test arch_tests[] = {
{
.func = NULL,
},
};
...@@ -14,10 +14,13 @@ ...@@ -14,10 +14,13 @@
#include "parse-options.h" #include "parse-options.h"
#include "symbol.h" #include "symbol.h"
static struct test { struct test __weak arch_tests[] = {
const char *desc; {
int (*func)(void); .func = NULL,
} tests[] = { },
};
static struct test generic_tests[] = {
{ {
.desc = "vmlinux symtab matches kallsyms", .desc = "vmlinux symtab matches kallsyms",
.func = test__vmlinux_matches_kallsyms, .func = test__vmlinux_matches_kallsyms,
...@@ -195,6 +198,11 @@ static struct test { ...@@ -195,6 +198,11 @@ static struct test {
}, },
}; };
static struct test *tests[] = {
generic_tests,
arch_tests,
};
static bool perf_test__matches(struct test *test, int curr, int argc, const char *argv[]) static bool perf_test__matches(struct test *test, int curr, int argc, const char *argv[])
{ {
int i; int i;
...@@ -249,22 +257,25 @@ static int run_test(struct test *test) ...@@ -249,22 +257,25 @@ static int run_test(struct test *test)
return err; return err;
} }
#define for_each_test(t) for (t = &tests[0]; t->func; t++) #define for_each_test(j, t) \
for (j = 0; j < ARRAY_SIZE(tests); j++) \
for (t = &tests[j][0]; t->func; t++)
static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
{ {
struct test *t; struct test *t;
unsigned int j;
int i = 0; int i = 0;
int width = 0; int width = 0;
for_each_test(t) { for_each_test(j, t) {
int len = strlen(t->desc); int len = strlen(t->desc);
if (width < len) if (width < len)
width = len; width = len;
} }
for_each_test(t) { for_each_test(j, t) {
int curr = i++, err; int curr = i++, err;
if (!perf_test__matches(t, curr, argc, argv)) if (!perf_test__matches(t, curr, argc, argv))
...@@ -300,10 +311,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) ...@@ -300,10 +311,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
static int perf_test__list(int argc, const char **argv) static int perf_test__list(int argc, const char **argv)
{ {
unsigned int j;
struct test *t; struct test *t;
int i = 0; int i = 0;
for_each_test(t) { for_each_test(j, t) {
if (argc > 1 && !strstr(t->desc, argv[1])) if (argc > 1 && !strstr(t->desc, argv[1]))
continue; continue;
......
...@@ -24,6 +24,11 @@ enum { ...@@ -24,6 +24,11 @@ enum {
TEST_SKIP = -2, TEST_SKIP = -2,
}; };
struct test {
const char *desc;
int (*func)(void);
};
/* Tests */ /* Tests */
int test__vmlinux_matches_kallsyms(void); int test__vmlinux_matches_kallsyms(void);
int test__openat_syscall_event(void); int test__openat_syscall_event(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment