Skip to content

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

perf test: Parse events tidy evlist_test 

Remove two unused variables. Make structs const. Also fix the array
index (aka id) for the event software/r0x1a/.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Carsten Haitzler <carsten.haitzler@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Marco Elver <elver@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Sohaib Mohamed <sohaib.amhmd@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20220518042027.836799-7-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b58eca40
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 87 deletions
tools/perf/tests/parse-events.c
View file @ 8252e791
...@@ -1637,344 +1637,342 @@ static int test__hybrid_cache_event(struct evlist *evlist) ...@@ -1637,344 +1637,342 @@ static int test__hybrid_cache_event(struct evlist *evlist)
struct evlist_test { struct evlist_test {
const char *name; const char *name;
__u32 type;
const int id;
bool (*valid)(void); bool (*valid)(void);
int (*check)(struct evlist *evlist); int (*check)(struct evlist *evlist);
}; };
static struct evlist_test test__events[] = { static const struct evlist_test test__events[] = {
{ {
.name = "syscalls:sys_enter_openat", .name = "syscalls:sys_enter_openat",
.check = test__checkevent_tracepoint, .check = test__checkevent_tracepoint,
.id = 0, /* 0 */
}, },
{ {
.name = "syscalls:*", .name = "syscalls:*",
.check = test__checkevent_tracepoint_multi, .check = test__checkevent_tracepoint_multi,
.id = 1, /* 1 */
}, },
{ {
.name = "r1a", .name = "r1a",
.check = test__checkevent_raw, .check = test__checkevent_raw,
.id = 2, /* 2 */
}, },
{ {
.name = "1:1", .name = "1:1",
.check = test__checkevent_numeric, .check = test__checkevent_numeric,
.id = 3, /* 3 */
}, },
{ {
.name = "instructions", .name = "instructions",
.check = test__checkevent_symbolic_name, .check = test__checkevent_symbolic_name,
.id = 4, /* 4 */
}, },
{ {
.name = "cycles/period=100000,config2/", .name = "cycles/period=100000,config2/",
.check = test__checkevent_symbolic_name_config, .check = test__checkevent_symbolic_name_config,
.id = 5, /* 5 */
}, },
{ {
.name = "faults", .name = "faults",
.check = test__checkevent_symbolic_alias, .check = test__checkevent_symbolic_alias,
.id = 6, /* 6 */
}, },
{ {
.name = "L1-dcache-load-miss", .name = "L1-dcache-load-miss",
.check = test__checkevent_genhw, .check = test__checkevent_genhw,
.id = 7, /* 7 */
}, },
{ {
.name = "mem:0", .name = "mem:0",
.check = test__checkevent_breakpoint, .check = test__checkevent_breakpoint,
.id = 8, /* 8 */
}, },
{ {
.name = "mem:0:x", .name = "mem:0:x",
.check = test__checkevent_breakpoint_x, .check = test__checkevent_breakpoint_x,
.id = 9, /* 9 */
}, },
{ {
.name = "mem:0:r", .name = "mem:0:r",
.check = test__checkevent_breakpoint_r, .check = test__checkevent_breakpoint_r,
.id = 10, /* 0 */
}, },
{ {
.name = "mem:0:w", .name = "mem:0:w",
.check = test__checkevent_breakpoint_w, .check = test__checkevent_breakpoint_w,
.id = 11, /* 1 */
}, },
{ {
.name = "syscalls:sys_enter_openat:k", .name = "syscalls:sys_enter_openat:k",
.check = test__checkevent_tracepoint_modifier, .check = test__checkevent_tracepoint_modifier,
.id = 12, /* 2 */
}, },
{ {
.name = "syscalls:*:u", .name = "syscalls:*:u",
.check = test__checkevent_tracepoint_multi_modifier, .check = test__checkevent_tracepoint_multi_modifier,
.id = 13, /* 3 */
}, },
{ {
.name = "r1a:kp", .name = "r1a:kp",
.check = test__checkevent_raw_modifier, .check = test__checkevent_raw_modifier,
.id = 14, /* 4 */
}, },
{ {
.name = "1:1:hp", .name = "1:1:hp",
.check = test__checkevent_numeric_modifier, .check = test__checkevent_numeric_modifier,
.id = 15, /* 5 */
}, },
{ {
.name = "instructions:h", .name = "instructions:h",
.check = test__checkevent_symbolic_name_modifier, .check = test__checkevent_symbolic_name_modifier,
.id = 16, /* 6 */
}, },
{ {
.name = "faults:u", .name = "faults:u",
.check = test__checkevent_symbolic_alias_modifier, .check = test__checkevent_symbolic_alias_modifier,
.id = 17, /* 7 */
}, },
{ {
.name = "L1-dcache-load-miss:kp", .name = "L1-dcache-load-miss:kp",
.check = test__checkevent_genhw_modifier, .check = test__checkevent_genhw_modifier,
.id = 18, /* 8 */
}, },
{ {
.name = "mem:0:u", .name = "mem:0:u",
.check = test__checkevent_breakpoint_modifier, .check = test__checkevent_breakpoint_modifier,
.id = 19, /* 9 */
}, },
{ {
.name = "mem:0:x:k", .name = "mem:0:x:k",
.check = test__checkevent_breakpoint_x_modifier, .check = test__checkevent_breakpoint_x_modifier,
.id = 20, /* 0 */
}, },
{ {
.name = "mem:0:r:hp", .name = "mem:0:r:hp",
.check = test__checkevent_breakpoint_r_modifier, .check = test__checkevent_breakpoint_r_modifier,
.id = 21, /* 1 */
}, },
{ {
.name = "mem:0:w:up", .name = "mem:0:w:up",
.check = test__checkevent_breakpoint_w_modifier, .check = test__checkevent_breakpoint_w_modifier,
.id = 22, /* 2 */
}, },
{ {
.name = "r1,syscalls:sys_enter_openat:k,1:1:hp", .name = "r1,syscalls:sys_enter_openat:k,1:1:hp",
.check = test__checkevent_list, .check = test__checkevent_list,
.id = 23, /* 3 */
}, },
{ {
.name = "instructions:G", .name = "instructions:G",
.check = test__checkevent_exclude_host_modifier, .check = test__checkevent_exclude_host_modifier,
.id = 24, /* 4 */
}, },
{ {
.name = "instructions:H", .name = "instructions:H",
.check = test__checkevent_exclude_guest_modifier, .check = test__checkevent_exclude_guest_modifier,
.id = 25, /* 5 */
}, },
{ {
.name = "mem:0:rw", .name = "mem:0:rw",
.check = test__checkevent_breakpoint_rw, .check = test__checkevent_breakpoint_rw,
.id = 26, /* 6 */
}, },
{ {
.name = "mem:0:rw:kp", .name = "mem:0:rw:kp",
.check = test__checkevent_breakpoint_rw_modifier, .check = test__checkevent_breakpoint_rw_modifier,
.id = 27, /* 7 */
}, },
{ {
.name = "{instructions:k,cycles:upp}", .name = "{instructions:k,cycles:upp}",
.check = test__group1, .check = test__group1,
.id = 28, /* 8 */
}, },
{ {
.name = "{faults:k,cache-references}:u,cycles:k", .name = "{faults:k,cache-references}:u,cycles:k",
.check = test__group2, .check = test__group2,
.id = 29, /* 9 */
}, },
{ {
.name = "group1{syscalls:sys_enter_openat:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u", .name = "group1{syscalls:sys_enter_openat:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u",
.check = test__group3, .check = test__group3,
.id = 30, /* 0 */
}, },
{ {
.name = "{cycles:u,instructions:kp}:p", .name = "{cycles:u,instructions:kp}:p",
.check = test__group4, .check = test__group4,
.id = 31, /* 1 */
}, },
{ {
.name = "{cycles,instructions}:G,{cycles:G,instructions:G},cycles", .name = "{cycles,instructions}:G,{cycles:G,instructions:G},cycles",
.check = test__group5, .check = test__group5,
.id = 32, /* 2 */
}, },
{ {
.name = "*:*", .name = "*:*",
.check = test__all_tracepoints, .check = test__all_tracepoints,
.id = 33, /* 3 */
}, },
{ {
.name = "{cycles,cache-misses:G}:H", .name = "{cycles,cache-misses:G}:H",
.check = test__group_gh1, .check = test__group_gh1,
.id = 34, /* 4 */
}, },
{ {
.name = "{cycles,cache-misses:H}:G", .name = "{cycles,cache-misses:H}:G",
.check = test__group_gh2, .check = test__group_gh2,
.id = 35, /* 5 */
}, },
{ {
.name = "{cycles:G,cache-misses:H}:u", .name = "{cycles:G,cache-misses:H}:u",
.check = test__group_gh3, .check = test__group_gh3,
.id = 36, /* 6 */
}, },
{ {
.name = "{cycles:G,cache-misses:H}:uG", .name = "{cycles:G,cache-misses:H}:uG",
.check = test__group_gh4, .check = test__group_gh4,
.id = 37, /* 7 */
}, },
{ {
.name = "{cycles,cache-misses,branch-misses}:S", .name = "{cycles,cache-misses,branch-misses}:S",
.check = test__leader_sample1, .check = test__leader_sample1,
.id = 38, /* 8 */
}, },
{ {
.name = "{instructions,branch-misses}:Su", .name = "{instructions,branch-misses}:Su",
.check = test__leader_sample2, .check = test__leader_sample2,
.id = 39, /* 9 */
}, },
{ {
.name = "instructions:uDp", .name = "instructions:uDp",
.check = test__checkevent_pinned_modifier, .check = test__checkevent_pinned_modifier,
.id = 40, /* 0 */
}, },
{ {
.name = "{cycles,cache-misses,branch-misses}:D", .name = "{cycles,cache-misses,branch-misses}:D",
.check = test__pinned_group, .check = test__pinned_group,
.id = 41, /* 1 */
}, },
{ {
.name = "mem:0/1", .name = "mem:0/1",
.check = test__checkevent_breakpoint_len, .check = test__checkevent_breakpoint_len,
.id = 42, /* 2 */
}, },
{ {
.name = "mem:0/2:w", .name = "mem:0/2:w",
.check = test__checkevent_breakpoint_len_w, .check = test__checkevent_breakpoint_len_w,
.id = 43, /* 3 */
}, },
{ {
.name = "mem:0/4:rw:u", .name = "mem:0/4:rw:u",
.check = test__checkevent_breakpoint_len_rw_modifier, .check = test__checkevent_breakpoint_len_rw_modifier,
.id = 44 /* 4 */
}, },
#if defined(__s390x__) #if defined(__s390x__)
{ {
.name = "kvm-s390:kvm_s390_create_vm", .name = "kvm-s390:kvm_s390_create_vm",
.check = test__checkevent_tracepoint, .check = test__checkevent_tracepoint,
.valid = kvm_s390_create_vm_valid, .valid = kvm_s390_create_vm_valid,
.id = 100, /* 0 */
}, },
#endif #endif
{ {
.name = "instructions:I", .name = "instructions:I",
.check = test__checkevent_exclude_idle_modifier, .check = test__checkevent_exclude_idle_modifier,
.id = 45, /* 5 */
}, },
{ {
.name = "instructions:kIG", .name = "instructions:kIG",
.check = test__checkevent_exclude_idle_modifier_1, .check = test__checkevent_exclude_idle_modifier_1,
.id = 46, /* 6 */
}, },
{ {
.name = "task-clock:P,cycles", .name = "task-clock:P,cycles",
.check = test__checkevent_precise_max_modifier, .check = test__checkevent_precise_max_modifier,
.id = 47, /* 7 */
}, },
{ {
.name = "instructions/name=insn/", .name = "instructions/name=insn/",
.check = test__checkevent_config_symbol, .check = test__checkevent_config_symbol,
.id = 48, /* 8 */
}, },
{ {
.name = "r1234/name=rawpmu/", .name = "r1234/name=rawpmu/",
.check = test__checkevent_config_raw, .check = test__checkevent_config_raw,
.id = 49, /* 9 */
}, },
{ {
.name = "4:0x6530160/name=numpmu/", .name = "4:0x6530160/name=numpmu/",
.check = test__checkevent_config_num, .check = test__checkevent_config_num,
.id = 50, /* 0 */
}, },
{ {
.name = "L1-dcache-misses/name=cachepmu/", .name = "L1-dcache-misses/name=cachepmu/",
.check = test__checkevent_config_cache, .check = test__checkevent_config_cache,
.id = 51, /* 1 */
}, },
{ {
.name = "intel_pt//u", .name = "intel_pt//u",
.valid = test__intel_pt_valid, .valid = test__intel_pt_valid,
.check = test__intel_pt, .check = test__intel_pt,
.id = 52, /* 2 */
}, },
{ {
.name = "cycles/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks'/Duk", .name = "cycles/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks'/Duk",
.check = test__checkevent_complex_name, .check = test__checkevent_complex_name,
.id = 53 /* 3 */
}, },
{ {
.name = "cycles//u", .name = "cycles//u",
.check = test__sym_event_slash, .check = test__sym_event_slash,
.id = 54, /* 4 */
}, },
{ {
.name = "cycles:k", .name = "cycles:k",
.check = test__sym_event_dc, .check = test__sym_event_dc,
.id = 55, /* 5 */
}, },
{ {
.name = "instructions:uep", .name = "instructions:uep",
.check = test__checkevent_exclusive_modifier, .check = test__checkevent_exclusive_modifier,
.id = 56, /* 6 */
}, },
{ {
.name = "{cycles,cache-misses,branch-misses}:e", .name = "{cycles,cache-misses,branch-misses}:e",
.check = test__exclusive_group, .check = test__exclusive_group,
.id = 57, /* 7 */
}, },
}; };
static struct evlist_test test__events_pmu[] = { static const struct evlist_test test__events_pmu[] = {
{ {
.name = "cpu/config=10,config1,config2=3,period=1000/u", .name = "cpu/config=10,config1,config2=3,period=1000/u",
.check = test__checkevent_pmu, .check = test__checkevent_pmu,
.id = 0, /* 0 */
}, },
{ {
.name = "cpu/config=1,name=krava/u,cpu/config=2/u", .name = "cpu/config=1,name=krava/u,cpu/config=2/u",
.check = test__checkevent_pmu_name, .check = test__checkevent_pmu_name,
.id = 1, /* 1 */
}, },
{ {
.name = "cpu/config=1,call-graph=fp,time,period=100000/,cpu/config=2,call-graph=no,time=0,period=2000/", .name = "cpu/config=1,call-graph=fp,time,period=100000/,cpu/config=2,call-graph=no,time=0,period=2000/",
.check = test__checkevent_pmu_partial_time_callgraph, .check = test__checkevent_pmu_partial_time_callgraph,
.id = 2, /* 2 */
}, },
{ {
.name = "cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp", .name = "cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp",
.check = test__checkevent_complex_name, .check = test__checkevent_complex_name,
.id = 3, /* 3 */
}, },
{ {
.name = "software/r1a/", .name = "software/r1a/",
.check = test__checkevent_raw_pmu, .check = test__checkevent_raw_pmu,
.id = 4, /* 4 */
}, },
{ {
.name = "software/r0x1a/", .name = "software/r0x1a/",
.check = test__checkevent_raw_pmu, .check = test__checkevent_raw_pmu,
.id = 4, /* 5 */
}, },
}; };
...@@ -1990,55 +1988,55 @@ static const struct terms_test test__terms[] = { ...@@ -1990,55 +1988,55 @@ static const struct terms_test test__terms[] = {
}, },
}; };
static struct evlist_test test__hybrid_events[] = { static const struct evlist_test test__hybrid_events[] = {
{ {
.name = "cpu_core/cpu-cycles/", .name = "cpu_core/cpu-cycles/",
.check = test__hybrid_hw_event_with_pmu, .check = test__hybrid_hw_event_with_pmu,
.id = 0, /* 0 */
}, },
{ {
.name = "{cpu_core/cpu-cycles/,cpu_core/instructions/}", .name = "{cpu_core/cpu-cycles/,cpu_core/instructions/}",
.check = test__hybrid_hw_group_event, .check = test__hybrid_hw_group_event,
.id = 1, /* 1 */
}, },
{ {
.name = "{cpu-clock,cpu_core/cpu-cycles/}", .name = "{cpu-clock,cpu_core/cpu-cycles/}",
.check = test__hybrid_sw_hw_group_event, .check = test__hybrid_sw_hw_group_event,
.id = 2, /* 2 */
}, },
{ {
.name = "{cpu_core/cpu-cycles/,cpu-clock}", .name = "{cpu_core/cpu-cycles/,cpu-clock}",
.check = test__hybrid_hw_sw_group_event, .check = test__hybrid_hw_sw_group_event,
.id = 3, /* 3 */
}, },
{ {
.name = "{cpu_core/cpu-cycles/k,cpu_core/instructions/u}", .name = "{cpu_core/cpu-cycles/k,cpu_core/instructions/u}",
.check = test__hybrid_group_modifier1, .check = test__hybrid_group_modifier1,
.id = 4, /* 4 */
}, },
{ {
.name = "r1a", .name = "r1a",
.check = test__hybrid_raw1, .check = test__hybrid_raw1,
.id = 5, /* 5 */
}, },
{ {
.name = "cpu_core/r1a/", .name = "cpu_core/r1a/",
.check = test__hybrid_raw2, .check = test__hybrid_raw2,
.id = 6, /* 6 */
}, },
{ {
.name = "cpu_core/config=10,config1,config2=3,period=1000/u", .name = "cpu_core/config=10,config1,config2=3,period=1000/u",
.check = test__checkevent_pmu, .check = test__checkevent_pmu,
.id = 7, /* 7 */
}, },
{ {
.name = "cpu_core/LLC-loads/", .name = "cpu_core/LLC-loads/",
.check = test__hybrid_cache_event, .check = test__hybrid_cache_event,
.id = 8, /* 8 */
}, },
}; };
static int test_event(struct evlist_test *e) static int test_event(const struct evlist_test *e)
{ {
struct parse_events_error err; struct parse_events_error err;
struct evlist *evlist; struct evlist *evlist;
...@@ -2093,15 +2091,14 @@ static int test_event_fake_pmu(const char *str) ...@@ -2093,15 +2091,14 @@ static int test_event_fake_pmu(const char *str)
return ret; return ret;
} }
static int test_events(struct evlist_test *events, unsigned cnt) static int test_events(const struct evlist_test *events, int cnt)
{ {
int ret1, ret2 = 0; int ret1, ret2 = 0;
unsigned i;
for (i = 0; i < cnt; i++) { for (int i = 0; i < cnt; i++) {
struct evlist_test *e = &events[i]; const struct evlist_test *e = &events[i];
pr_debug("running test %d '%s'", e->id, e->name); pr_debug("running test %d '%s'", i, e->name);
ret1 = test_event(e); ret1 = test_event(e);
if (ret1) if (ret1)
ret2 = ret1; ret2 = ret1;
...@@ -2193,7 +2190,7 @@ static int test_pmu_events(void) ...@@ -2193,7 +2190,7 @@ static int test_pmu_events(void)
} }
while (!ret && (ent = readdir(dir))) { while (!ret && (ent = readdir(dir))) {
struct evlist_test e = { .id = 0, }; struct evlist_test e = { .name = NULL, };
char name[2 * NAME_MAX + 1 + 12 + 3]; char name[2 * NAME_MAX + 1 + 12 + 3];
/* Names containing . are special and cannot be used directly */ /* Names containing . are special and cannot be used directly */
...@@ -2288,7 +2285,7 @@ static int test__checkevent_pmu_events_alias(struct evlist *evlist) ...@@ -2288,7 +2285,7 @@ static int test__checkevent_pmu_events_alias(struct evlist *evlist)
static int test_pmu_events_alias(char *event, char *alias) static int test_pmu_events_alias(char *event, char *alias)
{ {
struct evlist_test e = { .id = 0, }; struct evlist_test e = { .name = NULL, };
char name[2 * NAME_MAX + 20]; char name[2 * NAME_MAX + 20];
snprintf(name, sizeof(name), "%s/event=1/,%s/event=1/", snprintf(name, sizeof(name), "%s/event=1/,%s/event=1/",
......
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