tools perf: Add branch speculation info
v3 cover tools perf: Add branch speculation info
AMD Last Branch Record Extension Version 2 (LbrExtV2) provides branch speculation information and the perf UAPI is extended to provide this in a generic way. Make perf tool show this additional information.
The UAPI changes can be found in commit 93315e46b000 ("perf/core: Add speculation info to branch entries").
Previous versions can be found at:
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Drop tools-side UAPI changes as they have already been added by other commits.
- Rebase on top of latest perf/core.
Changes in v2:
- Drop msr-index.h related changes for now.
- Rebase on top of latest perf/core.
- Fix UAPI breakage introduced by the ARM64 BRBE changes to perf branch entry.
Sandipan Das (2):
perf script: Show branch speculation info perf session: Show branch speculation info in raw dump
tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- tools/perf/util/session.c | 5 +++-- 5 files changed, 35 insertions(+), 7 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 perf script: Show branch speculation info
Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for optimizing code further.
The speculation info is appended to the end of the list of fields so any existing tools that use "/" as a delimiter for access fields via an index remain unaffected. Also show "-" instead of "N/A" when speculation info is unavailable because "/" is used as the field separator.
E.g.
$ perf record -j any,u,save_type ./test_branch $ perf script --fields brstacksym
Before:
[...]
check_match+0x60/strcmp+0x0/P/-/-/0/CALL
do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL
[...]
After:
[...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH [...]
--- tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-)
tools/perf/builtin-script.c +3 -2
@@ -880,12 +880,13 @@ mispred_str(struct branch_entry *br)static int print_bstack_flags (FILE *fp,struct branch_entry *br) { -return fprintf (fp,"/%c/%c/%c/%d/%s " , +return fprintf (fp,"/%c/%c/%c/%d/%s/%s " ,mispred_str (br), br->flags.in_tx ?'X' :'-' , br->flags.abort ?'A' :'-' , br->flags.cycles, -get_branch_type (br)); +get_branch_type (br), + br->flags.spec ?branch_spec_desc (br->flags.spec) :"-" ); } static int perf_sample__fprintf_brstack(struct perf_sample *sample,
tools/perf/util/branch.c +15 -0
@@ -212,3 +212,18 @@ int branch_type_str(struct branch_type_stat *st, char *bf, int size)return printed; } + +const char *branch_spec_desc (int spec) +{ +const char *branch_spec_outcomes[PERF_BR_SPEC_MAX ] = { +"N/A" , +"SPEC_WRONG_PATH" , +"NON_SPEC_CORRECT_PATH" , +"SPEC_CORRECT_PATH" , + }; + +if (spec >=0 && spec <PERF_BR_SPEC_MAX ) +return branch_spec_outcomes[spec]; + +return NULL ; +}
tools/perf/util/branch.h +2 -0
@@ -89,4 +89,6 @@ const char *get_branch_type(struct branch_entry *e);void branch_type_stat_display (FILE *fp,struct branch_type_stat *st);int branch_type_str (struct branch_type_stat *st,char *bf,int bfsize); +const char *branch_spec_desc (int spec); +#endif /* _PERF_BRANCH_H */
tools/perf/util/evsel.c +12 -3
@@ -2319,7 +2319,10 @@ u64 evsel__bitfield_swap_branch_flags(u64 value)* abort:1 //transaction abort * cycles:16 //cycle count to last branch * type:4 //branch type -* reserved:40 +* spec:2 //branch speculation info +* new_type:4 //additional branch type +* priv:3 //privilege level +* reserved:31 * } * } *
@@ -2335,7 +2338,10 @@ u64 evsel__bitfield_swap_branch_flags(u64 value) new_val |=bitfield_swap (value,3 ,1 ); new_val |=bitfield_swap (value,4 ,16 ); new_val |=bitfield_swap (value,20 ,4 ); - new_val |=bitfield_swap (value,24 ,40 ); + new_val |=bitfield_swap (value,24 ,2 ); + new_val |=bitfield_swap (value,26 ,4 ); + new_val |=bitfield_swap (value,30 ,3 ); + new_val |=bitfield_swap (value,33 ,31 ); }else { new_val =bitfield_swap (value,63 ,1 ); new_val |=bitfield_swap (value,62 ,1 );
@@ -2343,7 +2349,10 @@ u64 evsel__bitfield_swap_branch_flags(u64 value) new_val |=bitfield_swap (value,60 ,1 ); new_val |=bitfield_swap (value,44 ,16 ); new_val |=bitfield_swap (value,40 ,4 ); - new_val |=bitfield_swap (value,0 ,40 ); + new_val |=bitfield_swap (value,38 ,2 ); + new_val |=bitfield_swap (value,34 ,4 ); + new_val |=bitfield_swap (value,31 ,3 ); + new_val |=bitfield_swap (value,0 ,31 ); }return new_val;
Signature · 1 line
2.34.1
PATCH v3 2/2 perf session: Show branch speculation info in raw dump
In reply to Sandipan DasShow the branch speculation info if provided by the branch recording hardware feature. This can be useful for purposes of code optimization.
E.g.
$ perf record -j any,u ./test_branch $ perf report --dump-raw-trace
Before:
[...]
8380958377610 0x40b178 [0x1b0]: PERF_RECORD_SAMPLE(IP, 0x2): 7952/7952: 0x4f851a period: 48973 addr: 0 ... branch stack: nr:16
..... 0: 00000000004b52fd -> 00000000004f82c0 0 cycles P 0 ..... 1: ffffffff8220137c -> 00000000004b52f0 0 cycles M 0 ..... 2: 000000000041d1c4 -> 00000000004b52f0 0 cycles P 0 ..... 3: 00000000004e7ead -> 000000000041d1b0 0 cycles M 0 ..... 4: 00000000004e7f91 -> 00000000004e7ead 0 cycles P 0 ..... 5: 00000000004e7ea8 -> 00000000004e7f70 0 cycles P 0 ..... 6: 00000000004e7e52 -> 00000000004e7e98 0 cycles M 0 ..... 7: 00000000004e7e1f -> 00000000004e7e40 0 cycles M 0 ..... 8: 00000000004e7f60 -> 00000000004e7df0 0 cycles P 0 ..... 9: 00000000004e7f58 -> 00000000004e7f60 0 cycles M 0 ..... 10: 000000000041d85d -> 00000000004e7f50 0 cycles P 0 ..... 11: 000000000043306a -> 000000000041d840 0 cycles P 0 ..... 12: ffffffff8220137c -> 0000000000433040 0 cycles M 0 ..... 13: 000000000041e4a1 -> 0000000000433040 0 cycles P 0 ..... 14: ffffffff8220137c -> 000000000041e490 0 cycles M 0 ..... 15: 000000000041d89b -> 000000000041e487 0 cycles P 0
... thread: test_branch:7952
...... dso: /data/sandipan/test_branch
[...]
After:
[...]
8380958377610 0x40b178 [0x1b0]: PERF_RECORD_SAMPLE(IP, 0x2): 7952/7952: 0x4f851a period: 48973 addr: 0 ... branch stack: nr:16
..... 0: 00000000004b52fd -> 00000000004f82c0 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 1: ffffffff8220137c -> 00000000004b52f0 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 2: 000000000041d1c4 -> 00000000004b52f0 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 3: 00000000004e7ead -> 000000000041d1b0 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 4: 00000000004e7f91 -> 00000000004e7ead 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 5: 00000000004e7ea8 -> 00000000004e7f70 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 6: 00000000004e7e52 -> 00000000004e7e98 0 cycles M 0 SPEC_CORRECT_PATH ..... 7: 00000000004e7e1f -> 00000000004e7e40 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 8: 00000000004e7f60 -> 00000000004e7df0 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 9: 00000000004e7f58 -> 00000000004e7f60 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 10: 000000000041d85d -> 00000000004e7f50 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 11: 000000000043306a -> 000000000041d840 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 12: ffffffff8220137c -> 0000000000433040 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 13: 000000000041e4a1 -> 0000000000433040 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 14: ffffffff8220137c -> 000000000041e490 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 15: 000000000041d89b -> 000000000041e487 0 cycles P 0 NON_SPEC_CORRECT_PATH
... thread: test_branch:7952
...... dso: /data/sandipan/test_branch
[...]
--- tools/perf/util/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/session.c +3 -2
@@ -1180,7 +1180,7 @@ static void branch_stack__printf(struct perf_sample *sample, bool callstack)struct branch_entry *e = &entries[i];if (!callstack) { - printf("..... %2"PRIu64": %016" PRIx64 " -> %016" PRIx64 " %hu cycles %s%s%s%s %x %s\n", + printf("..... %2"PRIu64": %016" PRIx64 " -> %016" PRIx64 " %hu cycles %s%s%s%s %x %s %s\n", i, e->from, e->to, (unsigned short)e->flags.cycles, e->flags.mispred ? "M" : " ",
@@ -1188,7 +1188,8 @@ static void branch_stack__printf(struct perf_sample *sample, bool callstack) e->flags.abort ?"A" :" " , e->flags.in_tx ?"T" :" " , (unsigned )e->flags.reserved, - get_branch_type(e)); +get_branch_type (e), + e->flags.spec ? branch_spec_desc(e->flags.spec) : ""); }else {if (i ==0 ) { printf("..... %2"PRIu64": %016" PRIx64 "\n"
Signature · 1 line
2.34.1
Re: [PATCH v3 1/2] perf script: Show branch speculation info
In reply to Sandipan DasQuoted 27 lines · Sandipan Das
Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for optimizing code further.
The speculation info is appended to the end of the list of fields so any existing tools that use "/" as a delimiter for access fields via an index remain unaffected. Also show "-" instead of "N/A" when speculation info is unavailable because "/" is used as the field separator.
E.g.
$ perf record -j any,u,save_type ./test_branch $ perf script --fields brstacksymBefore:
[...]
check_match+0x60/strcmp+0x0/P/-/-/0/CALL
do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL
[...]After:
[...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH [...]
Quoted 8 lines
Signed-off-by Sandipan Das <[email protected]>--- tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-)
Sorry but I realized later that this change breaks the builtin branch test. The additional change below fixes that.
tools/perf/tests/shell/test_brstack.sh +9 -9
@@ -30,14 +30,14 @@ test_user_branches() { # brstack_foo+0x14/brstack_bar+0x40/P/-/-/0/CALL set -x - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND$" $TMPDIR/perf.script - grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND/.*$" $TMPDIR/perf.script set +x # some branch types are still not being tested:
@@ -57,7 +57,7 @@ test_filter() { # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-) - if grep -E -vm1 "^[^ ]*/($expect|-|( *))$" $TMPDIR/perf.script; then + if grep -E -vm1 "^[^ ]*/($expect|-|( *))/.*$" $TMPDIR/perf.script; then return 1 fi }
- Sandipan
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v3 1/2] perf script: Show branch speculation info
Em Mon, Jan 30, 2023 at 04:04:58PM +0530, Sandipan Das escreveu:
Quoted 37 lines · Sandipan Das
Quoted 27 lines
Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for optimizing code further.
The speculation info is appended to the end of the list of fields so any existing tools that use "/" as a delimiter for access fields via an index remain unaffected. Also show "-" instead of "N/A" when speculation info is unavailable because "/" is used as the field separator.
E.g.
$ perf record -j any,u,save_type ./test_branch $ perf script --fields brstacksymBefore:
[...]
check_match+0x60/strcmp+0x0/P/-/-/0/CALL
do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL
[...]After:
[...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH [...]
Quoted 8 lines
Signed-off-by Sandipan Das <[email protected]>--- tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-)
Quoted 2 lines
Sorry but I realized later that this change breaks the builtin branch test. The additional change below fixes that.
Please wait a bit for people to be able to review the other patches and then submit a v2 series.
- Arnaldo
Quoted 39 lines
tools/perf/tests/shell/test_brstack.sh +9
-10@@ -30,14 +30,14 @@ test_user_branches() { # brstack_foo+0x14/brstack_bar+0x40/P/-/-/0/CALL set -x - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND$" $TMPDIR/perf.script - grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND/.*$" $TMPDIR/perf.script set +x # some branch types are still not being tested:@@ -57,7 +57,7 @@ test_filter() { # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-) - if grep -E -vm1 "^[^ ]*/($expect|-|( *))$" $TMPDIR/perf.script; then + if grep -E -vm1 "^[^ ]*/($expect|-|( *))/.*$" $TMPDIR/perf.script; then return 1 fi } - Sandipan
Signature · 1 line
- Arnaldo
Em Mon, Jan 30, 2023 at 11:29:14AM +0530, Sandipan Das escreveu:
Quoted 10 lines
AMD Last Branch Record Extension Version 2 (LbrExtV2) provides branch speculation information and the perf UAPI is extended to provide this in a generic way. Make perf tool show this additional information.
The UAPI changes can be found in commit
93315e46b000("perf/core: Add speculation info to branch entries").Previous versions can be found at:
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Thanks, applied.
- Arnaldo
Quoted 25 lines
Changes in v3:
- Drop tools-side UAPI changes as they have already been added by other commits.
- Rebase on top of latest perf/core.Changes in v2:
- Dropmsr-index.hrelated changes for now.
- Rebase on top of latest perf/core.
- Fix UAPI breakage introduced by the ARM64 BRBE changes to perf branch entry.Sandipan Das (2):
perf script: Show branch speculation info perf session: Show branch speculation info in raw dumptools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- tools/perf/util/session.c | 5 +++-- 5 files changed, 35 insertions(+), 7 deletions(-)Signature · 1 line
2.34.1
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v3 1/2] perf script: Show branch speculation info
In reply to Arnaldo Carvalho de MeloEm Mon, Jan 30, 2023 at 05:09:10PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 38 lines
Em Mon, Jan 30, 2023 at 04:04:58PM +0530, Sandipan Das escreveu:
Quoted 37 lines · Sandipan Das
Quoted 35 lines
Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for optimizing code further.
The speculation info is appended to the end of the list of fields so any existing tools that use "/" as a delimiter for access fields via an index remain unaffected. Also show "-" instead of "N/A" when speculation info is unavailable because "/" is used as the field separator.
E.g.
$ perf record -j any,u,save_type ./test_branch $ perf script --fields brstacksymBefore:
[...]
check_match+0x60/strcmp+0x0/P/-/-/0/CALL
do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL
[...]After:
[...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH [...]
Signed-off-by Sandipan Das <[email protected]>--- tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-)
Quoted 5 lines
Quoted 2 lines
Sorry but I realized later that this change breaks the builtin branch test. The additional change below fixes that.
Please wait a bit for people to be able to review the other patches and then submit a v2 series.
So I applied it manually, no need to send v2.
- Arnaldo
Quoted 45 lines
- Arnaldo
Quoted 39 lines
tools/perf/tests/shell/test_brstack.sh +9
-10@@ -30,14 +30,14 @@ test_user_branches() { # brstack_foo+0x14/brstack_bar+0x40/P/-/-/0/CALL set -x - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND$" $TMPDIR/perf.script - grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND/.*$" $TMPDIR/perf.script set +x # some branch types are still not being tested:@@ -57,7 +57,7 @@ test_filter() { # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-) - if grep -E -vm1 "^[^ ]*/($expect|-|( *))$" $TMPDIR/perf.script; then + if grep -E -vm1 "^[^ ]*/($expect|-|( *))/.*$" $TMPDIR/perf.script; then return 1 fi } - SandipanSignature · 1 line
- Arnaldo
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v3 1/2] perf script: Show branch speculation info
Em Wed, Feb 01, 2023 at 10:13:03PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 39 lines
Em Mon, Jan 30, 2023 at 05:09:10PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 38 lines
Em Mon, Jan 30, 2023 at 04:04:58PM +0530, Sandipan Das escreveu:
Quoted 37 lines · Sandipan Das
Quoted 35 lines
Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for optimizing code further.
The speculation info is appended to the end of the list of fields so any existing tools that use "/" as a delimiter for access fields via an index remain unaffected. Also show "-" instead of "N/A" when speculation info is unavailable because "/" is used as the field separator.
E.g.
$ perf record -j any,u,save_type ./test_branch $ perf script --fields brstacksymBefore:
[...]
check_match+0x60/strcmp+0x0/P/-/-/0/CALL
do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL
[...]After:
[...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH [...]
Signed-off-by Sandipan Das <[email protected]>--- tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-)
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Sorry but I realized later that this change breaks the builtin branch test. The additional change below fixes that.
Please wait a bit for people to be able to review the other patches and then submit a v2 series.
So I applied it manually, no need to send v2.
Please send v2 after figuring out why 'perf test "Sample parsing"' fails,
I removed both patches for now.
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v3 1/2] perf script: Show branch speculation info
Em Wed, Feb 01, 2023 at 11:34:46PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 9 lines
Em Wed, Feb 01, 2023 at 10:13:03PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 8 lines
Em Mon, Jan 30, 2023 at 05:09:10PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 6 lines
Em Mon, Jan 30, 2023 at 04:04:58PM +0530, Sandipan Das escreveu:
Quoted 2 lines
Sorry but I realized later that this change breaks the builtin branch test. The additional change below fixes that.
Please wait a bit for people to be able to review the other patches and then submit a v2 series.
Quoted 6 lines
Quoted 1 line
So I applied it manually, no need to send v2.
Please send v2 after figuring out why 'perf test "Sample parsing"' fails,
I removed both patches for now.
Triple checking:
[acme@quaco perf]$ git log --oneline -124a617c84f0da540 (HEAD -> perf/core) perf session: Show branch speculation info in raw dump [acme@quaco perf]$ perf -v
perf version 6.2.rc5.g24a617c84f0d
[acme@quaco perf]$ perf test "Sample testing"
[acme@quaco perf]$ perf test "Sample parsing"
27: Sample parsing : FAILED!
80: x86 Sample parsing : Ok
[acme@quaco perf]$ git reset --hard HEAD~
HEAD is now at 1fad7c0ae6516706 perf script: Show branch speculation info
[acme@quaco perf]$ git log --oneline -11fad7c0ae6516706 (HEAD -> perf/core) perf script: Show branch speculation info [acme@quaco perf]$ perf -v
perf version 6.2.rc5.g1fad7c0ae651
[acme@quaco perf]$ perf test 27
27: Sample parsing : FAILED!
[acme@quaco perf]$ git reset --hard HEAD~
HEAD is now at d4a6f399c89520ba perf bench syscall: Add execve syscall benchmark [acme@quaco perf]$
[acme@quaco perf]$ git log --oneline -1d4a6f399c89520ba (HEAD -> perf/core, five/perf/core) perf bench syscall: Add execve syscall benchmark [acme@quaco perf]$ perf -v
perf version 6.2.rc5.gd4a6f399c895
[acme@quaco perf]$ perf test 27
27: Sample parsing : Ok
[acme@quaco perf]$
- Arnaldo