perf annotate: Handle more instructions on x86
Namhyung Kim
maintainerPATCH 1/3 perf annotate: Handle more instructions on x86
I found some instructions didn't parse the operands properly. Add them to the table to fix the issue.
--- tools/perf/arch/x86/annotate/instructions.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/arch/x86/annotate/instructions.c +4 -0
@@ -35,12 +35,14 @@ static struct ins x86__instructions[] = { { .name = "cs", .ops = &mov_ops, }, { .name = "dec", .ops = &dec_ops, }, { .name = "decl", .ops = &dec_ops, }, + { .name = "decq", .ops = &dec_ops, }, { .name = "divsd", .ops = &mov_ops, }, { .name = "divss", .ops = &mov_ops, }, { .name = "gs", .ops = &mov_ops, }, { .name = "imul", .ops = &mov_ops, }, { .name = "inc", .ops = &dec_ops, }, { .name = "incl", .ops = &dec_ops, }, + { .name = "incq", .ops = &dec_ops, }, { .name = "ja", .ops = &jump_ops, }, { .name = "jae", .ops = &jump_ops, }, { .name = "jb", .ops = &jump_ops, },
@@ -123,6 +125,8 @@ static struct ins x86__instructions[] = { { .name = "test", .ops = &mov_ops, }, { .name = "testb", .ops = &mov_ops, }, { .name = "testl", .ops = &mov_ops, }, + { .name = "testq", .ops = &mov_ops, }, + { .name = "tzcnt", .ops = &mov_ops, }, { .name = "ucomisd", .ops = &mov_ops, }, { .name = "ucomiss", .ops = &mov_ops, }, { .name = "vaddsd", .ops = &mov_ops, },
Signature · 1 line
2.40.1.521.gf1e218fcd8-goog
Namhyung Kim
maintainerPATCH 2/3 perf annotate: Parse x86 SIB addressing properly
When the source argument of mov instruction is look like below, it didn't parse the whole operand and just stopped at the first comma.
mov (%rbx,%rax,1),%rcx
Fix it by checking the parentheses and move it to the closing one.
--- tools/perf/util/annotate.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/perf/util/annotate.c +13 -0
@@ -550,6 +550,19 @@ static int mov__parse(struct arch *arch, struct ins_operands *ops, struct map_syreturn -1 ; *s ='\0' ; + +/* +* x86 SIB addressing has something like 0x8(%rax, %rcx, 1) +* then it needs to have the closing parenthesis. +*/ +if (strchr (ops->raw,'(' )) { + *s =',' ; + s =strchr (ops->raw,')' ); +if (s ==NULL || s[1 ] !=',' ) +return -1 ; + *++s ='\0' ; + } + ops->source.raw =strdup (ops->raw); *s =',' ;
Signature · 1 line
2.40.1.521.gf1e218fcd8-goog
Re: [PATCH 2/3] perf annotate: Parse x86 SIB addressing properly
Quoted 9 lines · Namhyung Kim
When the source argument of mov instruction is look like below, it didn't parse the whole operand and just stopped at the first comma.
mov (%rbx,%rax,1),%rcx
Fix it by checking the parentheses and move it to the closing one.
Signed-off-by Namhyung Kim <[email protected]>
Thanks,
Ian
Quoted 31 lines
--- tools/perf/util/annotate.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)tools/perf/util/annotate.c +13
-1@@ -550,6 +550,19 @@ static int mov__parse(struct arch *arch, struct ins_operands *ops, struct map_syreturn -1 ; *s ='\0' ; + +/* +* x86 SIB addressing has something like 0x8(%rax, %rcx, 1) +* then it needs to have the closing parenthesis. +*/ +if (strchr (ops->raw,'(' )) { + *s =',' ; + s =strchr (ops->raw,')' ); +if (s ==NULL || s[1 ] !=',' ) +return -1 ; + *++s ='\0' ; + } + ops->source.raw =strdup (ops->raw); *s =',' ; --2.40.1.521.gf1e218fcd8-goog
Namhyung Kim
maintainerPATCH 3/3 perf annotate browser: Add '<' and '>' keys for navigation
In reply to Namhyung KimThe hists__find_annotations() allow to move to next or previous symbols for annotation using the arrow keys. But TUI annotate_browser__run() uses the RIGHT key as ENTER to handle jump/call instructions. That makes the navigation to the next function impossible.
I'd like to change it back to move the next symbol but I'm afraid if some users get confused. So I added a new pair of keys to handle that.
--- tools/perf/builtin-annotate.c | 4 +++- tools/perf/ui/browsers/annotate.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-annotate.c +3 -1
@@ -342,7 +342,7 @@ static void hists__find_annotations(struct hists *hists, notes =symbol__annotation (he->ms.sym);if (notes->src ==NULL ) { find_next: -if (key ==K_LEFT ) +if (key ==K_LEFT || key =='<' ) nd =rb_prev (nd);else nd =rb_next (nd);
@@ -378,9 +378,11 @@ static void hists__find_annotations(struct hists *hists,return ;/* fall through */ case K_RIGHT : +case '>' : next =rb_next (nd);break ;case K_LEFT : +case '<' : next =rb_prev (nd);break ;default :
tools/perf/ui/browsers/annotate.c +3 -1
@@ -781,9 +781,9 @@ static int annotate_browser__run(struct annotate_browser *browser,ui_browser__help_window (&browser->b,"UP/DOWN/PGUP\n" "PGDN/SPACE Navigate\n" +"</> Move to prev/next symbol\n" "q/ESC/CTRL+C Exit\n\n" "ENTER Go to target\n" -"ESC Exit\n" "H Go to hottest instruction\n" "TAB/shift+TAB Cycle thru hottest instructions\n" "j Toggle showing jump to target arrows\n"
@@ -913,6 +913,8 @@ static int annotate_browser__run(struct annotate_browser *browser,annotation__toggle_full_addr (notes, ms);continue ;case K_LEFT : +case '<' : +case '>' :case K_ESC :case 'q' :case CTRL ('c' ):
Signature · 1 line
2.40.1.521.gf1e218fcd8-goog
Re: [PATCH 3/3] perf annotate browser: Add '<' and '>' keys for navigation
Quoted 10 lines · Namhyung Kim
The
hists__find_annotations()allow to move to next or previous symbols for annotation using the arrow keys. But TUIannotate_browser__run()uses the RIGHT key as ENTER to handle jump/call instructions. That makes the navigation to the next function impossible.I'd like to change it back to move the next symbol but I'm afraid if some users get confused. So I added a new pair of keys to handle that.
Signed-off-by Namhyung Kim <[email protected]>
Thanks,
Ian
Quoted 57 lines
--- tools/perf/builtin-annotate.c | 4 +++- tools/perf/ui/browsers/annotate.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)tools/perf/builtin-annotate.c +3
-1@@ -342,7 +342,7 @@ static void hists__find_annotations(struct hists *hists, notes =symbol__annotation (he->ms.sym);if (notes->src ==NULL ) { find_next: -if (key ==K_LEFT ) +if (key ==K_LEFT || key =='<' ) nd =rb_prev (nd);else nd =rb_next (nd);@@ -378,9 +378,11 @@ static void hists__find_annotations(struct hists *hists,return ;/* fall through */ case K_RIGHT : +case '>' : next =rb_next (nd);break ;case K_LEFT : +case '<' : next =rb_prev (nd);break ;default :tools/perf/ui/browsers/annotate.c +3
-2@@ -781,9 +781,9 @@ static int annotate_browser__run(struct annotate_browser *browser,ui_browser__help_window (&browser->b,"UP/DOWN/PGUP\n" "PGDN/SPACE Navigate\n" +"</> Move to prev/next symbol\n" "q/ESC/CTRL+C Exit\n\n" "ENTER Go to target\n" -"ESC Exit\n" "H Go to hottest instruction\n" "TAB/shift+TAB Cycle thru hottest instructions\n" "j Toggle showing jump to target arrows\n"@@ -913,6 +913,8 @@ static int annotate_browser__run(struct annotate_browser *browser,annotation__toggle_full_addr (notes, ms);continue ;case K_LEFT : +case '<' : +case '>' :case K_ESC :case 'q' :case CTRL ('c' ): --2.40.1.521.gf1e218fcd8-goog
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 3/3] perf annotate browser: Add '<' and '>' keys for navigation
Em Mon, May 15, 2023 at 10:09:08AM -0700, Ian Rogers escreveu:
Quoted 51 lines · Namhyung Kim
Quoted 10 lines
The
hists__find_annotations()allow to move to next or previous symbols for annotation using the arrow keys. But TUIannotate_browser__run()uses the RIGHT key as ENTER to handle jump/call instructions. That makes the navigation to the next function impossible.I'd like to change it back to move the next symbol but I'm afraid if some users get confused. So I added a new pair of keys to handle that.
Signed-off-by Namhyung Kim <[email protected]>Acked-by Ian Rogers <[email protected]>Thanks,
IanQuoted 34 lines
--- tools/perf/builtin-annotate.c | 4 +++- tools/perf/ui/browsers/annotate.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)tools/perf/builtin-annotate.c +3
-1@@ -342,7 +342,7 @@ static void hists__find_annotations(struct hists *hists, notes =symbol__annotation (he->ms.sym);if (notes->src ==NULL ) { find_next: -if (key ==K_LEFT ) +if (key ==K_LEFT || key =='<' ) nd =rb_prev (nd);else nd =rb_next (nd);@@ -378,9 +378,11 @@ static void hists__find_annotations(struct hists *hists,return ;/* fall through */ case K_RIGHT : +case '>' : next =rb_next (nd);break ;case K_LEFT : +case '<' : next =rb_prev (nd);break ;default :tools/perf/ui/browsers/annotate.c +0
-0
Quoted 8 lines
tools/perf/ui/browsers/annotate.c static int annotate_browser__run(struct annotate_browser *browser, · line 786
Quoted 8 lines
tools/perf/ui/browsers/annotate.c +1
-1@@ -781,9 +781,9 @@ static int annotate_browser__run(struct annotate_browser *browser,ui_browser__help_window (&browser->b,"UP/DOWN/PGUP\n" "PGDN/SPACE Navigate\n" +"</> Move to prev/next symbol\n" "q/ESC/CTRL+C Exit\n\n" "ENTER Go to target\n" - "ESC Exit\n"
I think the two above were unintentional? I'm removing this hunk.
- Arnaldo
Quoted 15 lines
Quoted 15 lines
tools/perf/ui/browsers/annotate.c +2
-1"H Go to hottest instruction\n" "TAB/shift+TAB Cycle thru hottest instructions\n" "j Toggle showing jump to target arrows\n" @@ -913,6 +913,8 @@ static int annotate_browser__run(struct annotate_browser *browser,annotation__toggle_full_addr (notes, ms);continue ;case K_LEFT : +case '<' : +case '>' :case K_ESC :case 'q' :case CTRL ('c' ): --2.40.1.521.gf1e218fcd8-goog
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 3/3] perf annotate browser: Add '<' and '>' keys for navigation
Em Mon, May 15, 2023 at 05:54:19PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 54 lines
Em Mon, May 15, 2023 at 10:09:08AM -0700, Ian Rogers escreveu:
Quoted 53 lines · Namhyung Kim
Quoted 10 lines
The
hists__find_annotations()allow to move to next or previous symbols for annotation using the arrow keys. But TUIannotate_browser__run()uses the RIGHT key as ENTER to handle jump/call instructions. That makes the navigation to the next function impossible.I'd like to change it back to move the next symbol but I'm afraid if some users get confused. So I added a new pair of keys to handle that.
Signed-off-by Namhyung Kim <[email protected]>Acked-by Ian Rogers <[email protected]>Thanks,
IanQuoted 36 lines
--- tools/perf/builtin-annotate.c | 4 +++- tools/perf/ui/browsers/annotate.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)tools/perf/builtin-annotate.c +3
-1@@ -342,7 +342,7 @@ static void hists__find_annotations(struct hists *hists, notes =symbol__annotation (he->ms.sym);if (notes->src ==NULL ) { find_next: -if (key ==K_LEFT ) +if (key ==K_LEFT || key =='<' ) nd =rb_prev (nd);else nd =rb_next (nd);@@ -378,9 +378,11 @@ static void hists__find_annotations(struct hists *hists,return ;/* fall through */ case K_RIGHT : +case '>' : next =rb_next (nd);break ;case K_LEFT : +case '<' : next =rb_prev (nd);break ;default :tools/perf/ui/browsers/annotate.c +0
-0@@ -781,9 +781,9 @@ static int annotate_browser__run(struct annotate_browser *browser, ui_browser__help_window(&browser->b,
Quoted 8 lines
Quoted 6 lines
tools/perf/ui/browsers/annotate.c static int annotate_browser__run(struct annotate_browser *browser, · line 786
Quoted 6 lines
tools/perf/ui/browsers/annotate.c +1
-1"UP/DOWN/PGUP\n" "PGDN/SPACE Navigate\n" +"</> Move to prev/next symbol\n" "q/ESC/CTRL+C Exit\n\n" "ENTER Go to target\n" -"ESC Exit\n" I think the two above were unintentional? I'm removing this hunk.
Humm I see, its a dup, will keep it.
- Arnaldo
Quoted 5 lines · Namhyung Kim
I found some instructions didn't parse the operands properly. Add them to the table to fix the issue.
Signed-off-by Namhyung Kim <[email protected]>
Thanks,
Ian
Quoted 35 lines
--- tools/perf/arch/x86/annotate/instructions.c | 4 ++++ 1 file changed, 4 insertions(+)tools/perf/arch/x86/annotate/instructions.c +4
-1@@ -35,12 +35,14 @@ static struct ins x86__instructions[] = { { .name = "cs", .ops = &mov_ops, }, { .name = "dec", .ops = &dec_ops, }, { .name = "decl", .ops = &dec_ops, }, + { .name = "decq", .ops = &dec_ops, }, { .name = "divsd", .ops = &mov_ops, }, { .name = "divss", .ops = &mov_ops, }, { .name = "gs", .ops = &mov_ops, }, { .name = "imul", .ops = &mov_ops, }, { .name = "inc", .ops = &dec_ops, }, { .name = "incl", .ops = &dec_ops, }, + { .name = "incq", .ops = &dec_ops, }, { .name = "ja", .ops = &jump_ops, }, { .name = "jae", .ops = &jump_ops, }, { .name = "jb", .ops = &jump_ops, },@@ -123,6 +125,8 @@ static struct ins x86__instructions[] = { { .name = "test", .ops = &mov_ops, }, { .name = "testb", .ops = &mov_ops, }, { .name = "testl", .ops = &mov_ops, }, + { .name = "testq", .ops = &mov_ops, }, + { .name = "tzcnt", .ops = &mov_ops, }, { .name = "ucomisd", .ops = &mov_ops, }, { .name = "ucomiss", .ops = &mov_ops, }, { .name = "vaddsd", .ops = &mov_ops, }, --2.40.1.521.gf1e218fcd8-goog