diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-17 11:20:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-17 11:20:24 -0500 |
| commit | a72594ca5c70ef4a94fab8ad541beda0d0a94139 (patch) | |
| tree | 2f08d90934e65ea60f73e2bdaf7408fb36f1aecf /tools/perf/scripts/python | |
| parent | 7a7368a5f22d13a7ff6654204de92c08ce5d8fea (diff) | |
| parent | 81fccd6ca507d3b2012eaf1edeb9b1dbf4bd22db (diff) | |
Merge tag 'perf-core-for-mingo-4.16-20180117' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
- Fix various per event 'max-stack' and 'call-graph=dwarf' issues,
mostly in 'perf trace', allowing to use 'perf trace --call-graph' with
'dwarf' and 'fp' to setup the callgraph details for the syscall events
and make that apply to other events, whilhe allowing to override that on
a per-event basis, using '-e sched:*switch/call-graph=dwarf/' for
instance (Arnaldo Carvalho de Melo)
- Improve the --time percent support in record/report/script (Jin Yao)
- Fix copyfile_offset update of output offset (Jiri Olsa)
- Add python script to profile and resolve physical mem type (Kan Liang)
- Add ARM Statistical Profiling Extensions (SPE) support (Kim Phillips)
- Remove trailing semicolon in the evlist code (Luis de Bethencourt)
- Fix incorrect handling of type _TERM_DRV_CFG (Mathieu Poirier)
- Use asprintf when possible in libtraceevent (Federico Vaga)
- Fix bad force_token escape sequence in libtraceevent (Michael Sartain)
- Add UL suffix to MISSING_EVENTS in libtraceevent (Michael Sartain)
- value of unknown symbolic fields in libtraceevent (Jan Kiszka)
- libtraceevent updates: (Steven Rostedt)
o Show value of flags that have not been parsed
o Simplify pointer print logic and fix %pF
o Handle new pointer processing of bprint strings
o Show contents (in hex) of data of unrecognized type records
o Fix get_field_str() for dynamic strings
- Add missing break in FALSE case of pevent_filter_clear_trivial() (Taeung Song)
- Fix failed memory allocation for get_cpuid_str (Thomas Richter)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
| -rw-r--r-- | tools/perf/scripts/python/bin/mem-phys-addr-record | 19 | ||||
| -rw-r--r-- | tools/perf/scripts/python/bin/mem-phys-addr-report | 3 | ||||
| -rw-r--r-- | tools/perf/scripts/python/mem-phys-addr.py | 95 |
3 files changed, 117 insertions, 0 deletions
diff --git a/tools/perf/scripts/python/bin/mem-phys-addr-record b/tools/perf/scripts/python/bin/mem-phys-addr-record new file mode 100644 index 000000000000..5a875122a904 --- /dev/null +++ b/tools/perf/scripts/python/bin/mem-phys-addr-record | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | |||
| 3 | # | ||
| 4 | # Profiling physical memory by all retired load instructions/uops event | ||
| 5 | # MEM_INST_RETIRED.ALL_LOADS or MEM_UOPS_RETIRED.ALL_LOADS | ||
| 6 | # | ||
| 7 | |||
| 8 | load=`perf list | grep mem_inst_retired.all_loads` | ||
| 9 | if [ -z "$load" ]; then | ||
| 10 | load=`perf list | grep mem_uops_retired.all_loads` | ||
| 11 | fi | ||
| 12 | if [ -z "$load" ]; then | ||
| 13 | echo "There is no event to count all retired load instructions/uops." | ||
| 14 | exit 1 | ||
| 15 | fi | ||
| 16 | |||
| 17 | arg=$(echo $load | tr -d ' ') | ||
| 18 | arg="$arg:P" | ||
| 19 | perf record --phys-data -e $arg $@ | ||
diff --git a/tools/perf/scripts/python/bin/mem-phys-addr-report b/tools/perf/scripts/python/bin/mem-phys-addr-report new file mode 100644 index 000000000000..3f2b847e2eab --- /dev/null +++ b/tools/perf/scripts/python/bin/mem-phys-addr-report | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | # description: resolve physical address samples | ||
| 3 | perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/mem-phys-addr.py | ||
diff --git a/tools/perf/scripts/python/mem-phys-addr.py b/tools/perf/scripts/python/mem-phys-addr.py new file mode 100644 index 000000000000..ebee2c5ae496 --- /dev/null +++ b/tools/perf/scripts/python/mem-phys-addr.py | |||
| @@ -0,0 +1,95 @@ | |||
| 1 | # mem-phys-addr.py: Resolve physical address samples | ||
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 3 | # | ||
| 4 | # Copyright (c) 2018, Intel Corporation. | ||
| 5 | |||
| 6 | from __future__ import division | ||
| 7 | import os | ||
| 8 | import sys | ||
| 9 | import struct | ||
| 10 | import re | ||
| 11 | import bisect | ||
| 12 | import collections | ||
| 13 | |||
| 14 | sys.path.append(os.environ['PERF_EXEC_PATH'] + \ | ||
| 15 | '/scripts/python/Perf-Trace-Util/lib/Perf/Trace') | ||
| 16 | |||
| 17 | #physical address ranges for System RAM | ||
| 18 | system_ram = [] | ||
| 19 | #physical address ranges for Persistent Memory | ||
| 20 | pmem = [] | ||
| 21 | #file object for proc iomem | ||
| 22 | f = None | ||
| 23 | #Count for each type of memory | ||
| 24 | load_mem_type_cnt = collections.Counter() | ||
| 25 | #perf event name | ||
| 26 | event_name = None | ||
| 27 | |||
| 28 | def parse_iomem(): | ||
| 29 | global f | ||
| 30 | f = open('/proc/iomem', 'r') | ||
| 31 | for i, j in enumerate(f): | ||
| 32 | m = re.split('-|:',j,2) | ||
| 33 | if m[2].strip() == 'System RAM': | ||
| 34 | system_ram.append(long(m[0], 16)) | ||
| 35 | system_ram.append(long(m[1], 16)) | ||
| 36 | if m[2].strip() == 'Persistent Memory': | ||
| 37 | pmem.append(long(m[0], 16)) | ||
| 38 | pmem.append(long(m[1], 16)) | ||
| 39 | |||
| 40 | def print_memory_type(): | ||
| 41 | print "Event: %s" % (event_name) | ||
| 42 | print "%-40s %10s %10s\n" % ("Memory type", "count", "percentage"), | ||
| 43 | print "%-40s %10s %10s\n" % ("----------------------------------------", \ | ||
| 44 | "-----------", "-----------"), | ||
| 45 | total = sum(load_mem_type_cnt.values()) | ||
| 46 | for mem_type, count in sorted(load_mem_type_cnt.most_common(), \ | ||
| 47 | key = lambda(k, v): (v, k), reverse = True): | ||
| 48 | print "%-40s %10d %10.1f%%\n" % (mem_type, count, 100 * count / total), | ||
| 49 | |||
| 50 | def trace_begin(): | ||
| 51 | parse_iomem() | ||
| 52 | |||
| 53 | def trace_end(): | ||
| 54 | print_memory_type() | ||
| 55 | f.close() | ||
| 56 | |||
| 57 | def is_system_ram(phys_addr): | ||
| 58 | #/proc/iomem is sorted | ||
| 59 | position = bisect.bisect(system_ram, phys_addr) | ||
| 60 | if position % 2 == 0: | ||
| 61 | return False | ||
| 62 | return True | ||
| 63 | |||
| 64 | def is_persistent_mem(phys_addr): | ||
| 65 | position = bisect.bisect(pmem, phys_addr) | ||
| 66 | if position % 2 == 0: | ||
| 67 | return False | ||
| 68 | return True | ||
| 69 | |||
| 70 | def find_memory_type(phys_addr): | ||
| 71 | if phys_addr == 0: | ||
| 72 | return "N/A" | ||
| 73 | if is_system_ram(phys_addr): | ||
| 74 | return "System RAM" | ||
| 75 | |||
| 76 | if is_persistent_mem(phys_addr): | ||
| 77 | return "Persistent Memory" | ||
| 78 | |||
| 79 | #slow path, search all | ||
| 80 | f.seek(0, 0) | ||
| 81 | for j in f: | ||
| 82 | m = re.split('-|:',j,2) | ||
| 83 | if long(m[0], 16) <= phys_addr <= long(m[1], 16): | ||
| 84 | return m[2] | ||
| 85 | return "N/A" | ||
| 86 | |||
| 87 | def process_event(param_dict): | ||
| 88 | name = param_dict["ev_name"] | ||
| 89 | sample = param_dict["sample"] | ||
| 90 | phys_addr = sample["phys_addr"] | ||
| 91 | |||
| 92 | global event_name | ||
| 93 | if event_name == None: | ||
| 94 | event_name = name | ||
| 95 | load_mem_type_cnt[find_memory_type(phys_addr)] += 1 | ||
