perf tests: Add arch tests

tip:perf/core tip-bot for Matt Fleming 1 participant 1 message Oct 6, 2015 perf events

Share & tools

tip-bot for Matt Fleming

author merge bot

2015-10-06 07:16 UTC #0 lore raw

Commit-ID:  31b6753f95320260b160935d0e9c0b29f096ab57
Gitweb:     http://git.kernel.org/tip/31b6753f95320260b160935d0e9c0b29f096ab57
Author:     Matt Fleming <[email protected]>
AuthorDate: Mon, 5 Oct 2015 15:40:19 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 5 Oct 2015 16:55:38 -0300

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 Matt Fleming <[email protected]>

Cc Adrian Hunter <[email protected]>

Cc Andi Kleen <[email protected]>

Cc Fenghua Yu <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Kanaka Juvva <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc Vikas Shivappa <[email protected]>

Cc Vince Weaver <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/arch/x86/Build                |  2 +-
 tools/perf/arch/x86/include/arch-tests.h |  6 ++++++
 tools/perf/arch/x86/tests/Build          |  6 ++++--
 tools/perf/arch/x86/tests/arch-tests.c   | 10 ++++++++++
 tools/perf/tests/builtin-test.c          | 28 ++++++++++++++++++++--------
 tools/perf/tests/tests.h                 |  5 +++++
 6 files changed, 46 insertions(+), 11 deletions(-)

tools/perf/arch/x86/Build +1 -1

index 41bf61d..db52fa2 100644
@@ -1,2 +1,2 @@
 libperf-y += util/
-libperf-$(CONFIG_DWARF_UNWIND) += tests/
+libperf-y += tests/

tools/perf/arch/x86/include/arch-tests.h new file +6 -0

new file mode 100644
index 0000000..4bd41d8
@@ -0,0 +1,6 @@
+#ifndef ARCH_TESTS_H
+#define ARCH_TESTS_H
+
+extern struct test arch_tests[];
+
+#endif

tools/perf/arch/x86/tests/Build +4 -2

index b30eff9..d827ef3 100644
@@ -1,2 +1,4 @@
-libperf-y += regs_load.o
-libperf-y += dwarf-unwind.o
+libperf-$(CONFIG_DWARF_UNWIND) += regs_load.o
+libperf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
+
+libperf-y += arch-tests.o

tools/perf/arch/x86/tests/arch-tests.c new file +10 -0

new file mode 100644
index 0000000..fca9eb9
@@ -0,0 +1,10 @@
+#include <string.h>
+#include "tests/tests.h"
+#include "arch-tests.h"
+
+struct test arch_tests[] = {
+	{
+		.func = NULL,
+	},
+
+};

tools/perf/tests/builtin-test.c +20 -8

index d9bf51d..2b6c1bf 100644
@@ -14,10 +14,13 @@
 #include "parse-options.h"
 #include "symbol.h"
 
-static struct test {
-	const char *desc;
-	int (*func)(void);
-} tests[] = {
+struct test __weak arch_tests[] = {
+	{
+		.func = NULL,
+	},
+};
+
+static struct test generic_tests[] = {
 	{
 		.desc = "vmlinux symtab matches kallsyms",
 		.func = test__vmlinux_matches_kallsyms,

@@ -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[])
 {
 	int i;

@@ -249,22 +257,25 @@ static int run_test(struct test *test)
 	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)
 {
 	struct test *t;
+	unsigned int j;
 	int i = 0;
 	int width = 0;
 
-	for_each_test(t) {
+	for_each_test(j, t) {
 		int len = strlen(t->desc);
 
 		if (width < len)
 			width = len;
 	}
 
-	for_each_test(t) {
+	for_each_test(j, t) {
 		int curr = i++, err;
 
 		if (!perf_test__matches(t, curr, argc, argv))

@@ -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)
 {
+	unsigned int j;
 	struct test *t;
 	int i = 0;
 
-	for_each_test(t) {
+	for_each_test(j, t) {
 		if (argc > 1 && !strstr(t->desc, argv[1]))
 			continue;

tools/perf/tests/tests.h +5 -0

index 0b35496..b1cb1c0 100644
@@ -24,6 +24,11 @@ enum {
 	TEST_SKIP = -2,
 };
 
+struct test {
+	const char *desc;
+	int (*func)(void);
+};
+
 /* Tests */
 int test__vmlinux_matches_kallsyms(void);
 int test__openat_syscall_event(void);