Skip to content

L
linux
Commit d68f0365 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files
Options

perf test: Move each test suite struct to its test 

Rather than export test functions, export the test struct. Rename with a
suite__ prefix to avoid name collisions.

Committer notes:

Its '&suite__vectors_page', not '&suite__vectors_pages', noticed when
cross building to arm (32-bit).
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarSohaib Mohamed <sohaib.amhmd@gmail.com>
Acked-by: default avatarJiri 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-5-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent df225205
Hide whitespace changes
Inline Side-by-side
Showing with 397 additions and 348 deletions
tools/perf/arch/arm/tests/arch-tests.c
View file @ d68f0365
......@@ -5,8 +5,8 @@
struct test *arch_tests[] = {
#ifdef HAVE_DWARF_UNWIND_SUPPORT
&dwarf_unwind,
&suite__dwarf_unwind,
#endif
&vectors_page,
&suite__vectors_page,
NULL,
};
tools/perf/arch/arm64/tests/arch-tests.c
View file @ d68f0365
......@@ -5,7 +5,7 @@
struct test *arch_tests[] = {
#ifdef HAVE_DWARF_UNWIND_SUPPORT
&dwarf_unwind,
&suite__dwarf_unwind,
#endif
NULL,
};
tools/perf/arch/powerpc/tests/arch-tests.c
View file @ d68f0365
......@@ -5,7 +5,7 @@
struct test *arch_tests[] = {
#ifdef HAVE_DWARF_UNWIND_SUPPORT
&dwarf_unwind,
&suite__dwarf_unwind,
#endif
NULL,
};
tools/perf/arch/x86/tests/arch-tests.c
View file @ d68f0365
......@@ -14,17 +14,17 @@ DEFINE_SUITE("x86 bp modify", bp_modify);
DEFINE_SUITE("x86 Sample parsing", x86_sample_parsing);
struct test *arch_tests[] = {
&rdpmc,
&suite__rdpmc,
#ifdef HAVE_DWARF_UNWIND_SUPPORT
&dwarf_unwind,
&suite__dwarf_unwind,
#endif
#ifdef HAVE_AUXTRACE_SUPPORT
&insn_x86,
&intel_pt_pkt_decoder,
&suite__insn_x86,
&suite__intel_pt_pkt_decoder,
#endif
#if defined(__x86_64__)
&bp_modify,
&suite__bp_modify,
#endif
&x86_sample_parsing,
&suite__x86_sample_parsing,
NULL,
};
tools/perf/tests/api-io.c
View file @ d68f0365
......@@ -289,8 +289,8 @@ static int test_get_dec(void)
return ret;
}
int test__api_io(struct test *test __maybe_unused,
int subtest __maybe_unused)
static int test__api_io(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int ret = 0;
......@@ -302,3 +302,5 @@ int test__api_io(struct test *test __maybe_unused,
ret = TEST_FAIL;
return ret;
}
DEFINE_SUITE("Test api io", api_io);
tools/perf/tests/attr.c
View file @ d68f0365
......@@ -178,7 +178,7 @@ static int run_dir(const char *d, const char *perf)
return system(cmd) ? TEST_FAIL : TEST_OK;
}
int test__attr(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__attr(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct stat st;
char path_perf[PATH_MAX];
......@@ -207,3 +207,5 @@ int test__attr(struct test *test __maybe_unused, int subtest __maybe_unused)
return TEST_SKIP;
}
DEFINE_SUITE("Setup struct perf_event_attr", attr);
tools/perf/tests/backward-ring-buffer.c
View file @ d68f0365
......@@ -82,7 +82,7 @@ static int do_test(struct evlist *evlist, int mmap_pages,
}
int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int ret = TEST_SKIP, err, sample_count = 0, comm_count = 0;
char pid[16], sbuf[STRERR_BUFSIZE];
......@@ -167,3 +167,5 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m
evlist__delete(evlist);
return ret;
}
DEFINE_SUITE("Read backward ring buffer", backward_ring_buffer);
tools/perf/tests/bitmap.c
View file @ d68f0365
......@@ -40,7 +40,7 @@ static int test_bitmap(const char *str)
return ret;
}
int test__bitmap_print(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__bitmap_print(struct test *test __maybe_unused, int subtest __maybe_unused)
{
TEST_ASSERT_VAL("failed to convert map", test_bitmap("1"));
TEST_ASSERT_VAL("failed to convert map", test_bitmap("1,5"));
......@@ -51,3 +51,5 @@ int test__bitmap_print(struct test *test __maybe_unused, int subtest __maybe_unu
TEST_ASSERT_VAL("failed to convert map", test_bitmap("1-10,12-20,22-30,32-40"));
return 0;
}
DEFINE_SUITE("Print bitmap", bitmap_print);
tools/perf/tests/bp_account.c
View file @ d68f0365
......@@ -173,7 +173,7 @@ static int detect_share(int wp_cnt, int bp_cnt)
* we create another watchpoint to ensure
* the slot accounting is correct
*/
int test__bp_accounting(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__bp_accounting(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int has_ioctl = detect_ioctl();
int wp_cnt = detect_cnt(false);
......@@ -189,7 +189,7 @@ int test__bp_accounting(struct test *test __maybe_unused, int subtest __maybe_un
return bp_accounting(wp_cnt, share);
}
bool test__bp_account_is_supported(void)
static bool test__bp_account_is_supported(void)
{
/*
* PowerPC and S390 do not support creation of instruction
......@@ -204,3 +204,9 @@ bool test__bp_account_is_supported(void)
return true;
#endif
}
struct test suite__bp_accounting = {
.desc = "Breakpoint accounting",
.func = test__bp_accounting,
.is_supported = test__bp_account_is_supported,
};
tools/perf/tests/bp_signal.c
View file @ d68f0365
......@@ -161,7 +161,7 @@ static long long bp_count(int fd)
return count;
}
int test__bp_signal(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__bp_signal(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct sigaction sa;
long long count1, count2, count3;
......@@ -311,3 +311,9 @@ bool test__bp_signal_is_supported(void)
return true;
#endif
}
struct test suite__bp_signal = {
.desc = "Breakpoint overflow signal handler",
.func = test__bp_signal,
.is_supported = test__bp_signal_is_supported,
};
tools/perf/tests/bp_signal_overflow.c
View file @ d68f0365
......@@ -59,7 +59,7 @@ static long long bp_count(int fd)
#define EXECUTIONS 10000
#define THRESHOLD 100
int test__bp_signal_overflow(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__bp_signal_overflow(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_event_attr pe;
struct sigaction sa;
......@@ -133,3 +133,9 @@ int test__bp_signal_overflow(struct test *test __maybe_unused, int subtest __may
return fails ? TEST_FAIL : TEST_OK;
}
struct test suite__bp_signal_overflow = {
.desc = "Breakpoint overflow sampling",
.func = test__bp_signal_overflow,
.is_supported = test__bp_signal_is_supported,
};
tools/perf/tests/bpf.c
View file @ d68f0365
......@@ -283,12 +283,12 @@ static int __test__bpf(int idx)
return ret;
}
int test__bpf_subtest_get_nr(void)
static int test__bpf_subtest_get_nr(void)
{
return (int)ARRAY_SIZE(bpf_testcase_table);
}
const char *test__bpf_subtest_get_desc(int i)
static const char *test__bpf_subtest_get_desc(int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(bpf_testcase_table))
return NULL;
......@@ -325,7 +325,7 @@ static int check_env(void)
return 0;
}
int test__bpf(struct test *test __maybe_unused, int i)
static int test__bpf(struct test *test __maybe_unused, int i)
{
int err;
......@@ -345,19 +345,29 @@ int test__bpf(struct test *test __maybe_unused, int i)
}
#else
int test__bpf_subtest_get_nr(void)
static int test__bpf_subtest_get_nr(void)
{
return 0;
}
const char *test__bpf_subtest_get_desc(int i __maybe_unused)
static const char *test__bpf_subtest_get_desc(int i __maybe_unused)
{
return NULL;
}
int test__bpf(struct test *test __maybe_unused, int i __maybe_unused)
static int test__bpf(struct test *test __maybe_unused, int i __maybe_unused)
{
pr_debug("Skip BPF test because BPF support is not compiled\n");
return TEST_SKIP;
}
#endif
struct test suite__bpf = {
.desc = "BPF filter",
.func = test__bpf,
.subtest = {
.skip_if_fail = true,
.get_nr = test__bpf_subtest_get_nr,
.get_desc = test__bpf_subtest_get_desc,
},
};
tools/perf/tests/builtin-test.c
View file @ d68f0365
......@@ -34,220 +34,79 @@ struct test *__weak arch_tests[] = {
NULL,
};
DEFINE_SUITE("vmlinux symtab matches kallsyms", vmlinux_matches_kallsyms);
DEFINE_SUITE("Detect openat syscall event", openat_syscall_event);
DEFINE_SUITE("Detect openat syscall event on all cpus", openat_syscall_event_on_all_cpus);
DEFINE_SUITE("Read samples using the mmap interface", basic_mmap);
DEFINE_SUITE("Test data source output", mem);
DEFINE_SUITE("Parse event definition strings", parse_events);
DEFINE_SUITE("Simple expression parser", expr);
DEFINE_SUITE("PERF_RECORD_* events & perf_sample fields", PERF_RECORD);
DEFINE_SUITE("Parse perf pmu format", pmu);
static struct test pmu_events = {
.desc = "PMU events",
.func = test__pmu_events,
.subtest = {
.skip_if_fail = false,
.get_nr = test__pmu_events_subtest_get_nr,
.get_desc = test__pmu_events_subtest_get_desc,
.skip_reason = test__pmu_events_subtest_skip_reason,
},
};
DEFINE_SUITE("DSO data read", dso_data);
DEFINE_SUITE("DSO data cache", dso_data_cache);
DEFINE_SUITE("DSO data reopen", dso_data_reopen);
DEFINE_SUITE("Roundtrip evsel->name", perf_evsel__roundtrip_name_test);
DEFINE_SUITE("Parse sched tracepoints fields", perf_evsel__tp_sched_test);
DEFINE_SUITE("syscalls:sys_enter_openat event fields", syscall_openat_tp_fields);
DEFINE_SUITE("Setup struct perf_event_attr", attr);
DEFINE_SUITE("Match and link multiple hists", hists_link);
DEFINE_SUITE("'import perf' in python", python_use);
static struct test bp_signal = {
.desc = "Breakpoint overflow signal handler",
.func = test__bp_signal,
.is_supported = test__bp_signal_is_supported,
};
static struct test bp_signal_overflow = {
.desc = "Breakpoint overflow sampling",
.func = test__bp_signal_overflow,
.is_supported = test__bp_signal_is_supported,
};
static struct test bp_accounting = {
.desc = "Breakpoint accounting",
.func = test__bp_accounting,
.is_supported = test__bp_account_is_supported,
};
static struct test wp = {
.desc = "Watchpoint",
.func = test__wp,
.is_supported = test__wp_is_supported,
.subtest = {
.skip_if_fail = false,
.get_nr = test__wp_subtest_get_nr,
.get_desc = test__wp_subtest_get_desc,
.skip_reason = test__wp_subtest_skip_reason,
},
};
DEFINE_SUITE("Number of exit events of a simple workload", task_exit);
DEFINE_SUITE("Software clock events period values", sw_clock_freq);
DEFINE_SUITE("Object code reading", code_reading);
DEFINE_SUITE("Sample parsing", sample_parsing);
DEFINE_SUITE("Use a dummy software event to keep tracking", keep_tracking);
DEFINE_SUITE("Parse with no sample_id_all bit set", parse_no_sample_id_all);
DEFINE_SUITE("Filter hist entries", hists_filter);
DEFINE_SUITE("Lookup mmap thread", mmap_thread_lookup);
DEFINE_SUITE("Share thread maps", thread_maps_share);
DEFINE_SUITE("Sort output of hist entries", hists_output);
DEFINE_SUITE("Cumulate child hist entries", hists_cumulate);
DEFINE_SUITE("Track with sched_switch", switch_tracking);
DEFINE_SUITE("Filter fds with revents mask in a fdarray", fdarray__filter);
DEFINE_SUITE("Add fd to a fdarray, making it autogrow", fdarray__add);
DEFINE_SUITE("kmod_path__parse", kmod_path__parse);
DEFINE_SUITE("Thread map", thread_map);
static struct test llvm = {
.desc = "LLVM search and compile",
.func = test__llvm,
.subtest = {
.skip_if_fail = true,
.get_nr = test__llvm_subtest_get_nr,
.get_desc = test__llvm_subtest_get_desc,
},
};
DEFINE_SUITE("Session topology", session_topology);
static struct test bpf = {
.desc = "BPF filter",
.func = test__bpf,
.subtest = {
.skip_if_fail = true,
.get_nr = test__bpf_subtest_get_nr,
.get_desc = test__bpf_subtest_get_desc,
},
};
DEFINE_SUITE("Synthesize thread map", thread_map_synthesize);
DEFINE_SUITE("Remove thread map", thread_map_remove);
DEFINE_SUITE("Synthesize cpu map", cpu_map_synthesize);
DEFINE_SUITE("Synthesize stat config", synthesize_stat_config);
DEFINE_SUITE("Synthesize stat", synthesize_stat);
DEFINE_SUITE("Synthesize stat round", synthesize_stat_round);
DEFINE_SUITE("Synthesize attr update", event_update);
DEFINE_SUITE("Event times", event_times);
DEFINE_SUITE("Read backward ring buffer", backward_ring_buffer);
DEFINE_SUITE("Print cpu map", cpu_map_print);
DEFINE_SUITE("Merge cpu map", cpu_map_merge);
DEFINE_SUITE("Probe SDT events", sdt_event);
DEFINE_SUITE("is_printable_array", is_printable_array);
DEFINE_SUITE("Print bitmap", bitmap_print);
DEFINE_SUITE("perf hooks", perf_hooks);
static struct test clang = {
.desc = "builtin clang support",
.func = test__clang,
.subtest = {
.skip_if_fail = true,
.get_nr = test__clang_subtest_get_nr,
.get_desc = test__clang_subtest_get_desc,
}
};
DEFINE_SUITE("unit_number__scnprintf", unit_number__scnprint);
DEFINE_SUITE("mem2node", mem2node);
DEFINE_SUITE("time utils", time_utils);
DEFINE_SUITE("Test jit_write_elf", jit_write_elf);
static struct test pfm = {
.desc = "Test libpfm4 support",
.func = test__pfm,
.subtest = {
.skip_if_fail = true,
.get_nr = test__pfm_subtest_get_nr,
.get_desc = test__pfm_subtest_get_desc,
}
};
DEFINE_SUITE("Test api io", api_io);
DEFINE_SUITE("maps__merge_in", maps__merge_in);
DEFINE_SUITE("Demangle Java", demangle_java);
DEFINE_SUITE("Demangle OCaml", demangle_ocaml);
DEFINE_SUITE("Parse and process metrics", parse_metric);
DEFINE_SUITE("PE file support", pe_file_parsing);
DEFINE_SUITE("Event expansion for cgroups", expand_cgroup_events);
static struct test perf_time_to_tsc = {
.desc = "Convert perf time to TSC",
.func = test__perf_time_to_tsc,
.is_supported = test__tsc_is_supported,
};
DEFINE_SUITE("dlfilter C API", dlfilter);
static struct test *generic_tests[] = {
&vmlinux_matches_kallsyms,
&openat_syscall_event,
&openat_syscall_event_on_all_cpus,
&basic_mmap,
&mem,
&parse_events,
&expr,
&PERF_RECORD,
&pmu,
&pmu_events,
&dso_data,
&dso_data_cache,
&dso_data_reopen,
&perf_evsel__roundtrip_name_test,
&perf_evsel__tp_sched_test,
&syscall_openat_tp_fields,
&attr,
&hists_link,
&python_use,
&bp_signal,
&bp_signal_overflow,
&bp_accounting,
&wp,
&task_exit,
&sw_clock_freq,
&code_reading,
&sample_parsing,
&keep_tracking,
&parse_no_sample_id_all,
&hists_filter,
&mmap_thread_lookup,
&thread_maps_share,
&hists_output,
&hists_cumulate,
&switch_tracking,
&fdarray__filter,
&fdarray__add,
&kmod_path__parse,
&thread_map,
&llvm,
&session_topology,
&bpf,
&thread_map_synthesize,
&thread_map_remove,
&cpu_map_synthesize,
&synthesize_stat_config,
&synthesize_stat,
&synthesize_stat_round,
&event_update,
&event_times,
&backward_ring_buffer,
&cpu_map_print,
&cpu_map_merge,
&sdt_event,
&is_printable_array,
&bitmap_print,
&perf_hooks,
&clang,
&unit_number__scnprint,
&mem2node,
&time_utils,
&jit_write_elf,
&pfm,
&api_io,
&maps__merge_in,
&demangle_java,
&demangle_ocaml,
&parse_metric,
&pe_file_parsing,
&expand_cgroup_events,
&perf_time_to_tsc,
&dlfilter,
&suite__vmlinux_matches_kallsyms,
&suite__openat_syscall_event,
&suite__openat_syscall_event_on_all_cpus,
&suite__basic_mmap,
&suite__mem,
&suite__parse_events,
&suite__expr,
&suite__PERF_RECORD,
&suite__pmu,
&suite__pmu_events,
&suite__dso_data,
&suite__dso_data_cache,
&suite__dso_data_reopen,
&suite__perf_evsel__roundtrip_name_test,
&suite__perf_evsel__tp_sched_test,
&suite__syscall_openat_tp_fields,
&suite__attr,
&suite__hists_link,
&suite__python_use,
&suite__bp_signal,
&suite__bp_signal_overflow,
&suite__bp_accounting,
&suite__wp,
&suite__task_exit,
&suite__sw_clock_freq,
&suite__code_reading,
&suite__sample_parsing,
&suite__keep_tracking,
&suite__parse_no_sample_id_all,
&suite__hists_filter,
&suite__mmap_thread_lookup,
&suite__thread_maps_share,
&suite__hists_output,
&suite__hists_cumulate,
&suite__switch_tracking,
&suite__fdarray__filter,
&suite__fdarray__add,
&suite__kmod_path__parse,
&suite__thread_map,
&suite__llvm,
&suite__session_topology,
&suite__bpf,
&suite__thread_map_synthesize,
&suite__thread_map_remove,
&suite__cpu_map_synthesize,
&suite__synthesize_stat_config,
&suite__synthesize_stat,
&suite__synthesize_stat_round,
&suite__event_update,
&suite__event_times,
&suite__backward_ring_buffer,
&suite__cpu_map_print,
&suite__cpu_map_merge,
&suite__sdt_event,
&suite__is_printable_array,
&suite__bitmap_print,
&suite__perf_hooks,
&suite__clang,
&suite__unit_number__scnprint,
&suite__mem2node,
&suite__time_utils,
&suite__jit_write_elf,
&suite__pfm,
&suite__api_io,
&suite__maps__merge_in,
&suite__demangle_java,
&suite__demangle_ocaml,
&suite__parse_metric,
&suite__pe_file_parsing,
&suite__expand_cgroup_events,
&suite__perf_time_to_tsc,
&suite__dlfilter,
NULL,
};
......
tools/perf/tests/clang.c
View file @ d68f0365
......@@ -19,12 +19,12 @@ static struct {
#endif
};
int test__clang_subtest_get_nr(void)
static int test__clang_subtest_get_nr(void)
{
return (int)ARRAY_SIZE(clang_testcase_table);
}
const char *test__clang_subtest_get_desc(int i)
static const char *test__clang_subtest_get_desc(int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(clang_testcase_table))
return NULL;
......@@ -32,15 +32,25 @@ const char *test__clang_subtest_get_desc(int i)
}
#ifndef HAVE_LIBCLANGLLVM_SUPPORT
int test__clang(struct test *test __maybe_unused, int i __maybe_unused)
static int test__clang(struct test *test __maybe_unused, int i __maybe_unused)
{
return TEST_SKIP;
}
#else
int test__clang(struct test *test __maybe_unused, int i)
static int test__clang(struct test *test __maybe_unused, int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(clang_testcase_table))
return TEST_FAIL;
return clang_testcase_table[i].func();
}
#endif
struct test suite__clang = {
.desc = "builtin clang support",
.func = test__clang,
.subtest = {
.skip_if_fail = true,
.get_nr = test__clang_subtest_get_nr,
.get_desc = test__clang_subtest_get_desc,
}
};
tools/perf/tests/code-reading.c
View file @ d68f0365
......@@ -716,7 +716,7 @@ static int do_test_code_reading(bool try_kcore)
return err;
}
int test__code_reading(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__code_reading(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int ret;
......@@ -743,3 +743,5 @@ int test__code_reading(struct test *test __maybe_unused, int subtest __maybe_unu
return -1;
};
}
DEFINE_SUITE("Object code reading", code_reading);
tools/perf/tests/cpumap.c
View file @ d68f0365
......@@ -75,7 +75,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,
}
int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_cpu_map *cpus;
......@@ -111,7 +111,7 @@ static int cpu_map_print(const char *str)
return !strcmp(buf, str);
}
int test__cpu_map_print(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__cpu_map_print(struct test *test __maybe_unused, int subtest __maybe_unused)
{
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1"));
TEST_ASSERT_VAL("failed to convert map", cpu_map_print("1,5"));
......@@ -123,7 +123,7 @@ int test__cpu_map_print(struct test *test __maybe_unused, int subtest __maybe_un
return 0;
}
int test__cpu_map_merge(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__cpu_map_merge(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_cpu_map *a = perf_cpu_map__new("4,2,1");
struct perf_cpu_map *b = perf_cpu_map__new("4,5,7");
......@@ -137,3 +137,7 @@ int test__cpu_map_merge(struct test *test __maybe_unused, int subtest __maybe_un
perf_cpu_map__put(c);
return 0;
}
DEFINE_SUITE("Synthesize cpu map", cpu_map_synthesize);
DEFINE_SUITE("Print cpu map", cpu_map_print);
DEFINE_SUITE("Merge cpu map", cpu_map_merge);
tools/perf/tests/demangle-java-test.c
View file @ d68f0365
......@@ -7,7 +7,7 @@
#include "debug.h"
#include "demangle-java.h"
int test__demangle_java(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__demangle_java(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int ret = TEST_OK;
char *buf = NULL;
......@@ -40,3 +40,5 @@ int test__demangle_java(struct test *test __maybe_unused, int subtest __maybe_un
return ret;
}
DEFINE_SUITE("Demangle Java", demangle_java);
tools/perf/tests/demangle-ocaml-test.c
View file @ d68f0365
......@@ -7,7 +7,7 @@
#include "debug.h"
#include "demangle-ocaml.h"
int test__demangle_ocaml(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__demangle_ocaml(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int ret = TEST_OK;
char *buf = NULL;
......@@ -41,3 +41,5 @@ int test__demangle_ocaml(struct test *test __maybe_unused, int subtest __maybe_u
return ret;
}
DEFINE_SUITE("Demangle OCaml", demangle_ocaml);
tools/perf/tests/dlfilter-test.c
View file @ d68f0365
......@@ -398,7 +398,7 @@ static void test_data__free(struct test_data *td)
}
}
int test__dlfilter(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__dlfilter(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct test_data td = {.fd = -1};
int pid = getpid();
......@@ -414,3 +414,5 @@ int test__dlfilter(struct test *test __maybe_unused, int subtest __maybe_unused)
test_data__free(&td);
return err;
}
DEFINE_SUITE("dlfilter C API", dlfilter);
tools/perf/tests/dso-data.c
View file @ d68f0365
......@@ -113,7 +113,7 @@ static int dso__data_fd(struct dso *dso, struct machine *machine)
return fd;
}
int test__dso_data(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__dso_data(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct machine machine;
struct dso *dso;
......@@ -248,7 +248,7 @@ static int set_fd_limit(int n)
return setrlimit(RLIMIT_NOFILE, &rlim);
}
int test__dso_data_cache(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__dso_data_cache(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct machine machine;
long nr_end, nr = open_files_cnt();
......@@ -318,7 +318,7 @@ static long new_limit(int count)
return ret;
}
int test__dso_data_reopen(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__dso_data_reopen(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct machine machine;
long nr_end, nr = open_files_cnt(), lim = new_limit(3);
......@@ -393,3 +393,7 @@ int test__dso_data_reopen(struct test *test __maybe_unused, int subtest __maybe_
TEST_ASSERT_VAL("failed leaking files", nr == nr_end);
return 0;
}
DEFINE_SUITE("DSO data read", dso_data);
DEFINE_SUITE("DSO data cache", dso_data_cache);
DEFINE_SUITE("DSO data reopen", dso_data_reopen);
tools/perf/tests/dwarf-unwind.c
View file @ d68f0365
......@@ -238,7 +238,4 @@ static int test__dwarf_unwind(struct test *test __maybe_unused, int subtest __ma
return err;
}
struct test dwarf_unwind = {
.desc = "Test dwarf unwind",
.func = test__dwarf_unwind,
};
DEFINE_SUITE("Test dwarf unwind", dwarf_unwind);
tools/perf/tests/event-times.c
View file @ d68f0365
......@@ -216,7 +216,7 @@ static int test_times(int (attach)(struct evlist *),
* and checks that enabled and running times
* match.
*/
int test__event_times(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__event_times(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err, ret = 0;
......@@ -239,3 +239,5 @@ int test__event_times(struct test *test __maybe_unused, int subtest __maybe_unus
#undef _T
return ret;
}
DEFINE_SUITE("Event times", event_times);
tools/perf/tests/event_update.c
View file @ d68f0365
......@@ -83,7 +83,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,
return 0;
}
int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct evsel *evsel;
struct event_name tmp;
......@@ -123,3 +123,5 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unu
evlist__delete(evlist);
return 0;
}
DEFINE_SUITE("Synthesize attr update", event_update);
tools/perf/tests/evsel-roundtrip-name.c
View file @ d68f0365
......@@ -99,7 +99,8 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names,
#define perf_evsel__name_array_test(names, distance) \
__perf_evsel__name_array_test(names, ARRAY_SIZE(names), distance)
int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int err = 0, ret = 0;
......@@ -120,3 +121,5 @@ int test__perf_evsel__roundtrip_name_test(struct test *test __maybe_unused, int
return ret;
}
DEFINE_SUITE("Roundtrip evsel->name", perf_evsel__roundtrip_name_test);
tools/perf/tests/evsel-tp-sched.c
View file @ d68f0365
......@@ -32,7 +32,8 @@ static int evsel__test_field(struct evsel *evsel, const char *name, int size, bo
return ret;
}
int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
struct evsel *evsel = evsel__newtp("sched", "sched_switch");
int ret = 0;
......@@ -87,3 +88,5 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtes
evsel__delete(evsel);
return ret;
}
DEFINE_SUITE("Parse sched tracepoints fields", perf_evsel__tp_sched_test);
tools/perf/tests/expand-cgroup.c
View file @ d68f0365
......@@ -221,8 +221,8 @@ static int expand_metric_events(void)
return ret;
}
int test__expand_cgroup_events(struct test *test __maybe_unused,
int subtest __maybe_unused)
static int test__expand_cgroup_events(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int ret;
......@@ -240,3 +240,5 @@ int test__expand_cgroup_events(struct test *test __maybe_unused,
return ret;
}
DEFINE_SUITE("Event expansion for cgroups", expand_cgroup_events);
tools/perf/tests/expr.c
View file @ d68f0365
......@@ -62,7 +62,7 @@ static int test(struct expr_parse_ctx *ctx, const char *e, double val2)
return 0;
}
int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
static int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
{
struct expr_id_data *val_ptr;
const char *p;
......@@ -155,3 +155,5 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
return 0;
}
DEFINE_SUITE("Simple expression parser", expr);
tools/perf/tests/fdarray.c
View file @ d68f0365
......@@ -28,7 +28,7 @@ static int fdarray__fprintf_prefix(struct fdarray *fda, const char *prefix, FILE
return printed + fdarray__fprintf(fda, fp);
}
int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int nr_fds, err = TEST_FAIL;
struct fdarray *fda = fdarray__new(5, 5);
......@@ -89,7 +89,7 @@ int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_
return err;
}
int test__fdarray__add(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__fdarray__add(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = TEST_FAIL;
struct fdarray *fda = fdarray__new(2, 2);
......@@ -158,3 +158,6 @@ int test__fdarray__add(struct test *test __maybe_unused, int subtest __maybe_unu
out:
return err;
}
DEFINE_SUITE("Filter fds with revents mask in a fdarray", fdarray__filter);
DEFINE_SUITE("Add fd to a fdarray, making it autogrow", fdarray__add);
tools/perf/tests/genelf.c
View file @ d68f0365
......@@ -16,8 +16,8 @@
#define TEMPL "/tmp/perf-test-XXXXXX"
int test__jit_write_elf(struct test *test __maybe_unused,
int subtest __maybe_unused)
static int test__jit_write_elf(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
#ifdef HAVE_JITDUMP
static unsigned char x86_code[] = {
......@@ -49,3 +49,5 @@ int test__jit_write_elf(struct test *test __maybe_unused,
return TEST_SKIP;
#endif
}
DEFINE_SUITE("Test jit_write_elf", jit_write_elf);
tools/perf/tests/hists_cumulate.c
View file @ d68f0365
......@@ -689,7 +689,7 @@ static int test4(struct evsel *evsel, struct machine *machine)
return err;
}
int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = TEST_FAIL;
struct machines machines;
......@@ -736,3 +736,5 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_u
return err;
}
DEFINE_SUITE("Cumulate child hist entries", hists_cumulate);
tools/perf/tests/hists_filter.c
View file @ d68f0365
......@@ -101,7 +101,7 @@ static int add_hist_entries(struct evlist *evlist,
return TEST_FAIL;
}
int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = TEST_FAIL;
struct machines machines;
......@@ -325,3 +325,5 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu
return err;
}
DEFINE_SUITE("Filter hist entries", hists_filter);
tools/perf/tests/hists_link.c
View file @ d68f0365
......@@ -264,7 +264,7 @@ static int validate_link(struct hists *leader, struct hists *other)
return __validate_link(leader, 0) || __validate_link(other, 1);
}
int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = -1;
struct hists *hists, *first_hists;
......@@ -339,3 +339,5 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unuse
return err;
}
DEFINE_SUITE("Match and link multiple hists", hists_link);
tools/perf/tests/hists_output.c
View file @ d68f0365
......@@ -575,7 +575,7 @@ static int test5(struct evsel *evsel, struct machine *machine)
return err;
}
int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = TEST_FAIL;
struct machines machines;
......@@ -623,3 +623,5 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unu
return err;
}
DEFINE_SUITE("Sort output of hist entries", hists_output);
tools/perf/tests/is_printable_array.c
View file @ d68f0365
......@@ -5,7 +5,7 @@
#include "debug.h"
#include "print_binary.h"
int test__is_printable_array(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__is_printable_array(struct test *test __maybe_unused, int subtest __maybe_unused)
{
char buf1[] = { 'k', 'r', 4, 'v', 'a', 0 };
char buf2[] = { 'k', 'r', 'a', 'v', 4, 0 };
......@@ -36,3 +36,5 @@ int test__is_printable_array(struct test *test __maybe_unused, int subtest __may
return TEST_OK;
}
DEFINE_SUITE("is_printable_array", is_printable_array);
tools/perf/tests/keep-tracking.c
View file @ d68f0365
......@@ -61,7 +61,7 @@ static int find_comm(struct evlist *evlist, const char *comm)
* when an event is disabled but a dummy software event is not disabled. If the
* test passes %0 is returned, otherwise %-1 is returned.
*/
int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct record_opts opts = {
.mmap_pages = UINT_MAX,
......@@ -160,3 +160,5 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
return err;
}
DEFINE_SUITE("Use a dummy software event to keep tracking", keep_tracking);
tools/perf/tests/kmod-path.c
View file @ d68f0365
......@@ -47,7 +47,7 @@ static int test_is_kernel_module(const char *path, int cpumode, bool expect)
#define M(path, c, e) \
TEST_ASSERT_VAL("failed", !test_is_kernel_module(path, c, e))
int test__kmod_path__parse(struct test *t __maybe_unused, int subtest __maybe_unused)
static int test__kmod_path__parse(struct test *t __maybe_unused, int subtest __maybe_unused)
{
/* path alloc_name kmod comp name */
T("/xxxx/xxxx/x-x.ko", true , true, 0 , "[x_x]");
......@@ -159,3 +159,5 @@ int test__kmod_path__parse(struct test *t __maybe_unused, int subtest __maybe_un
return 0;
}
DEFINE_SUITE("kmod_path__parse", kmod_path__parse);
tools/perf/tests/llvm.c
View file @ d68f0365
......@@ -124,7 +124,7 @@ test_llvm__fetch_bpf_obj(void **p_obj_buf,
return ret;
}
int test__llvm(struct test *test __maybe_unused, int subtest)
static int test__llvm(struct test *test __maybe_unused, int subtest)
{
int ret;
void *obj_buf = NULL;
......@@ -149,12 +149,12 @@ int test__llvm(struct test *test __maybe_unused, int subtest)
return ret;
}
int test__llvm_subtest_get_nr(void)
static int test__llvm_subtest_get_nr(void)
{
return __LLVM_TESTCASE_MAX;
}
const char *test__llvm_subtest_get_desc(int subtest)
static const char *test__llvm_subtest_get_desc(int subtest)
{
if ((subtest < 0) || (subtest >= __LLVM_TESTCASE_MAX))
return NULL;
......@@ -162,18 +162,28 @@ const char *test__llvm_subtest_get_desc(int subtest)
return bpf_source_table[subtest].desc;
}
#else //HAVE_LIBBPF_SUPPORT
int test__llvm(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__llvm(struct test *test __maybe_unused, int subtest __maybe_unused)
{
return TEST_SKIP;
}
int test__llvm_subtest_get_nr(void)
static int test__llvm_subtest_get_nr(void)
{
return 0;
}
const char *test__llvm_subtest_get_desc(int subtest __maybe_unused)
static const char *test__llvm_subtest_get_desc(int subtest __maybe_unused)
{
return NULL;
}
#endif // HAVE_LIBBPF_SUPPORT
struct test suite__llvm = {
.desc = "LLVM search and compile",
.func = test__llvm,
.subtest = {
.skip_if_fail = true,
.get_nr = test__llvm_subtest_get_nr,
.get_desc = test__llvm_subtest_get_desc,
},
};
tools/perf/tests/maps.c
View file @ d68f0365
......@@ -33,7 +33,7 @@ static int check_maps(struct map_def *merged, unsigned int size, struct maps *ma
return TEST_OK;
}
int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unused)
static int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unused)
{
struct maps maps;
unsigned int i;
......@@ -120,3 +120,5 @@ int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unus
maps__exit(&maps);
return TEST_OK;
}
DEFINE_SUITE("maps__merge_in", maps__merge_in);
tools/perf/tests/mem.c
View file @ d68f0365
......@@ -23,7 +23,7 @@ static int check(union perf_mem_data_src data_src,
return 0;
}
int test__mem(struct test *text __maybe_unused, int subtest __maybe_unused)
static int test__mem(struct test *text __maybe_unused, int subtest __maybe_unused)
{
int ret = 0;
union perf_mem_data_src src;
......@@ -56,3 +56,5 @@ int test__mem(struct test *text __maybe_unused, int subtest __maybe_unused)
return ret;
}
DEFINE_SUITE("Test data source output", mem);
tools/perf/tests/mem2node.c
View file @ d68f0365
......@@ -43,7 +43,7 @@ static unsigned long *get_bitmap(const char *str, int nbits)
return bm && map ? bm : NULL;
}
int test__mem2node(struct test *t __maybe_unused, int subtest __maybe_unused)
static int test__mem2node(struct test *t __maybe_unused, int subtest __maybe_unused)
{
struct mem2node map;
struct memory_node nodes[3];
......@@ -77,3 +77,5 @@ int test__mem2node(struct test *t __maybe_unused, int subtest __maybe_unused)
mem2node__exit(&map);
return 0;
}
DEFINE_SUITE("mem2node", mem2node);
tools/perf/tests/mmap-basic.c
View file @ d68f0365
......@@ -29,7 +29,7 @@
* Then it checks if the number of syscalls reported as perf events by
* the kernel corresponds to the number of syscalls made.
*/
int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = -1;
union perf_event *event;
......@@ -164,3 +164,5 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
perf_thread_map__put(threads);
return err;
}
DEFINE_SUITE("Read samples using the mmap interface", basic_mmap);
tools/perf/tests/mmap-thread-lookup.c
View file @ d68f0365
......@@ -224,7 +224,7 @@ static int mmap_events(synth_cb synth)
*
* by using all thread objects.
*/
int test__mmap_thread_lookup(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__mmap_thread_lookup(struct test *test __maybe_unused, int subtest __maybe_unused)
{
/* perf_event__synthesize_threads synthesize */
TEST_ASSERT_VAL("failed with sythesizing all",
......@@ -236,3 +236,5 @@ int test__mmap_thread_lookup(struct test *test __maybe_unused, int subtest __may
return 0;
}
DEFINE_SUITE("Lookup mmap thread", mmap_thread_lookup);
tools/perf/tests/openat-syscall-all-cpus.c
View file @ d68f0365
......@@ -19,7 +19,8 @@
#include "stat.h"
#include "util/counts.h"
int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int err = -1, fd, cpu;
struct perf_cpu_map *cpus;
......@@ -127,3 +128,5 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int
perf_thread_map__put(threads);
return err;
}
DEFINE_SUITE("Detect openat syscall event on all cpus", openat_syscall_event_on_all_cpus);
tools/perf/tests/openat-syscall-tp-fields.c
View file @ d68f0365
......@@ -22,7 +22,8 @@
#define AT_FDCWD -100
#endif
int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__syscall_openat_tp_fields(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
struct record_opts opts = {
.target = {
......@@ -142,3 +143,5 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
out:
return err;
}
DEFINE_SUITE("syscalls:sys_enter_openat event fields", syscall_openat_tp_fields);
tools/perf/tests/openat-syscall.c
View file @ d68f0365
......@@ -13,7 +13,8 @@
#include "tests.h"
#include "util/counts.h"
int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__openat_syscall_event(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int err = -1, fd;
struct evsel *evsel;
......@@ -66,3 +67,5 @@ int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __m
perf_thread_map__put(threads);
return err;
}
DEFINE_SUITE("Detect openat syscall event", openat_syscall_event);
tools/perf/tests/parse-events.c
View file @ d68f0365
......@@ -2276,7 +2276,7 @@ static int test_pmu_events_alias(char *event, char *alias)
return test_event(&e);
}
int test__parse_events(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__parse_events(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int ret1, ret2 = 0;
char *event, *alias;
......@@ -2319,3 +2319,5 @@ do { \
return ret2;
}
DEFINE_SUITE("Parse event definition strings", parse_events);
tools/perf/tests/parse-metric.c
View file @ d68f0365
......@@ -369,7 +369,7 @@ static int test_metric_group(void)
return 0;
}
int test__parse_metric(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__parse_metric(struct test *test __maybe_unused, int subtest __maybe_unused)
{
TEST_ASSERT_VAL("IPC failed", test_ipc() == 0);
TEST_ASSERT_VAL("frontend failed", test_frontend() == 0);
......@@ -383,3 +383,5 @@ int test__parse_metric(struct test *test __maybe_unused, int subtest __maybe_unu
}
return 0;
}
DEFINE_SUITE("Parse and process metrics", parse_metric);
tools/perf/tests/parse-no-sample-id-all.c
View file @ d68f0365
......@@ -67,7 +67,8 @@ struct test_attr_event {
*
* Return: %0 on success, %-1 if the test fails.
*/
int test__parse_no_sample_id_all(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__parse_no_sample_id_all(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int err;
......@@ -103,3 +104,5 @@ int test__parse_no_sample_id_all(struct test *test __maybe_unused, int subtest _
return 0;
}
DEFINE_SUITE("Parse with no sample_id_all bit set", parse_no_sample_id_all);
tools/perf/tests/pe-file-parsing.c
View file @ d68f0365
......@@ -68,7 +68,7 @@ static int run_dir(const char *d)
return TEST_OK;
}
int test__pe_file_parsing(struct test *test __maybe_unused,
static int test__pe_file_parsing(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
struct stat st;
......@@ -89,10 +89,12 @@ int test__pe_file_parsing(struct test *test __maybe_unused,
#else
int test__pe_file_parsing(struct test *test __maybe_unused,
static int test__pe_file_parsing(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
return TEST_SKIP;
}
#endif
DEFINE_SUITE("PE file support", pe_file_parsing);
tools/perf/tests/perf-hooks.c
View file @ d68f0365
......@@ -26,7 +26,7 @@ static void the_hook(void *_hook_flags)
raise(SIGSEGV);
}
int test__perf_hooks(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__perf_hooks(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int hook_flags = 0;
......@@ -45,3 +45,5 @@ int test__perf_hooks(struct test *test __maybe_unused, int subtest __maybe_unuse
return TEST_FAIL;
return TEST_OK;
}
DEFINE_SUITE("perf hooks", perf_hooks);
tools/perf/tests/perf-record.c
View file @ d68f0365
......@@ -41,7 +41,7 @@ static int sched__get_first_possible_cpu(pid_t pid, cpu_set_t *maskp)
return cpu;
}
int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct record_opts opts = {
.target = {
......@@ -332,3 +332,5 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
out:
return (err < 0 || errs > 0) ? -1 : 0;
}
DEFINE_SUITE("PERF_RECORD_* events & perf_sample fields", PERF_RECORD);
tools/perf/tests/perf-time-to-tsc.c
View file @ d68f0365
......@@ -45,7 +45,7 @@
* %0 is returned, otherwise %-1 is returned. If TSC conversion is not
* supported then then the test passes but " (not supported)" is printed.
*/
int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct record_opts opts = {
.mmap_pages = UINT_MAX,
......@@ -185,7 +185,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe
return err;
}
bool test__tsc_is_supported(void)
static bool test__tsc_is_supported(void)
{
/*
* Except x86_64/i386 and Arm64, other archs don't support TSC in perf.
......@@ -197,3 +197,9 @@ bool test__tsc_is_supported(void)
return false;
#endif
}
struct test suite__perf_time_to_tsc = {
.desc = "Convert perf time to TSC",
.func = test__perf_time_to_tsc,
.is_supported = test__tsc_is_supported,
};
tools/perf/tests/pfm.c
View file @ d68f0365
......@@ -189,19 +189,19 @@ static int test__pfm_group(void)
}
#endif
const char *test__pfm_subtest_get_desc(int i)
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;
}
int test__pfm_subtest_get_nr(void)
static int test__pfm_subtest_get_nr(void)
{
return (int)ARRAY_SIZE(pfm_testcase_table);
}
int test__pfm(struct test *test __maybe_unused, int i __maybe_unused)
static int test__pfm(struct test *test __maybe_unused, int i __maybe_unused)
{
#ifdef HAVE_LIBPFM
if (i < 0 || i >= (int)ARRAY_SIZE(pfm_testcase_table))
......@@ -211,3 +211,13 @@ int test__pfm(struct test *test __maybe_unused, int i __maybe_unused)
return TEST_SKIP;
#endif
}
struct test suite__pfm = {
.desc = "Test libpfm4 support",
.func = test__pfm,
.subtest = {
.skip_if_fail = true,
.get_nr = test__pfm_subtest_get_nr,
.get_desc = test__pfm_subtest_get_desc,
}
};
tools/perf/tests/pmu-events.c
View file @ d68f0365
......@@ -1090,7 +1090,7 @@ static const struct {
},
};
const char *test__pmu_events_subtest_get_desc(int subtest)
static const char *test__pmu_events_subtest_get_desc(int subtest)
{
if (subtest < 0 ||
subtest >= (int)ARRAY_SIZE(pmu_events_testcase_table))
......@@ -1098,7 +1098,7 @@ const char *test__pmu_events_subtest_get_desc(int subtest)
return pmu_events_testcase_table[subtest].desc;
}
const char *test__pmu_events_subtest_skip_reason(int subtest)
static const char *test__pmu_events_subtest_skip_reason(int subtest)
{
if (subtest < 0 ||
subtest >= (int)ARRAY_SIZE(pmu_events_testcase_table))
......@@ -1108,15 +1108,26 @@ const char *test__pmu_events_subtest_skip_reason(int subtest)
return "some metrics failed";
}
int test__pmu_events_subtest_get_nr(void)
static int test__pmu_events_subtest_get_nr(void)
{
return (int)ARRAY_SIZE(pmu_events_testcase_table);
}
int test__pmu_events(struct test *test __maybe_unused, int subtest)
static int test__pmu_events(struct test *test __maybe_unused, int subtest)
{
if (subtest < 0 ||
subtest >= (int)ARRAY_SIZE(pmu_events_testcase_table))
return TEST_FAIL;
return pmu_events_testcase_table[subtest].func();
}
struct test suite__pmu_events = {
.desc = "PMU events",
.func = test__pmu_events,
.subtest = {
.skip_if_fail = false,
.get_nr = test__pmu_events_subtest_get_nr,
.get_desc = test__pmu_events_subtest_get_desc,
.skip_reason = test__pmu_events_subtest_skip_reason,
},
};
tools/perf/tests/pmu.c
View file @ d68f0365
......@@ -137,7 +137,7 @@ static struct list_head *test_terms_list(void)
return &terms;
}
int test__pmu(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__pmu(struct test *test __maybe_unused, int subtest __maybe_unused)
{
char *format = test_format_dir_get();
LIST_HEAD(formats);
......@@ -177,3 +177,5 @@ int test__pmu(struct test *test __maybe_unused, int subtest __maybe_unused)
test_format_dir_put(format);
return ret;
}
DEFINE_SUITE("Parse perf pmu format", pmu);
tools/perf/tests/python-use.c
View file @ d68f0365
......@@ -9,7 +9,7 @@
#include "tests.h"
#include "util/debug.h"
int test__python_use(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__python_use(struct test *test __maybe_unused, int subtest __maybe_unused)
{
char *cmd;
int ret;
......@@ -23,3 +23,5 @@ int test__python_use(struct test *test __maybe_unused, int subtest __maybe_unuse
free(cmd);
return ret;
}
DEFINE_SUITE("'import perf' in python", python_use);
tools/perf/tests/sample-parsing.c
View file @ d68f0365
......@@ -368,7 +368,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
* checks sample format bits separately and together. If the test passes %0 is
* returned, otherwise %-1 is returned.
*/
int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_unused)
{
const u64 rf[] = {4, 5, 6, 7, 12, 13, 14, 15};
u64 sample_type;
......@@ -426,3 +426,5 @@ int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_u
return 0;
}
DEFINE_SUITE("Sample parsing", sample_parsing);
tools/perf/tests/sdt.c
View file @ d68f0365
......@@ -76,7 +76,7 @@ static int search_cached_probe(const char *target,
return ret;
}
int test__sdt_event(struct test *test __maybe_unused, int subtests __maybe_unused)
static int test__sdt_event(struct test *test __maybe_unused, int subtests __maybe_unused)
{
int ret = TEST_FAIL;
char __tempdir[] = "./test-buildid-XXXXXX";
......@@ -114,9 +114,11 @@ int test__sdt_event(struct test *test __maybe_unused, int subtests __maybe_unuse
return ret;
}
#else
int test__sdt_event(struct test *test __maybe_unused, int subtests __maybe_unused)
static int test__sdt_event(struct test *test __maybe_unused, int subtests __maybe_unused)
{
pr_debug("Skip SDT event test because SDT support is not compiled\n");
return TEST_SKIP;
}
#endif
DEFINE_SUITE("Probe SDT events", sdt_event);
tools/perf/tests/stat.c
View file @ d68f0365
......@@ -47,7 +47,8 @@ static int process_stat_config_event(struct perf_tool *tool __maybe_unused,
return 0;
}
int test__synthesize_stat_config(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__synthesize_stat_config(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
struct perf_stat_config stat_config = {
.aggr_mode = AGGR_CORE,
......@@ -77,7 +78,7 @@ static int process_stat_event(struct perf_tool *tool __maybe_unused,
return 0;
}
int test__synthesize_stat(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__synthesize_stat(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_counts_values count;
......@@ -103,7 +104,7 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
return 0;
}
int test__synthesize_stat_round(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__synthesize_stat_round(struct test *test __maybe_unused, int subtest __maybe_unused)
{
TEST_ASSERT_VAL("failed to synthesize stat_config",
!perf_event__synthesize_stat_round(NULL, 0xdeadbeef, PERF_STAT_ROUND_TYPE__INTERVAL,
......@@ -111,3 +112,7 @@ int test__synthesize_stat_round(struct test *test __maybe_unused, int subtest __
return 0;
}
DEFINE_SUITE("Synthesize stat config", synthesize_stat_config);
DEFINE_SUITE("Synthesize stat", synthesize_stat);
DEFINE_SUITE("Synthesize stat round", synthesize_stat_round);
tools/perf/tests/sw-clock.c
View file @ d68f0365
......@@ -133,7 +133,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
return err;
}
int test__sw_clock_freq(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__sw_clock_freq(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int ret;
......@@ -143,3 +143,5 @@ int test__sw_clock_freq(struct test *test __maybe_unused, int subtest __maybe_un
return ret;
}
DEFINE_SUITE("Software clock events period values", sw_clock_freq);
tools/perf/tests/switch-tracking.c
View file @ d68f0365
......@@ -321,7 +321,7 @@ static int process_events(struct evlist *evlist,
* evsel->core.system_wide and evsel->tracking flags (respectively) with other events
* sometimes enabled or disabled.
*/
int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_unused)
{
const char *sched_switch = "sched:sched_switch";
struct switch_tracking switch_tracking = { .tids = NULL, };
......@@ -588,3 +588,5 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
err = -1;
goto out;
}
DEFINE_SUITE("Track with sched_switch", switch_tracking);
tools/perf/tests/task-exit.c
View file @ d68f0365
......@@ -39,7 +39,7 @@ static void workload_exec_failed_signal(int signo __maybe_unused,
* if the number of exit event reported by the kernel is 1 or not
* in order to check the kernel returns correct number of event.
*/
int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused)
{
int err = -1;
union perf_event *event;
......@@ -151,3 +151,5 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
evlist__delete(evlist);
return err;
}
DEFINE_SUITE("Number of exit events of a simple workload", task_exit);
tools/perf/tests/tests.h
View file @ d68f0365
......@@ -41,10 +41,10 @@ struct test {
};
#define DECLARE_SUITE(name) \
int test__##name(struct test *test, int subtest)
extern struct test suite__##name;
#define DEFINE_SUITE(description, name) \
static struct test name = { \
struct test suite__##name = { \
.desc = description, \
.func = test__##name, \
}
......@@ -60,9 +60,6 @@ DECLARE_SUITE(perf_evsel__tp_sched_test);
DECLARE_SUITE(syscall_openat_tp_fields);
DECLARE_SUITE(pmu);
DECLARE_SUITE(pmu_events);
const char *test__pmu_events_subtest_get_desc(int subtest);
const char *test__pmu_events_subtest_skip_reason(int subtest);
int test__pmu_events_subtest_get_nr(void);
DECLARE_SUITE(attr);
DECLARE_SUITE(dso_data);
DECLARE_SUITE(dso_data_cache);
......@@ -74,9 +71,6 @@ DECLARE_SUITE(bp_signal);
DECLARE_SUITE(bp_signal_overflow);
DECLARE_SUITE(bp_accounting);
DECLARE_SUITE(wp);
const char *test__wp_subtest_get_desc(int subtest);
const char *test__wp_subtest_skip_reason(int subtest);
int test__wp_subtest_get_nr(void);
DECLARE_SUITE(task_exit);
DECLARE_SUITE(mem);
DECLARE_SUITE(sw_clock_freq);
......@@ -84,7 +78,7 @@ DECLARE_SUITE(code_reading);
DECLARE_SUITE(sample_parsing);
DECLARE_SUITE(keep_tracking);
DECLARE_SUITE(parse_no_sample_id_all);
extern struct test dwarf_unwind;
DECLARE_SUITE(dwarf_unwind);
DECLARE_SUITE(expr);
DECLARE_SUITE(hists_filter);
DECLARE_SUITE(mmap_thread_lookup);
......@@ -97,11 +91,7 @@ DECLARE_SUITE(fdarray__add);
DECLARE_SUITE(kmod_path__parse);
DECLARE_SUITE(thread_map);
DECLARE_SUITE(llvm);
const char *test__llvm_subtest_get_desc(int subtest);
int test__llvm_subtest_get_nr(void);
DECLARE_SUITE(bpf);
const char *test__bpf_subtest_get_desc(int subtest);
int test__bpf_subtest_get_nr(void);
DECLARE_SUITE(session_topology);
DECLARE_SUITE(thread_map_synthesize);
DECLARE_SUITE(thread_map_remove);
......@@ -119,8 +109,6 @@ DECLARE_SUITE(is_printable_array);
DECLARE_SUITE(bitmap_print);
DECLARE_SUITE(perf_hooks);
DECLARE_SUITE(clang);
const char *test__clang_subtest_get_desc(int subtest);
int test__clang_subtest_get_nr(void);
DECLARE_SUITE(unit_number__scnprint);
DECLARE_SUITE(mem2node);
DECLARE_SUITE(maps__merge_in);
......@@ -130,8 +118,6 @@ DECLARE_SUITE(api_io);
DECLARE_SUITE(demangle_java);
DECLARE_SUITE(demangle_ocaml);
DECLARE_SUITE(pfm);
const char *test__pfm_subtest_get_desc(int subtest);
int test__pfm_subtest_get_nr(void);
DECLARE_SUITE(parse_metric);
DECLARE_SUITE(pe_file_parsing);
DECLARE_SUITE(expand_cgroup_events);
......@@ -139,9 +125,6 @@ DECLARE_SUITE(perf_time_to_tsc);
DECLARE_SUITE(dlfilter);
bool test__bp_signal_is_supported(void);
bool test__bp_account_is_supported(void);
bool test__wp_is_supported(void);
bool test__tsc_is_supported(void);
#ifdef HAVE_DWARF_UNWIND_SUPPORT
struct thread;
......
tools/perf/tests/thread-map.c
View file @ d68f0365
......@@ -19,7 +19,7 @@ struct machine;
#define NAME (const char *) "perf"
#define NAMEUL (unsigned long) NAME
int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_thread_map *map;
......@@ -86,7 +86,7 @@ static int process_event(struct perf_tool *tool __maybe_unused,
return 0;
}
int test__thread_map_synthesize(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__thread_map_synthesize(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_thread_map *threads;
......@@ -106,7 +106,7 @@ int test__thread_map_synthesize(struct test *test __maybe_unused, int subtest __
return 0;
}
int test__thread_map_remove(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__thread_map_remove(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct perf_thread_map *threads;
char *str;
......@@ -145,3 +145,7 @@ int test__thread_map_remove(struct test *test __maybe_unused, int subtest __mayb
perf_thread_map__put(threads);
return 0;
}
DEFINE_SUITE("Thread map", thread_map);
DEFINE_SUITE("Synthesize thread map", thread_map_synthesize);
DEFINE_SUITE("Remove thread map", thread_map_remove);
tools/perf/tests/thread-maps-share.c
View file @ d68f0365
......@@ -4,7 +4,7 @@
#include "thread.h"
#include "debug.h"
int test__thread_maps_share(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__thread_maps_share(struct test *test __maybe_unused, int subtest __maybe_unused)
{
struct machines machines;
struct machine *machine;
......@@ -96,3 +96,5 @@ int test__thread_maps_share(struct test *test __maybe_unused, int subtest __mayb
machines__exit(&machines);
return 0;
}
DEFINE_SUITE("Share thread maps", thread_maps_share);
tools/perf/tests/time-utils-test.c
View file @ d68f0365
......@@ -131,7 +131,7 @@ static bool test__perf_time__parse_for_ranges(struct test_data *d)
return pass;
}
int test__time_utils(struct test *t __maybe_unused, int subtest __maybe_unused)
static int test__time_utils(struct test *t __maybe_unused, int subtest __maybe_unused)
{
bool pass = true;
......@@ -249,3 +249,5 @@ int test__time_utils(struct test *t __maybe_unused, int subtest __maybe_unused)
return pass ? 0 : TEST_FAIL;
}
DEFINE_SUITE("time utils", time_utils);
tools/perf/tests/topology.c
View file @ d68f0365
......@@ -175,7 +175,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
return 0;
}
int test__session_topology(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__session_topology(struct test *test __maybe_unused, int subtest __maybe_unused)
{
char path[PATH_MAX];
struct perf_cpu_map *map;
......@@ -201,3 +201,5 @@ int test__session_topology(struct test *test __maybe_unused, int subtest __maybe
unlink(path);
return ret;
}
DEFINE_SUITE("Session topology", session_topology);
tools/perf/tests/unit_number__scnprintf.c
View file @ d68f0365
......@@ -7,7 +7,7 @@
#include "units.h"
#include "debug.h"
int test__unit_number__scnprint(struct test *t __maybe_unused, int subtest __maybe_unused)
static int test__unit_number__scnprint(struct test *t __maybe_unused, int subtest __maybe_unused)
{
struct {
u64 n;
......@@ -38,3 +38,5 @@ int test__unit_number__scnprint(struct test *t __maybe_unused, int subtest __may
return TEST_OK;
}
DEFINE_SUITE("unit_number__scnprintf", unit_number__scnprint);
tools/perf/tests/vmlinux-kallsyms.c
View file @ d68f0365
......@@ -111,7 +111,8 @@ static bool is_ignored_symbol(const char *name, char type)
return false;
}
int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest __maybe_unused)
static int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused,
int subtest __maybe_unused)
{
int err = -1;
struct rb_node *nd;
......@@ -352,3 +353,5 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest
machine__exit(&vmlinux);
return err;
}
DEFINE_SUITE("vmlinux symtab matches kallsyms", vmlinux_matches_kallsyms);
tools/perf/tests/wp.c
View file @ d68f0365
......@@ -209,19 +209,19 @@ static struct {
},
};
int test__wp_subtest_get_nr(void)
static int test__wp_subtest_get_nr(void)
{
return (int)ARRAY_SIZE(wp_testcase_table);
}
const char *test__wp_subtest_get_desc(int i)
static const char *test__wp_subtest_get_desc(int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(wp_testcase_table))
return NULL;
return wp_testcase_table[i].desc;
}
const char *test__wp_subtest_skip_reason(int i)
static const char *test__wp_subtest_skip_reason(int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(wp_testcase_table))
return NULL;
......@@ -230,7 +230,7 @@ const char *test__wp_subtest_skip_reason(int i)
return wp_testcase_table[i].skip_msg();
}
int test__wp(struct test *test __maybe_unused, int i)
static int test__wp(struct test *test __maybe_unused, int i)
{
if (i < 0 || i >= (int)ARRAY_SIZE(wp_testcase_table))
return TEST_FAIL;
......@@ -245,7 +245,7 @@ int test__wp(struct test *test __maybe_unused, int i)
/* The s390 so far does not have support for
* instruction breakpoint using the perf_event_open() system call.
*/
bool test__wp_is_supported(void)
static bool test__wp_is_supported(void)
{
#if defined(__s390x__)
return false;
......@@ -253,3 +253,15 @@ bool test__wp_is_supported(void)
return true;
#endif
}
struct test suite__wp = {
.desc = "Watchpoint",
.func = test__wp,
.is_supported = test__wp_is_supported,
.subtest = {
.skip_if_fail = false,
.get_nr = test__wp_subtest_get_nr,
.get_desc = test__wp_subtest_get_desc,
.skip_reason = test__wp_subtest_skip_reason,
},
};
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7