AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf evsel: Rename perf_evsel__is_*() to evsel__is*()

Browse Source 
As those are 'struct evsel' methods, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2020-04-30 10:51:16 -03:00
parent 3a50dc7605
commit c754c382c9
26 changed files with 103 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/builtin-annotate.c
View File

@ -436,8 +436,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
evsel__reset_sample_bit(pos, CALLCHAIN); evsel__reset_sample_bit(pos, CALLCHAIN);
perf_evsel__output_resort(pos, NULL); perf_evsel__output_resort(pos, NULL);
if (symbol_conf.event_group && if (symbol_conf.event_group && !evsel__is_group_leader(pos))
!perf_evsel__is_group_leader(pos))
continue; continue;
hists__find_annotations(hists, pos, ann); hists__find_annotations(hists, pos, ann);

2
tools/perf/builtin-diff.c
View File

@ -467,7 +467,7 @@ static struct evsel *evsel_match(struct evsel *evsel,
struct evsel *e; struct evsel *e;
evlist__for_each_entry(evlist, e) { evlist__for_each_entry(evlist, e) {
if (perf_evsel__match2(evsel, e)) if (evsel__match2(evsel, e))
return e; return e;
} }

8
tools/perf/builtin-report.c
View File

@ -459,7 +459,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report
nr_events = hists->stats.total_non_filtered_period; nr_events = hists->stats.total_non_filtered_period;
} }
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
struct evsel *pos; struct evsel *pos;
evsel__group_desc(evsel, buf, size); evsel__group_desc(evsel, buf, size);
@ -539,8 +539,7 @@ static int perf_evlist__tty_browse_hists(struct evlist *evlist,
struct hists *hists = evsel__hists(pos); struct hists *hists = evsel__hists(pos);
const char *evname = evsel__name(pos); const char *evname = evsel__name(pos);
if (symbol_conf.event_group && if (symbol_conf.event_group && !evsel__is_group_leader(pos))
!perf_evsel__is_group_leader(pos))
continue; continue;
hists__fprintf_nr_sample_events(hists, rep, evname, stdout); hists__fprintf_nr_sample_events(hists, rep, evname, stdout);
@ -682,8 +681,7 @@ static int report__collapse_hists(struct report *rep)
break; break;
/* Non-group events are considered as leader */ /* Non-group events are considered as leader */
if (symbol_conf.event_group && if (symbol_conf.event_group && !evsel__is_group_leader(pos)) {
!perf_evsel__is_group_leader(pos)) {
struct hists *leader_hists = evsel__hists(pos->leader); struct hists *leader_hists = evsel__hists(pos->leader);
hists__match(leader_hists, hists); hists__match(leader_hists, hists);

2
tools/perf/builtin-script.c
View File

@ -1948,7 +1948,7 @@ static void process_event(struct perf_script *script,
else if (PRINT_FIELD(BRSTACKOFF)) else if (PRINT_FIELD(BRSTACKOFF))
perf_sample__fprintf_brstackoff(sample, thread, attr, fp); perf_sample__fprintf_brstackoff(sample, thread, attr, fp);
if (perf_evsel__is_bpf_output(evsel) && PRINT_FIELD(BPF_OUTPUT)) if (evsel__is_bpf_output(evsel) && PRINT_FIELD(BPF_OUTPUT))
perf_sample__fprintf_bpf_output(sample, fp); perf_sample__fprintf_bpf_output(sample, fp);
perf_sample__fprintf_insn(sample, attr, thread, machine, fp); perf_sample__fprintf_insn(sample, attr, thread, machine, fp);

3
tools/perf/builtin-top.c
View File

@ -298,8 +298,7 @@ static void perf_top__resort_hists(struct perf_top *t)
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
/* Non-group events are considered as leader */ /* Non-group events are considered as leader */
if (symbol_conf.event_group && if (symbol_conf.event_group && !evsel__is_group_leader(pos)) {
!perf_evsel__is_group_leader(pos)) {
struct hists *leader_hists = evsel__hists(pos->leader); struct hists *leader_hists = evsel__hists(pos->leader);
hists__match(leader_hists, hists); hists__match(leader_hists, hists);

2
tools/perf/builtin-trace.c
View File

@ -2774,7 +2774,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,
fprintf(trace->output, "%s(", evsel->name); fprintf(trace->output, "%s(", evsel->name);
if (perf_evsel__is_bpf_output(evsel)) { if (evsel__is_bpf_output(evsel)) {
bpf_output__fprintf(trace, sample); bpf_output__fprintf(trace, sample);
} else if (evsel->tp_format) { } else if (evsel->tp_format) {
if (strncmp(evsel->tp_format->name, "sys_enter_", 10) || if (strncmp(evsel->tp_format->name, "sys_enter_", 10) ||

4
tools/perf/tests/evsel-roundtrip-name.c
View File

@ -20,7 +20,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)
for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
/* skip invalid cache type */ /* skip invalid cache type */
if (!perf_evsel__is_cache_op_valid(type, op)) if (!evsel__is_cache_op_valid(type, op))
continue; continue;
for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
@ -38,7 +38,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)
for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
/* skip invalid cache type */ /* skip invalid cache type */
if (!perf_evsel__is_cache_op_valid(type, op)) if (!evsel__is_cache_op_valid(type, op))
continue; continue;
for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {

28
tools/perf/tests/parse-events.c
View File

@ -652,7 +652,7 @@ static int test__group1(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@ -694,7 +694,7 @@ static int test__group2(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@ -725,7 +725,7 @@ static int test__group2(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
return 0; return 0;
@ -750,7 +750,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong group name", TEST_ASSERT_VAL("wrong group name",
!strcmp(leader->group_name, "group1")); !strcmp(leader->group_name, "group1"));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
@ -785,7 +785,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong group name", TEST_ASSERT_VAL("wrong group name",
!strcmp(leader->group_name, "group2")); !strcmp(leader->group_name, "group2"));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
@ -817,7 +817,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
return 0; return 0;
@ -843,7 +843,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 1); TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 1);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@ -886,7 +886,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@ -918,7 +918,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@ -948,7 +948,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
return 0; return 0;
} }
@ -972,7 +972,7 @@ static int test__group_gh1(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
@ -1012,7 +1012,7 @@ static int test__group_gh2(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
@ -1052,7 +1052,7 @@ static int test__group_gh3(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);
@ -1092,7 +1092,7 @@ static int test__group_gh4(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name); TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);
TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

6
tools/perf/ui/browsers/hists.c
View File

@ -3424,7 +3424,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED : ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED :
HE_COLORSET_NORMAL); HE_COLORSET_NORMAL);
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
struct evsel *pos; struct evsel *pos;
ev_name = evsel__group_name(evsel); ev_name = evsel__group_name(evsel);
@ -3554,7 +3554,7 @@ static bool filter_group_entries(struct ui_browser *browser __maybe_unused,
{ {
struct evsel *evsel = list_entry(entry, struct evsel, core.node); struct evsel *evsel = list_entry(entry, struct evsel, core.node);
if (symbol_conf.event_group && !perf_evsel__is_group_leader(evsel)) if (symbol_conf.event_group && !evsel__is_group_leader(evsel))
return true; return true;
return false; return false;
@ -3622,7 +3622,7 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help,
nr_entries = 0; nr_entries = 0;
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
if (perf_evsel__is_group_leader(pos)) if (evsel__is_group_leader(pos))
nr_entries++; nr_entries++;
} }

2
tools/perf/ui/gtk/annotate.c
View File

@ -130,7 +130,7 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct map_symbol *ms,
gtk_list_store_append(store, &iter); gtk_list_store_append(store, &iter);
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
for (i = 0; i < evsel->core.nr_members; i++) { for (i = 0; i < evsel->core.nr_members; i++) {
ret += perf_gtk__get_percent(s + ret, ret += perf_gtk__get_percent(s + ret,
sizeof(s) - ret, sizeof(s) - ret,

2
tools/perf/ui/gtk/hists.c
View File

@ -642,7 +642,7 @@ int perf_evlist__gtk_browse_hists(struct evlist *evlist,
size_t size = sizeof(buf); size_t size = sizeof(buf);
if (symbol_conf.event_group) { if (symbol_conf.event_group) {
if (!perf_evsel__is_group_leader(pos)) if (!evsel__is_group_leader(pos))
continue; continue;
if (pos->core.nr_members > 1) { if (pos->core.nr_members > 1) {

6
tools/perf/ui/hist.c
View File

@ -43,7 +43,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
} else } else
ret = hpp__call_print_fn(hpp, print_fn, fmt, len, get_field(he)); ret = hpp__call_print_fn(hpp, print_fn, fmt, len, get_field(he));
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
int prev_idx, idx_delta; int prev_idx, idx_delta;
struct hist_entry *pair; struct hist_entry *pair;
int nr_members = evsel->core.nr_members; int nr_members = evsel->core.nr_members;
@ -190,7 +190,7 @@ static int __hpp__group_sort_idx(struct hist_entry *a, struct hist_entry *b,
int cmp, nr_members, ret, i; int cmp, nr_members, ret, i;
cmp = field_cmp(get_field(a), get_field(b)); cmp = field_cmp(get_field(a), get_field(b));
if (!perf_evsel__is_group_event(evsel)) if (!evsel__is_group_event(evsel))
return cmp; return cmp;
nr_members = evsel->core.nr_members; nr_members = evsel->core.nr_members;
@ -240,7 +240,7 @@ static int __hpp__sort(struct hist_entry *a, struct hist_entry *b,
return ret; return ret;
evsel = hists_to_evsel(a->hists); evsel = hists_to_evsel(a->hists);
if (!perf_evsel__is_group_event(evsel)) if (!evsel__is_group_event(evsel))
return ret; return ret;
nr_members = evsel->core.nr_members; nr_members = evsel->core.nr_members;

10
tools/perf/util/annotate.c
View File

@ -1191,7 +1191,7 @@ static struct disasm_line *disasm_line__new(struct annotate_args *args)
struct disasm_line *dl = NULL; struct disasm_line *dl = NULL;
int nr = 1; int nr = 1;
if (perf_evsel__is_group_event(args->evsel)) if (evsel__is_group_event(args->evsel))
nr = args->evsel->core.nr_members; nr = args->evsel->core.nr_members;
dl = zalloc(disasm_line_size(nr)); dl = zalloc(disasm_line_size(nr));
@ -1437,7 +1437,7 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start
if (queue) if (queue)
return -1; return -1;
if (perf_evsel__is_group_event(evsel)) if (evsel__is_group_event(evsel))
width *= evsel->core.nr_members; width *= evsel->core.nr_members;
if (!*al->line) if (!*al->line)
@ -2368,7 +2368,7 @@ int symbol__annotate_printf(struct map_symbol *ms, struct evsel *evsel,
len = symbol__size(sym); len = symbol__size(sym);
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
width *= evsel->core.nr_members; width *= evsel->core.nr_members;
evsel__group_desc(evsel, buf, sizeof(buf)); evsel__group_desc(evsel, buf, sizeof(buf));
evsel_name = buf; evsel_name = buf;
@ -2518,7 +2518,7 @@ int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel,
if (fp == NULL) if (fp == NULL)
goto out_free_filename; goto out_free_filename;
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
evsel__group_desc(evsel, buf, sizeof(buf)); evsel__group_desc(evsel, buf, sizeof(buf));
ev_name = buf; ev_name = buf;
} }
@ -3064,7 +3064,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
if (notes->offsets == NULL) if (notes->offsets == NULL)
return ENOMEM; return ENOMEM;
if (perf_evsel__is_group_event(evsel)) if (evsel__is_group_event(evsel))
nr_pcnt = evsel->core.nr_members; nr_pcnt = evsel->core.nr_members;
err = symbol__annotate(ms, evsel, options, parch); err = symbol__annotate(ms, evsel, options, parch);

8
tools/perf/util/auxtrace.c
View File

@ -70,7 +70,7 @@ static int perf_evlist__regroup(struct evlist *evlist,
struct evsel *evsel; struct evsel *evsel;
bool grp; bool grp;
if (!perf_evsel__is_group_leader(leader)) if (!evsel__is_group_leader(leader))
return -EINVAL; return -EINVAL;
grp = false; grp = false;
@ -685,7 +685,7 @@ static int auxtrace_validate_aux_sample_size(struct evlist *evlist,
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
sz = evsel->core.attr.aux_sample_size; sz = evsel->core.attr.aux_sample_size;
if (perf_evsel__is_group_leader(evsel)) { if (evsel__is_group_leader(evsel)) {
has_aux_leader = evsel__is_aux_event(evsel); has_aux_leader = evsel__is_aux_event(evsel);
if (sz) { if (sz) {
if (has_aux_leader) if (has_aux_leader)
@ -759,7 +759,7 @@ int auxtrace_parse_sample_options(struct auxtrace_record *itr,
/* Set aux_sample_size based on --aux-sample option */ /* Set aux_sample_size based on --aux-sample option */
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (perf_evsel__is_group_leader(evsel)) { if (evsel__is_group_leader(evsel)) {
has_aux_leader = evsel__is_aux_event(evsel); has_aux_leader = evsel__is_aux_event(evsel);
} else if (has_aux_leader) { } else if (has_aux_leader) {
evsel->core.attr.aux_sample_size = sz; evsel->core.attr.aux_sample_size = sz;
@ -1247,7 +1247,7 @@ static void unleader_auxtrace(struct perf_session *session)
evlist__for_each_entry(session->evlist, evsel) { evlist__for_each_entry(session->evlist, evsel) {
if (auxtrace__evsel_is_auxtrace(session, evsel) && if (auxtrace__evsel_is_auxtrace(session, evsel) &&
perf_evsel__is_group_leader(evsel)) { evsel__is_group_leader(evsel)) {
unleader_evsel(session->evlist, evsel); unleader_evsel(session->evlist, evsel);
} }
} }

2
tools/perf/util/bpf-loader.c
View File

@ -1430,7 +1430,7 @@ apply_config_evsel_for_key(const char *name, int map_fd, void *pkey,
return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTINH; return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTINH;
} }
if (perf_evsel__is_bpf_output(evsel)) if (evsel__is_bpf_output(evsel))
check_pass = true; check_pass = true;
if (attr->type == PERF_TYPE_RAW) if (attr->type == PERF_TYPE_RAW)
check_pass = true; check_pass = true;

4
tools/perf/util/data-convert-bt.c
View File

@ -835,7 +835,7 @@ static int process_sample_event(struct perf_tool *tool,
return -1; return -1;
} }
if (perf_evsel__is_bpf_output(evsel)) { if (evsel__is_bpf_output(evsel)) {
ret = add_bpf_output_values(event_class, event, sample); ret = add_bpf_output_values(event_class, event, sample);
if (ret) if (ret)
return -1; return -1;
@ -1174,7 +1174,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)
goto err; goto err;
} }
if (perf_evsel__is_bpf_output(evsel)) { if (evsel__is_bpf_output(evsel)) {
ret = add_bpf_output_types(cw, event_class); ret = add_bpf_output_types(cw, event_class);
if (ret) if (ret)
goto err; goto err;

8
tools/perf/util/evlist.c
View File

@ -391,14 +391,14 @@ void evlist__disable(struct evlist *evlist)
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
if (evsel__cpu_iter_skip(pos, cpu)) if (evsel__cpu_iter_skip(pos, cpu))
continue; continue;
if (pos->disabled || !perf_evsel__is_group_leader(pos) || !pos->core.fd) if (pos->disabled || !evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
evsel__disable_cpu(pos, pos->cpu_iter - 1); evsel__disable_cpu(pos, pos->cpu_iter - 1);
} }
} }
affinity__cleanup(&affinity); affinity__cleanup(&affinity);
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
if (!perf_evsel__is_group_leader(pos) || !pos->core.fd) if (!evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
pos->disabled = true; pos->disabled = true;
} }
@ -421,14 +421,14 @@ void evlist__enable(struct evlist *evlist)
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
if (evsel__cpu_iter_skip(pos, cpu)) if (evsel__cpu_iter_skip(pos, cpu))
continue; continue;
if (!perf_evsel__is_group_leader(pos) || !pos->core.fd) if (!evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
evsel__enable_cpu(pos, pos->cpu_iter - 1); evsel__enable_cpu(pos, pos->cpu_iter - 1);
} }
} }
affinity__cleanup(&affinity); affinity__cleanup(&affinity);
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
if (!perf_evsel__is_group_leader(pos) || !pos->core.fd) if (!evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
pos->disabled = false; pos->disabled = false;
} }

26
tools/perf/util/evsel.c
View File

@ -217,14 +217,14 @@ void evsel__set_sample_id(struct evsel *evsel,
} }
/** /**
* perf_evsel__is_function_event - Return whether given evsel is a function * evsel__is_function_event - Return whether given evsel is a function
* trace event * trace event
* *
* @evsel - evsel selector to be tested * @evsel - evsel selector to be tested
* *
* Return %true if event is function trace event * Return %true if event is function trace event
*/ */
bool perf_evsel__is_function_event(struct evsel *evsel) bool evsel__is_function_event(struct evsel *evsel)
{ {
#define FUNCTION_EVENT "ftrace:function" #define FUNCTION_EVENT "ftrace:function"
@ -267,13 +267,13 @@ struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)
return NULL; return NULL;
evsel__init(evsel, attr, idx); evsel__init(evsel, attr, idx);
if (perf_evsel__is_bpf_output(evsel)) { if (evsel__is_bpf_output(evsel)) {
evsel->core.attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | evsel->core.attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD), PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD),
evsel->core.attr.sample_period = 1; evsel->core.attr.sample_period = 1;
} }
if (perf_evsel__is_clock(evsel)) { if (evsel__is_clock(evsel)) {
/* /*
* The evsel->unit points to static alias->unit * The evsel->unit points to static alias->unit
* so it's ok to use static string in here. * so it's ok to use static string in here.
@ -531,7 +531,7 @@ static unsigned long perf_evsel__hw_cache_stat[C(MAX)] = {
[C(NODE)] = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH), [C(NODE)] = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH),
}; };
bool perf_evsel__is_cache_op_valid(u8 type, u8 op) bool evsel__is_cache_op_valid(u8 type, u8 op)
{ {
if (perf_evsel__hw_cache_stat[type] & COP(op)) if (perf_evsel__hw_cache_stat[type] & COP(op))
return true; /* valid */ return true; /* valid */
@ -570,7 +570,7 @@ static int __evsel__hw_cache_name(u64 config, char *bf, size_t size)
goto out_err; goto out_err;
err = "invalid-cache"; err = "invalid-cache";
if (!perf_evsel__is_cache_op_valid(type, op)) if (!evsel__is_cache_op_valid(type, op))
goto out_err; goto out_err;
return __evsel__hw_cache_type_op_res_name(type, op, result, bf, size); return __evsel__hw_cache_type_op_res_name(type, op, result, bf, size);
@ -686,7 +686,7 @@ int evsel__group_desc(struct evsel *evsel, char *buf, size_t size)
static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *opts, static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *opts,
struct callchain_param *param) struct callchain_param *param)
{ {
bool function = perf_evsel__is_function_event(evsel); bool function = evsel__is_function_event(evsel);
struct perf_event_attr *attr = &evsel->core.attr; struct perf_event_attr *attr = &evsel->core.attr;
evsel__set_sample_bit(evsel, CALLCHAIN); evsel__set_sample_bit(evsel, CALLCHAIN);
@ -1018,7 +1018,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
* event, due to issues with page faults while tracing page * event, due to issues with page faults while tracing page
* fault handler and its overall trickiness nature. * fault handler and its overall trickiness nature.
*/ */
if (perf_evsel__is_function_event(evsel)) if (evsel__is_function_event(evsel))
evsel->core.attr.exclude_callchain_user = 1; evsel->core.attr.exclude_callchain_user = 1;
if (callchain && callchain->enabled && !evsel->no_aux_samples) if (callchain && callchain->enabled && !evsel->no_aux_samples)
@ -1103,14 +1103,14 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
* Disabling only independent events or group leaders, * Disabling only independent events or group leaders,
* keeping group members enabled. * keeping group members enabled.
*/ */
if (perf_evsel__is_group_leader(evsel)) if (evsel__is_group_leader(evsel))
attr->disabled = 1; attr->disabled = 1;
/* /*
* Setting enable_on_exec for independent events and * Setting enable_on_exec for independent events and
* group leaders for traced executed by perf. * group leaders for traced executed by perf.
*/ */
if (target__none(&opts->target) && perf_evsel__is_group_leader(evsel) && if (target__none(&opts->target) && evsel__is_group_leader(evsel) &&
!opts->initial_delay) !opts->initial_delay)
attr->enable_on_exec = 1; attr->enable_on_exec = 1;
@ -1389,7 +1389,7 @@ perf_evsel__read_group(struct evsel *leader, int cpu, int thread)
if (!(read_format & PERF_FORMAT_ID)) if (!(read_format & PERF_FORMAT_ID))
return -EINVAL; return -EINVAL;
if (!perf_evsel__is_group_leader(leader)) if (!evsel__is_group_leader(leader))
return -EINVAL; return -EINVAL;
if (!data) { if (!data) {
@ -1445,7 +1445,7 @@ static int get_group_fd(struct evsel *evsel, int cpu, int thread)
struct evsel *leader = evsel->leader; struct evsel *leader = evsel->leader;
int fd; int fd;
if (perf_evsel__is_group_leader(evsel)) if (evsel__is_group_leader(evsel))
return -1; return -1;
/* /*
@ -1829,7 +1829,7 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
} else if (!perf_missing_features.group_read && } else if (!perf_missing_features.group_read &&
evsel->core.attr.inherit && evsel->core.attr.inherit &&
(evsel->core.attr.read_format & PERF_FORMAT_GROUP) && (evsel->core.attr.read_format & PERF_FORMAT_GROUP) &&
perf_evsel__is_group_leader(evsel)) { evsel__is_group_leader(evsel)) {
perf_missing_features.group_read = true; perf_missing_features.group_read = true;
pr_debug2_peo("switching off group read\n"); pr_debug2_peo("switching off group read\n");
goto fallback_missing_features; goto fallback_missing_features;

29
tools/perf/util/evsel.h
View File

@ -196,7 +196,7 @@ void evsel__config_callchain(struct evsel *evsel, struct record_opts *opts,
int __evsel__sample_size(u64 sample_type); int __evsel__sample_size(u64 sample_type);
void evsel__calc_id_pos(struct evsel *evsel); void evsel__calc_id_pos(struct evsel *evsel);
bool perf_evsel__is_cache_op_valid(u8 type, u8 op); bool evsel__is_cache_op_valid(u8 type, u8 op);
#define PERF_EVSEL__MAX_ALIASES 8 #define PERF_EVSEL__MAX_ALIASES 8
@ -255,12 +255,11 @@ u64 format_field__intval(struct tep_format_field *field, struct perf_sample *sam
struct tep_format_field *evsel__field(struct evsel *evsel, const char *name); struct tep_format_field *evsel__field(struct evsel *evsel, const char *name);
#define perf_evsel__match(evsel, t, c) \ #define evsel__match(evsel, t, c) \
(evsel->core.attr.type == PERF_TYPE_##t && \ (evsel->core.attr.type == PERF_TYPE_##t && \
evsel->core.attr.config == PERF_COUNT_##c) evsel->core.attr.config == PERF_COUNT_##c)
static inline bool perf_evsel__match2(struct evsel *e1, static inline bool evsel__match2(struct evsel *e1, struct evsel *e2)
struct evsel *e2)
{ {
return (e1->core.attr.type == e2->core.attr.type) && return (e1->core.attr.type == e2->core.attr.type) &&
(e1->core.attr.config == e2->core.attr.config); (e1->core.attr.config == e2->core.attr.config);
@ -321,44 +320,44 @@ static inline struct evsel *perf_evsel__prev(struct evsel *evsel)
} }
/** /**
* perf_evsel__is_group_leader - Return whether given evsel is a leader event * evsel__is_group_leader - Return whether given evsel is a leader event
* *
* @evsel - evsel selector to be tested * @evsel - evsel selector to be tested
* *
* Return %true if @evsel is a group leader or a stand-alone event * Return %true if @evsel is a group leader or a stand-alone event
*/ */
static inline bool perf_evsel__is_group_leader(const struct evsel *evsel) static inline bool evsel__is_group_leader(const struct evsel *evsel)
{ {
return evsel->leader == evsel; return evsel->leader == evsel;
} }
/** /**
* perf_evsel__is_group_event - Return whether given evsel is a group event * evsel__is_group_event - Return whether given evsel is a group event
* *
* @evsel - evsel selector to be tested * @evsel - evsel selector to be tested
* *
* Return %true iff event group view is enabled and @evsel is a actual group * Return %true iff event group view is enabled and @evsel is a actual group
* leader which has other members in the group * leader which has other members in the group
*/ */
static inline bool perf_evsel__is_group_event(struct evsel *evsel) static inline bool evsel__is_group_event(struct evsel *evsel)
{ {
if (!symbol_conf.event_group) if (!symbol_conf.event_group)
return false; return false;
return perf_evsel__is_group_leader(evsel) && evsel->core.nr_members > 1; return evsel__is_group_leader(evsel) && evsel->core.nr_members > 1;
} }
bool perf_evsel__is_function_event(struct evsel *evsel); bool evsel__is_function_event(struct evsel *evsel);
static inline bool perf_evsel__is_bpf_output(struct evsel *evsel) static inline bool evsel__is_bpf_output(struct evsel *evsel)
{ {
return perf_evsel__match(evsel, SOFTWARE, SW_BPF_OUTPUT); return evsel__match(evsel, SOFTWARE, SW_BPF_OUTPUT);
} }
static inline bool perf_evsel__is_clock(struct evsel *evsel) static inline bool evsel__is_clock(struct evsel *evsel)
{ {
return perf_evsel__match(evsel, SOFTWARE, SW_CPU_CLOCK) || return evsel__match(evsel, SOFTWARE, SW_CPU_CLOCK) ||
perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK); evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK);
} }
bool perf_evsel__fallback(struct evsel *evsel, int err, bool perf_evsel__fallback(struct evsel *evsel, int err,

2
tools/perf/util/evsel_fprintf.c
View File

@ -44,7 +44,7 @@ int perf_evsel__fprintf(struct evsel *evsel,
if (details->event_group) { if (details->event_group) {
struct evsel *pos; struct evsel *pos;
if (!perf_evsel__is_group_leader(evsel)) if (!evsel__is_group_leader(evsel))
return 0; return 0;
if (evsel->core.nr_members > 1) if (evsel->core.nr_members > 1)

6
tools/perf/util/header.c
View File

@ -783,8 +783,7 @@ static int write_group_desc(struct feat_fd *ff,
return ret; return ret;
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (perf_evsel__is_group_leader(evsel) && if (evsel__is_group_leader(evsel) && evsel->core.nr_members > 1) {
evsel->core.nr_members > 1) {
const char *name = evsel->group_name ?: "{anon_group}"; const char *name = evsel->group_name ?: "{anon_group}";
u32 leader_idx = evsel->idx; u32 leader_idx = evsel->idx;
u32 nr_members = evsel->core.nr_members; u32 nr_members = evsel->core.nr_members;
@ -1907,8 +1906,7 @@ static void print_group_desc(struct feat_fd *ff, FILE *fp)
session = container_of(ff->ph, struct perf_session, header); session = container_of(ff->ph, struct perf_session, header);
evlist__for_each_entry(session->evlist, evsel) { evlist__for_each_entry(session->evlist, evsel) {
if (perf_evsel__is_group_leader(evsel) && if (evsel__is_group_leader(evsel) && evsel->core.nr_members > 1) {
evsel->core.nr_members > 1) {
fprintf(fp, "# group: %s{%s", evsel->group_name ?: "", evsel__name(evsel)); fprintf(fp, "# group: %s{%s", evsel->group_name ?: "", evsel__name(evsel));
nr = evsel->core.nr_members - 1; nr = evsel->core.nr_members - 1;

2
tools/perf/util/hist.c
View File

@ -2695,7 +2695,7 @@ int __hists__scnprintf_title(struct hists *hists, char *bf, size_t size, bool sh
nr_events = hists->stats.total_non_filtered_period; nr_events = hists->stats.total_non_filtered_period;
} }
if (perf_evsel__is_group_event(evsel)) { if (evsel__is_group_event(evsel)) {
struct evsel *pos; struct evsel *pos;
evsel__group_desc(evsel, buf, buflen); evsel__group_desc(evsel, buf, buflen);

6
tools/perf/util/parse-events.c
View File

@ -461,7 +461,7 @@ int parse_events_add_cache(struct list_head *list, int *idx,
cache_op = parse_aliases(str, perf_evsel__hw_cache_op, cache_op = parse_aliases(str, perf_evsel__hw_cache_op,
PERF_COUNT_HW_CACHE_OP_MAX); PERF_COUNT_HW_CACHE_OP_MAX);
if (cache_op >= 0) { if (cache_op >= 0) {
if (!perf_evsel__is_cache_op_valid(cache_type, cache_op)) if (!evsel__is_cache_op_valid(cache_type, cache_op))
return -EINVAL; return -EINVAL;
continue; continue;
} }
@ -1871,7 +1871,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)
evsel->precise_max = mod.precise_max; evsel->precise_max = mod.precise_max;
evsel->weak_group = mod.weak; evsel->weak_group = mod.weak;
if (perf_evsel__is_group_leader(evsel)) if (evsel__is_group_leader(evsel))
evsel->core.attr.pinned = mod.pinned; evsel->core.attr.pinned = mod.pinned;
} }
@ -2627,7 +2627,7 @@ int print_hwcache_events(const char *event_glob, bool name_only)
for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
/* skip invalid cache type */ /* skip invalid cache type */
if (!perf_evsel__is_cache_op_valid(type, op)) if (!evsel__is_cache_op_valid(type, op))
continue; continue;
for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {

2
tools/perf/util/stat-display.c
View File

@ -562,7 +562,7 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c
alias->scale != counter->scale || alias->scale != counter->scale ||
alias->cgrp != counter->cgrp || alias->cgrp != counter->cgrp ||
strcmp(alias->unit, counter->unit) || strcmp(alias->unit, counter->unit) ||
perf_evsel__is_clock(alias) != perf_evsel__is_clock(counter) || evsel__is_clock(alias) != evsel__is_clock(counter) ||
!strcmp(alias->pmu_name, counter->pmu_name)) !strcmp(alias->pmu_name, counter->pmu_name))
break; break;
alias->merged_stat = true; alias->merged_stat = true;

36
tools/perf/util/stat-shadow.c
View File

@ -216,9 +216,9 @@ void perf_stat__update_shadow_stats(struct evsel *counter, u64 count,
count *= counter->scale; count *= counter->scale;
if (perf_evsel__is_clock(counter)) if (evsel__is_clock(counter))
update_runtime_stat(st, STAT_NSECS, 0, cpu, count_ns); update_runtime_stat(st, STAT_NSECS, 0, cpu, count_ns);
else if (perf_evsel__match(counter, HARDWARE, HW_CPU_CYCLES)) else if (evsel__match(counter, HARDWARE, HW_CPU_CYCLES))
update_runtime_stat(st, STAT_CYCLES, ctx, cpu, count); update_runtime_stat(st, STAT_CYCLES, ctx, cpu, count);
else if (perf_stat_evsel__is(counter, CYCLES_IN_TX)) else if (perf_stat_evsel__is(counter, CYCLES_IN_TX))
update_runtime_stat(st, STAT_CYCLES_IN_TX, ctx, cpu, count); update_runtime_stat(st, STAT_CYCLES_IN_TX, ctx, cpu, count);
@ -241,25 +241,25 @@ void perf_stat__update_shadow_stats(struct evsel *counter, u64 count,
else if (perf_stat_evsel__is(counter, TOPDOWN_RECOVERY_BUBBLES)) else if (perf_stat_evsel__is(counter, TOPDOWN_RECOVERY_BUBBLES))
update_runtime_stat(st, STAT_TOPDOWN_RECOVERY_BUBBLES, update_runtime_stat(st, STAT_TOPDOWN_RECOVERY_BUBBLES,
ctx, cpu, count); ctx, cpu, count);
else if (perf_evsel__match(counter, HARDWARE, HW_STALLED_CYCLES_FRONTEND)) else if (evsel__match(counter, HARDWARE, HW_STALLED_CYCLES_FRONTEND))
update_runtime_stat(st, STAT_STALLED_CYCLES_FRONT, update_runtime_stat(st, STAT_STALLED_CYCLES_FRONT,
ctx, cpu, count); ctx, cpu, count);
else if (perf_evsel__match(counter, HARDWARE, HW_STALLED_CYCLES_BACKEND)) else if (evsel__match(counter, HARDWARE, HW_STALLED_CYCLES_BACKEND))
update_runtime_stat(st, STAT_STALLED_CYCLES_BACK, update_runtime_stat(st, STAT_STALLED_CYCLES_BACK,
ctx, cpu, count); ctx, cpu, count);
else if (perf_evsel__match(counter, HARDWARE, HW_BRANCH_INSTRUCTIONS)) else if (evsel__match(counter, HARDWARE, HW_BRANCH_INSTRUCTIONS))
update_runtime_stat(st, STAT_BRANCHES, ctx, cpu, count); update_runtime_stat(st, STAT_BRANCHES, ctx, cpu, count);
else if (perf_evsel__match(counter, HARDWARE, HW_CACHE_REFERENCES)) else if (evsel__match(counter, HARDWARE, HW_CACHE_REFERENCES))
update_runtime_stat(st, STAT_CACHEREFS, ctx, cpu, count); update_runtime_stat(st, STAT_CACHEREFS, ctx, cpu, count);
else if (perf_evsel__match(counter, HW_CACHE, HW_CACHE_L1D)) else if (evsel__match(counter, HW_CACHE, HW_CACHE_L1D))
update_runtime_stat(st, STAT_L1_DCACHE, ctx, cpu, count); update_runtime_stat(st, STAT_L1_DCACHE, ctx, cpu, count);
else if (perf_evsel__match(counter, HW_CACHE, HW_CACHE_L1I)) else if (evsel__match(counter, HW_CACHE, HW_CACHE_L1I))
update_runtime_stat(st, STAT_L1_ICACHE, ctx, cpu, count); update_runtime_stat(st, STAT_L1_ICACHE, ctx, cpu, count);
else if (perf_evsel__match(counter, HW_CACHE, HW_CACHE_LL)) else if (evsel__match(counter, HW_CACHE, HW_CACHE_LL))
update_runtime_stat(st, STAT_LL_CACHE, ctx, cpu, count); update_runtime_stat(st, STAT_LL_CACHE, ctx, cpu, count);
else if (perf_evsel__match(counter, HW_CACHE, HW_CACHE_DTLB)) else if (evsel__match(counter, HW_CACHE, HW_CACHE_DTLB))
update_runtime_stat(st, STAT_DTLB_CACHE, ctx, cpu, count); update_runtime_stat(st, STAT_DTLB_CACHE, ctx, cpu, count);
else if (perf_evsel__match(counter, HW_CACHE, HW_CACHE_ITLB)) else if (evsel__match(counter, HW_CACHE, HW_CACHE_ITLB))
update_runtime_stat(st, STAT_ITLB_CACHE, ctx, cpu, count); update_runtime_stat(st, STAT_ITLB_CACHE, ctx, cpu, count);
else if (perf_stat_evsel__is(counter, SMI_NUM)) else if (perf_stat_evsel__is(counter, SMI_NUM))
update_runtime_stat(st, STAT_SMI_NUM, ctx, cpu, count); update_runtime_stat(st, STAT_SMI_NUM, ctx, cpu, count);
@ -833,7 +833,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
struct metric_event *me; struct metric_event *me;
int num = 1; int num = 1;
if (perf_evsel__match(evsel, HARDWARE, HW_INSTRUCTIONS)) { if (evsel__match(evsel, HARDWARE, HW_INSTRUCTIONS)) {
total = runtime_stat_avg(st, STAT_CYCLES, ctx, cpu); total = runtime_stat_avg(st, STAT_CYCLES, ctx, cpu);
if (total) { if (total) {
@ -858,7 +858,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
"stalled cycles per insn", "stalled cycles per insn",
ratio); ratio);
} }
} else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES)) { } else if (evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES)) {
if (runtime_stat_n(st, STAT_BRANCHES, ctx, cpu) != 0) if (runtime_stat_n(st, STAT_BRANCHES, ctx, cpu) != 0)
print_branch_misses(config, cpu, evsel, avg, out, st); print_branch_misses(config, cpu, evsel, avg, out, st);
else else
@ -913,7 +913,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
print_ll_cache_misses(config, cpu, evsel, avg, out, st); print_ll_cache_misses(config, cpu, evsel, avg, out, st);
else else
print_metric(config, ctxp, NULL, NULL, "of all LL-cache hits", 0); print_metric(config, ctxp, NULL, NULL, "of all LL-cache hits", 0);
} else if (perf_evsel__match(evsel, HARDWARE, HW_CACHE_MISSES)) { } else if (evsel__match(evsel, HARDWARE, HW_CACHE_MISSES)) {
total = runtime_stat_avg(st, STAT_CACHEREFS, ctx, cpu); total = runtime_stat_avg(st, STAT_CACHEREFS, ctx, cpu);
if (total) if (total)
@ -924,11 +924,11 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
"of all cache refs", ratio); "of all cache refs", ratio);
else else
print_metric(config, ctxp, NULL, NULL, "of all cache refs", 0); print_metric(config, ctxp, NULL, NULL, "of all cache refs", 0);
} else if (perf_evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_FRONTEND)) { } else if (evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_FRONTEND)) {
print_stalled_cycles_frontend(config, cpu, evsel, avg, out, st); print_stalled_cycles_frontend(config, cpu, evsel, avg, out, st);
} else if (perf_evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_BACKEND)) { } else if (evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_BACKEND)) {
print_stalled_cycles_backend(config, cpu, evsel, avg, out, st); print_stalled_cycles_backend(config, cpu, evsel, avg, out, st);
} else if (perf_evsel__match(evsel, HARDWARE, HW_CPU_CYCLES)) { } else if (evsel__match(evsel, HARDWARE, HW_CPU_CYCLES)) {
total = runtime_stat_avg(st, STAT_NSECS, 0, cpu); total = runtime_stat_avg(st, STAT_NSECS, 0, cpu);
if (total) { if (total) {
@ -979,7 +979,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
ratio = total / avg; ratio = total / avg;
print_metric(config, ctxp, NULL, "%8.0f", "cycles / elision", ratio); print_metric(config, ctxp, NULL, "%8.0f", "cycles / elision", ratio);
} else if (perf_evsel__is_clock(evsel)) { } else if (evsel__is_clock(evsel)) {
if ((ratio = avg_stats(&walltime_nsecs_stats)) != 0) if ((ratio = avg_stats(&walltime_nsecs_stats)) != 0)
print_metric(config, ctxp, NULL, "%8.3f", "CPUs utilized", print_metric(config, ctxp, NULL, "%8.3f", "CPUs utilized",
avg / (ratio * evsel->scale)); avg / (ratio * evsel->scale));

2
tools/perf/util/stat.c
View File

@ -509,7 +509,7 @@ int create_perf_stat_counter(struct evsel *evsel,
* either manually by us or by kernel via enable_on_exec * either manually by us or by kernel via enable_on_exec
* set later. * set later.
*/ */
if (perf_evsel__is_group_leader(evsel)) { if (evsel__is_group_leader(evsel)) {
attr->disabled = 1; attr->disabled = 1;
/* /*