linux-kernel - [PATCH] perf annotate: Support multiple events without group

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1525960762-19520-1-git-send-email-yao.jin@linux.intel.com>
Date:   Thu, 10 May 2018 21:59:22 +0800
From:   Jin Yao <yao.jin@...ux.intel.com>
To:     acme@...nel.org, jolsa@...nel.org, peterz@...radead.org,
        mingo@...hat.com, alexander.shishkin@...ux.intel.com
Cc:     Linux-kernel@...r.kernel.org, ak@...ux.intel.com,
        kan.liang@...el.com, yao.jin@...el.com,
        Jin Yao <yao.jin@...ux.intel.com>
Subject: [PATCH] perf annotate: Support multiple events without group

See example,

perf record -e cycles,branches ./div
perf annotate main --stdio or
perf annotate main --stdio2 or
perf annotate main

The "perf annotate" should show both cycles and branches on the
left side, but actually it only shows one event cycles.

It works with events group like:
perf record -e "{cycles,branches}" ./div

It should work too even without group.

This patch uses 'symbol_conf.nr_events > 1' to check if it's the
multiple events case.

With this patch,

perf record -e cycles,branches ./div
perf annotate main --stdio2

  ......
                           for (i = 0; i < 2000000000; i++) {
                                   flag = compute_flag();
  4.85   5.83  38:   xor    %eax,%eax
  0.01   0.01      → callq  compute_flag

                                   count++;
  4.44   2.27        mov    count,%edx
  0.00   0.00        add    $0x1,%edx
  ......

Signed-off-by: Jin Yao <yao.jin@...ux.intel.com>
---
 tools/perf/util/annotate.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 5d74a30..ca8d4b1 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1054,6 +1054,8 @@ annotation_line__new(struct annotate_args *args, size_t privsize)
 
 	if (perf_evsel__is_group_event(evsel))
 		nr = evsel->nr_members;
+	else if (symbol_conf.nr_events > nr)
+		nr = symbol_conf.nr_events;
 
 	size += sizeof(al->samples[0]) * nr;
 
@@ -1326,6 +1328,8 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start
 
 		if (perf_evsel__is_group_event(evsel))
 			width *= evsel->nr_members;
+		else if (symbol_conf.nr_events > 1)
+			width *= symbol_conf.nr_events;
 
 		if (!*al->line)
 			printf(" %*s:\n", width, " ");
@@ -1967,6 +1971,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
 
 	if (perf_evsel__is_group_event(evsel))
 		width *= evsel->nr_members;
+	else if (symbol_conf.nr_events > 1)
+		width *= symbol_conf.nr_events;
 
 	graph_dotted_len = printf(" %-*.*s|	Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n",
 				  width, width, symbol_conf.show_total_period ? "Period" :
@@ -2578,6 +2584,8 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *ev
 
 	if (perf_evsel__is_group_event(evsel))
 		nr_pcnt = evsel->nr_members;
+	else if (symbol_conf.nr_events > nr_pcnt)
+		nr_pcnt = symbol_conf.nr_events;
 
 	err = symbol__annotate(sym, map, evsel, 0, parch);
 	if (err)
-- 
2.7.4