diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-09-05 07:14:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-09-05 07:14:28 +0200 |
| commit | 770e96125515daf1c7bc179323f2e0d488dfe6ac (patch) | |
| tree | 19c4e7d04f160a98782f3b47e4997fbf003b469b /tools/perf/ui/browsers/annotate.c | |
| parent | 24e700e291d52bd200212487e2b654c0aa3f07a2 (diff) | |
| parent | eba9fac017617e685d648339e29a1453a30cb065 (diff) | |
Merge tag 'perf-core-for-mingo-4.14-20170901' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
- Support syscall name glob matching in 'perf trace' (Arnaldo Carvalho de Melo)
e.g.:
# perf trace -e pkey_*
32.784 (0.006 ms): pkey/16018 pkey_alloc(init_val: DISABLE_WRITE) = -1 EINVAL Invalid argument
32.795 (0.004 ms): pkey/16018 pkey_mprotect(start: 0x7f380d0a6000, len: 4096, prot: READ|WRITE, pkey: -1) = 0
32.801 (0.002 ms): pkey/16018 pkey_free(pkey: -1 ) = -1 EINVAL Invalid argument
^C#
- Do not auto merge counts for explicitely specified events in
'perf stat' (Arnaldo Carvalho de Melo)
- Fix syntax in documentation of .perfconfig intel-pt option (Jack Henschel)
- Calculate the average cycles of iterations for loops detected by the
branch history support in 'perf report' (Jin Yao)
- Support PERF_SAMPLE_PHYS_ADDR as a sort key "phys_daddr" in the 'script', 'mem',
'top' and 'report'. Also add a test entry for it in 'perf test' (Kan Liang)
- Fix 'Object code reading' 'perf test' entry in PowerPC (Ravi Bangoria)
- Remove some duplicate Power9 duplicate vendor events (described in JSON
files) (Sukadev Bhattiprolu)
- Add help entry in the TUI annotate browser about cycling thru hottest
instructions with TAB/shift+TAB (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
| -rw-r--r-- | tools/perf/ui/browsers/annotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index ba0aee576a2b..786fecaf578e 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -829,7 +829,8 @@ static int annotate_browser__run(struct annotate_browser *browser, "q/ESC/CTRL+C Exit\n\n" "ENTER Go to target\n" "ESC Exit\n" - "H Cycle thru hottest instructions\n" + "H Go to hottest instruction\n" + "TAB/shift+TAB Cycle thru hottest instructions\n" "j Toggle showing jump to target arrows\n" "J Toggle showing number of jump sources on targets\n" "n Search next string\n" |