* [PATCH] perf: fix getting source line failure in annotate
@ 2019-02-21 9:57 Wei Li
2019-02-21 11:05 ` Jiri Olsa
2019-02-28 7:48 ` [tip:perf/core] perf annotate: Fix getting source line failure tip-bot for Wei Li
0 siblings, 2 replies; 4+ messages in thread
From: Wei Li @ 2019-02-21 9:57 UTC (permalink / raw)
To: peterz, mingo, acme, alexander.shishkin, jolsa, namhyung, yao.jin
Cc: linux-kernel
The output of "perf annotate -l --stdio xxx" changed since commit 425859ff0de33 ("perf
annotate: No need to calculate notes->start twice") removed notes->start assignment
in symbol__calc_lines(). It will get failed in find_address_in_section() from
symbol__tty_annotate() subroutine as the a2l->addr is wrong. So the annotate summary
doesn't report the line number of source code correctly.
Before fix:
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ cat common_while_1.c
void hotspot_1(void)
{
volatile int i;
for (i = 0; i < 0x10000000; i++);
for (i = 0; i < 0x10000000; i++);
for (i = 0; i < 0x10000000; i++);
}
int main(void)
{
hotspot_1();
return 0;
}
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ gcc common_while_1.c -g -o common_while_1
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.488 MB perf.data (12498 samples) ]
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
----------------------------------------------
19.30 common_while_1[32]
19.03 common_while_1[4e]
19.01 common_while_1[16]
5.04 common_while_1[13]
4.99 common_while_1[4b]
4.78 common_while_1[2c]
4.77 common_while_1[10]
4.66 common_while_1[2f]
4.59 common_while_1[51]
4.59 common_while_1[35]
4.52 common_while_1[19]
4.20 common_while_1[56]
0.51 common_while_1[48]
Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12480 samples, percent: local period)
-----------------------------------------------------------------------------------------------------------------
:
:
:
: Disassembly of section .text:
:
: 00000000000005fa <hotspot_1>:
: hotspot_1():
: void hotspot_1(void)
: {
0.00 : 5fa: push %rbp
0.00 : 5fb: mov %rsp,%rbp
: volatile int i;
:
: for (i = 0; i < 0x10000000; i++);
0.00 : 5fe: movl $0x0,-0x4(%rbp)
0.00 : 605: jmp 610 <hotspot_1+0x16>
0.00 : 607: mov -0x4(%rbp),%eax
common_while_1[10] 4.77 : 60a: add $0x1,%eax
common_while_1[13] 5.04 : 60d: mov %eax,-0x4(%rbp)
common_while_1[16] 19.01 : 610: mov -0x4(%rbp),%eax
common_while_1[19] 4.52 : 613: cmp $0xfffffff,%eax
0.00 : 618: jle 607 <hotspot_1+0xd>
: for (i = 0; i < 0x10000000; i++);
...
After fix:
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.488 MB perf.data (12500 samples) ]
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
----------------------------------------------
33.34 common_while_1.c:5
33.34 common_while_1.c:6
33.32 common_while_1.c:7
Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12482 samples, percent: local period)
-----------------------------------------------------------------------------------------------------------------
:
:
:
: Disassembly of section .text:
:
: 00000000000005fa <hotspot_1>:
: hotspot_1():
: void hotspot_1(void)
: {
0.00 : 5fa: push %rbp
0.00 : 5fb: mov %rsp,%rbp
: volatile int i;
:
: for (i = 0; i < 0x10000000; i++);
0.00 : 5fe: movl $0x0,-0x4(%rbp)
0.00 : 605: jmp 610 <hotspot_1+0x16>
0.00 : 607: mov -0x4(%rbp),%eax
common_while_1.c:5 4.70 : 60a: add $0x1,%eax
4.89 : 60d: mov %eax,-0x4(%rbp)
common_while_1.c:5 19.03 : 610: mov -0x4(%rbp),%eax
common_while_1.c:5 4.72 : 613: cmp $0xfffffff,%eax
0.00 : 618: jle 607 <hotspot_1+0xd>
: for (i = 0; i < 0x10000000; i++);
0.00 : 61a: movl $0x0,-0x4(%rbp)
0.00 : 621: jmp 62c <hotspot_1+0x32>
0.00 : 623: mov -0x4(%rbp),%eax
common_while_1.c:6 4.54 : 626: add $0x1,%eax
4.73 : 629: mov %eax,-0x4(%rbp)
common_while_1.c:6 19.54 : 62c: mov -0x4(%rbp),%eax
common_while_1.c:6 4.54 : 62f: cmp $0xfffffff,%eax
...
Fixes: 425859ff0de33 ("perf annotate: No need to calculate notes->start twice")
Signed-off-by: Wei Li <liwei391@huawei.com>
---
tools/perf/util/annotate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 70de8f6b3aee..9142fd294e76 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1889,6 +1889,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
struct annotation_options *options,
struct arch **parch)
{
+ struct annotation *notes = symbol__annotation(sym);
struct annotate_args args = {
.privsize = privsize,
.evsel = evsel,
@@ -1919,6 +1920,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
args.ms.map = map;
args.ms.sym = sym;
+ notes->start = map__rip_2objdump(map, sym->start);
return symbol__disassemble(sym, &args);
}
@@ -2794,8 +2796,6 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *ev
symbol__calc_percent(sym, evsel);
- notes->start = map__rip_2objdump(map, sym->start);
-
annotation__set_offsets(notes, size);
annotation__mark_jump_targets(notes, sym);
annotation__compute_ipc(notes, size);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] perf: fix getting source line failure in annotate
2019-02-21 9:57 [PATCH] perf: fix getting source line failure in annotate Wei Li
@ 2019-02-21 11:05 ` Jiri Olsa
2019-02-21 20:02 ` Arnaldo Carvalho de Melo
2019-02-28 7:48 ` [tip:perf/core] perf annotate: Fix getting source line failure tip-bot for Wei Li
1 sibling, 1 reply; 4+ messages in thread
From: Jiri Olsa @ 2019-02-21 11:05 UTC (permalink / raw)
To: Wei Li
Cc: peterz, mingo, acme, alexander.shishkin, namhyung, yao.jin,
linux-kernel
On Thu, Feb 21, 2019 at 05:57:16PM +0800, Wei Li wrote:
SNIP
> liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1
> [ perf record: Woken up 2 times to write data ]
> [ perf record: Captured and wrote 0.488 MB perf.data (12500 samples) ]
> liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
>
> Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
> ----------------------------------------------
>
> 33.34 common_while_1.c:5
> 33.34 common_while_1.c:6
> 33.32 common_while_1.c:7
> Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12482 samples, percent: local period)
> -----------------------------------------------------------------------------------------------------------------
> :
> :
> :
> : Disassembly of section .text:
> :
> : 00000000000005fa <hotspot_1>:
> : hotspot_1():
> : void hotspot_1(void)
> : {
> 0.00 : 5fa: push %rbp
> 0.00 : 5fb: mov %rsp,%rbp
> : volatile int i;
> :
> : for (i = 0; i < 0x10000000; i++);
> 0.00 : 5fe: movl $0x0,-0x4(%rbp)
> 0.00 : 605: jmp 610 <hotspot_1+0x16>
> 0.00 : 607: mov -0x4(%rbp),%eax
> common_while_1.c:5 4.70 : 60a: add $0x1,%eax
> 4.89 : 60d: mov %eax,-0x4(%rbp)
> common_while_1.c:5 19.03 : 610: mov -0x4(%rbp),%eax
> common_while_1.c:5 4.72 : 613: cmp $0xfffffff,%eax
> 0.00 : 618: jle 607 <hotspot_1+0xd>
> : for (i = 0; i < 0x10000000; i++);
> 0.00 : 61a: movl $0x0,-0x4(%rbp)
> 0.00 : 621: jmp 62c <hotspot_1+0x32>
> 0.00 : 623: mov -0x4(%rbp),%eax
> common_while_1.c:6 4.54 : 626: add $0x1,%eax
> 4.73 : 629: mov %eax,-0x4(%rbp)
> common_while_1.c:6 19.54 : 62c: mov -0x4(%rbp),%eax
> common_while_1.c:6 4.54 : 62f: cmp $0xfffffff,%eax
> ...
>
> Fixes: 425859ff0de33 ("perf annotate: No need to calculate notes->start twice")
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perf: fix getting source line failure in annotate
2019-02-21 11:05 ` Jiri Olsa
@ 2019-02-21 20:02 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-02-21 20:02 UTC (permalink / raw)
To: Wei Li
Cc: Jiri Olsa, peterz, mingo, alexander.shishkin, namhyung, yao.jin,
linux-kernel
Em Thu, Feb 21, 2019 at 12:05:59PM +0100, Jiri Olsa escreveu:
> On Thu, Feb 21, 2019 at 05:57:16PM +0800, Wei Li wrote:
>
> SNIP
>
> > liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1
> > [ perf record: Woken up 2 times to write data ]
> > [ perf record: Captured and wrote 0.488 MB perf.data (12500 samples) ]
> > liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
> >
> > Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
> > ----------------------------------------------
> >
> > 33.34 common_while_1.c:5
> > 33.34 common_while_1.c:6
> > 33.32 common_while_1.c:7
> > Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12482 samples, percent: local period)
> > -----------------------------------------------------------------------------------------------------------------
> > :
> > :
> > :
> > : Disassembly of section .text:
> > :
> > : 00000000000005fa <hotspot_1>:
> > : hotspot_1():
> > : void hotspot_1(void)
> > : {
> > 0.00 : 5fa: push %rbp
> > 0.00 : 5fb: mov %rsp,%rbp
> > : volatile int i;
> > :
> > : for (i = 0; i < 0x10000000; i++);
> > 0.00 : 5fe: movl $0x0,-0x4(%rbp)
> > 0.00 : 605: jmp 610 <hotspot_1+0x16>
> > 0.00 : 607: mov -0x4(%rbp),%eax
> > common_while_1.c:5 4.70 : 60a: add $0x1,%eax
> > 4.89 : 60d: mov %eax,-0x4(%rbp)
> > common_while_1.c:5 19.03 : 610: mov -0x4(%rbp),%eax
> > common_while_1.c:5 4.72 : 613: cmp $0xfffffff,%eax
> > 0.00 : 618: jle 607 <hotspot_1+0xd>
> > : for (i = 0; i < 0x10000000; i++);
> > 0.00 : 61a: movl $0x0,-0x4(%rbp)
> > 0.00 : 621: jmp 62c <hotspot_1+0x32>
> > 0.00 : 623: mov -0x4(%rbp),%eax
> > common_while_1.c:6 4.54 : 626: add $0x1,%eax
> > 4.73 : 629: mov %eax,-0x4(%rbp)
> > common_while_1.c:6 19.54 : 62c: mov -0x4(%rbp),%eax
> > common_while_1.c:6 4.54 : 62f: cmp $0xfffffff,%eax
> > ...
> >
> > Fixes: 425859ff0de33 ("perf annotate: No need to calculate notes->start twice")
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested and applied.
Thanks for the Fixes: tag!
- Arnaldo
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:perf/core] perf annotate: Fix getting source line failure
2019-02-21 9:57 [PATCH] perf: fix getting source line failure in annotate Wei Li
2019-02-21 11:05 ` Jiri Olsa
@ 2019-02-28 7:48 ` tip-bot for Wei Li
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Wei Li @ 2019-02-28 7:48 UTC (permalink / raw)
To: linux-tip-commits
Cc: peterz, hpa, acme, mingo, liwei391, jolsa, namhyung, linux-kernel,
yao.jin, alexander.shishkin, tglx
Commit-ID: 11db1ad4513d6205d2519e1a30ff4cef746e3243
Gitweb: https://git.kernel.org/tip/11db1ad4513d6205d2519e1a30ff4cef746e3243
Author: Wei Li <liwei391@huawei.com>
AuthorDate: Thu, 21 Feb 2019 17:57:16 +0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 21 Feb 2019 17:00:35 -0300
perf annotate: Fix getting source line failure
The output of "perf annotate -l --stdio xxx" changed since commit 425859ff0de33
("perf annotate: No need to calculate notes->start twice") removed notes->start
assignment in symbol__calc_lines(). It will get failed in
find_address_in_section() from symbol__tty_annotate() subroutine as the
a2l->addr is wrong. So the annotate summary doesn't report the line number of
source code correctly.
Before fix:
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ cat common_while_1.c
void hotspot_1(void)
{
volatile int i;
for (i = 0; i < 0x10000000; i++);
for (i = 0; i < 0x10000000; i++);
for (i = 0; i < 0x10000000; i++);
}
int main(void)
{
hotspot_1();
return 0;
}
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ gcc common_while_1.c -g -o common_while_1
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.488 MB perf.data (12498 samples) ]
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
----------------------------------------------
19.30 common_while_1[32]
19.03 common_while_1[4e]
19.01 common_while_1[16]
5.04 common_while_1[13]
4.99 common_while_1[4b]
4.78 common_while_1[2c]
4.77 common_while_1[10]
4.66 common_while_1[2f]
4.59 common_while_1[51]
4.59 common_while_1[35]
4.52 common_while_1[19]
4.20 common_while_1[56]
0.51 common_while_1[48]
Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12480 samples, percent: local period)
-----------------------------------------------------------------------------------------------------------------
:
:
:
: Disassembly of section .text:
:
: 00000000000005fa <hotspot_1>:
: hotspot_1():
: void hotspot_1(void)
: {
0.00 : 5fa: push %rbp
0.00 : 5fb: mov %rsp,%rbp
: volatile int i;
:
: for (i = 0; i < 0x10000000; i++);
0.00 : 5fe: movl $0x0,-0x4(%rbp)
0.00 : 605: jmp 610 <hotspot_1+0x16>
0.00 : 607: mov -0x4(%rbp),%eax
common_while_1[10] 4.77 : 60a: add $0x1,%eax
common_while_1[13] 5.04 : 60d: mov %eax,-0x4(%rbp)
common_while_1[16] 19.01 : 610: mov -0x4(%rbp),%eax
common_while_1[19] 4.52 : 613: cmp $0xfffffff,%eax
0.00 : 618: jle 607 <hotspot_1+0xd>
: for (i = 0; i < 0x10000000; i++);
...
After fix:
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1
[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.488 MB perf.data (12500 samples) ]
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
----------------------------------------------
33.34 common_while_1.c:5
33.34 common_while_1.c:6
33.32 common_while_1.c:7
Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12482 samples, percent: local period)
-----------------------------------------------------------------------------------------------------------------
:
:
:
: Disassembly of section .text:
:
: 00000000000005fa <hotspot_1>:
: hotspot_1():
: void hotspot_1(void)
: {
0.00 : 5fa: push %rbp
0.00 : 5fb: mov %rsp,%rbp
: volatile int i;
:
: for (i = 0; i < 0x10000000; i++);
0.00 : 5fe: movl $0x0,-0x4(%rbp)
0.00 : 605: jmp 610 <hotspot_1+0x16>
0.00 : 607: mov -0x4(%rbp),%eax
common_while_1.c:5 4.70 : 60a: add $0x1,%eax
4.89 : 60d: mov %eax,-0x4(%rbp)
common_while_1.c:5 19.03 : 610: mov -0x4(%rbp),%eax
common_while_1.c:5 4.72 : 613: cmp $0xfffffff,%eax
0.00 : 618: jle 607 <hotspot_1+0xd>
: for (i = 0; i < 0x10000000; i++);
0.00 : 61a: movl $0x0,-0x4(%rbp)
0.00 : 621: jmp 62c <hotspot_1+0x32>
0.00 : 623: mov -0x4(%rbp),%eax
common_while_1.c:6 4.54 : 626: add $0x1,%eax
4.73 : 629: mov %eax,-0x4(%rbp)
common_while_1.c:6 19.54 : 62c: mov -0x4(%rbp),%eax
common_while_1.c:6 4.54 : 62f: cmp $0xfffffff,%eax
...
Signed-off-by: Wei Li <liwei391@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 425859ff0de33 ("perf annotate: No need to calculate notes->start twice")
Link: http://lkml.kernel.org/r/20190221095716.39529-1-liwei391@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/annotate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 2468b8aa0b6b..11a8a447a3af 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1891,6 +1891,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
struct annotation_options *options,
struct arch **parch)
{
+ struct annotation *notes = symbol__annotation(sym);
struct annotate_args args = {
.privsize = privsize,
.evsel = evsel,
@@ -1921,6 +1922,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
args.ms.map = map;
args.ms.sym = sym;
+ notes->start = map__rip_2objdump(map, sym->start);
return symbol__disassemble(sym, &args);
}
@@ -2796,8 +2798,6 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *ev
symbol__calc_percent(sym, evsel);
- notes->start = map__rip_2objdump(map, sym->start);
-
annotation__set_offsets(notes, size);
annotation__mark_jump_targets(notes, sym);
annotation__compute_ipc(notes, size);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-28 7:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-21 9:57 [PATCH] perf: fix getting source line failure in annotate Wei Li
2019-02-21 11:05 ` Jiri Olsa
2019-02-21 20:02 ` Arnaldo Carvalho de Melo
2019-02-28 7:48 ` [tip:perf/core] perf annotate: Fix getting source line failure tip-bot for Wei Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.