perf test: Allow running just a subset of the available tests

To obtain a list of available tests:

[root@emilia linux]# perf test list
 1: vmlinux symtab matches kallsyms
 2: detect open syscall event
 3: detect open syscall event on all cpus
 4: read samples using the mmap interface
 5: parse events tests
[root@emilia linux]#

To list just a subset:

[root@emilia linux]# perf test list syscall
 2: detect open syscall event
 3: detect open syscall event on all cpus
[root@emilia linux]#

To run a subset:

[root@emilia linux]# perf test detect
 2: detect open syscall event: Ok
 3: detect open syscall event on all cpus: Ok
[root@emilia linux]#

Specific tests can be chosen by number:

[root@emilia linux]# perf test 1 3 parse
 1: vmlinux symtab matches kallsyms: Ok
 3: detect open syscall event on all cpus: Ok
 5: parse events tests: Ok
[root@emilia linux]#

Now to write more tests!
Suggested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-nqec2145qfxdgimux28aw7v8@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 806fb630
...@@ -8,13 +8,19 @@ perf-test - Runs sanity tests. ...@@ -8,13 +8,19 @@ perf-test - Runs sanity tests.
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'perf test <options>' 'perf test [<options>] [{list <test-name-fragment>|[<test-name-fragments>|<test-numbers>]}]'
DESCRIPTION DESCRIPTION
----------- -----------
This command does assorted sanity tests, initially through linked routines but This command does assorted sanity tests, initially through linked routines but
also will look for a directory with more tests in the form of scripts. also will look for a directory with more tests in the form of scripts.
To get a list of available tests use 'perf test list', specifying a test name
fragment will show all tests that have it.
To run just specific tests, inform test name fragments or the numbers obtained
from 'perf test list'.
OPTIONS OPTIONS
------- -------
-v:: -v::
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include "util/thread_map.h" #include "util/thread_map.h"
#include "../../include/linux/hw_breakpoint.h" #include "../../include/linux/hw_breakpoint.h"
static long page_size;
static int vmlinux_matches_kallsyms_filter(struct map *map __used, struct symbol *sym) static int vmlinux_matches_kallsyms_filter(struct map *map __used, struct symbol *sym)
{ {
bool *visited = symbol__priv(sym); bool *visited = symbol__priv(sym);
...@@ -32,6 +30,7 @@ static int test__vmlinux_matches_kallsyms(void) ...@@ -32,6 +30,7 @@ static int test__vmlinux_matches_kallsyms(void)
struct map *kallsyms_map, *vmlinux_map; struct map *kallsyms_map, *vmlinux_map;
struct machine kallsyms, vmlinux; struct machine kallsyms, vmlinux;
enum map_type type = MAP__FUNCTION; enum map_type type = MAP__FUNCTION;
long page_size = sysconf(_SC_PAGE_SIZE);
struct ref_reloc_sym ref_reloc_sym = { .name = "_stext", }; struct ref_reloc_sym ref_reloc_sym = { .name = "_stext", };
/* /*
...@@ -871,41 +870,81 @@ static struct test { ...@@ -871,41 +870,81 @@ static struct test {
}, },
}; };
static int __cmd_test(void) static bool perf_test__matches(int curr, int argc, const char *argv[])
{ {
int i = 0; int i;
if (argc == 0)
return true;
for (i = 0; i < argc; ++i) {
char *end;
long nr = strtoul(argv[i], &end, 10);
if (*end == '\0') {
if (nr == curr + 1)
return true;
continue;
}
page_size = sysconf(_SC_PAGE_SIZE); if (strstr(tests[curr].desc, argv[i]))
return true;
}
return false;
}
static int __cmd_test(int argc, const char *argv[])
{
int i = 0;
while (tests[i].func) { while (tests[i].func) {
int err; int curr = i++, err;
pr_info("%2d: %s:", i + 1, tests[i].desc);
if (!perf_test__matches(curr, argc, argv))
continue;
pr_info("%2d: %s:", i, tests[curr].desc);
pr_debug("\n--- start ---\n"); pr_debug("\n--- start ---\n");
err = tests[i].func(); err = tests[curr].func();
pr_debug("---- end ----\n%s:", tests[i].desc); pr_debug("---- end ----\n%s:", tests[curr].desc);
pr_info(" %s\n", err ? "FAILED!\n" : "Ok"); pr_info(" %s\n", err ? "FAILED!\n" : "Ok");
++i;
} }
return 0; return 0;
} }
static const char * const test_usage[] = { static int perf_test__list(int argc, const char **argv)
"perf test [<options>]", {
NULL, int i = 0;
};
while (tests[i].func) {
int curr = i++;
if (argc > 1 && !strstr(tests[curr].desc, argv[1]))
continue;
pr_info("%2d: %s\n", i, tests[curr].desc);
}
return 0;
}
static const struct option test_options[] = { int cmd_test(int argc, const char **argv, const char *prefix __used)
{
const char * const test_usage[] = {
"perf test [<options>] [{list <test-name-fragment>|[<test-name-fragments>|<test-numbers>]}]",
NULL,
};
const struct option test_options[] = {
OPT_INTEGER('v', "verbose", &verbose, OPT_INTEGER('v', "verbose", &verbose,
"be more verbose (show symbol address, etc)"), "be more verbose (show symbol address, etc)"),
OPT_END() OPT_END()
}; };
int cmd_test(int argc, const char **argv, const char *prefix __used)
{
argc = parse_options(argc, argv, test_options, test_usage, 0); argc = parse_options(argc, argv, test_options, test_usage, 0);
if (argc) if (argc >= 1 && !strcmp(argv[0], "list"))
usage_with_options(test_usage, test_options); return perf_test__list(argc, argv);
symbol_conf.priv_size = sizeof(int); symbol_conf.priv_size = sizeof(int);
symbol_conf.sort_by_name = true; symbol_conf.sort_by_name = true;
...@@ -916,5 +955,5 @@ int cmd_test(int argc, const char **argv, const char *prefix __used) ...@@ -916,5 +955,5 @@ int cmd_test(int argc, const char **argv, const char *prefix __used)
setup_pager(); setup_pager();
return __cmd_test(); return __cmd_test(argc, argv);
} }
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