8 files changed, 240 insertions, 35 deletions

diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
index 38dfb720fb6f..54ace2f6bc36 100644
--- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
+++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
@@ -31,10 +31,8 @@ def flag_str(event_name, field_name, value):
     string = ""
 
     if flag_fields[event_name][field_name]:
-        print_delim = 0
-        keys = flag_fields[event_name][field_name]['values'].keys()
-        keys.sort()
-        for idx in keys:
+        print_delim = 0
+        for idx in sorted(flag_fields[event_name][field_name]['values']):
             if not value and not idx:
                 string += flag_fields[event_name][field_name]['values'][idx]
                 break
@@ -51,14 +49,12 @@ def symbol_str(event_name, field_name, value):
     string = ""
 
     if symbolic_fields[event_name][field_name]:
-        keys = symbolic_fields[event_name][field_name]['values'].keys()
-        keys.sort()
-        for idx in keys:
+        for idx in sorted(symbolic_fields[event_name][field_name]['values']):
             if not value and not idx:
-                string = symbolic_fields[event_name][field_name]['values'][idx]
+                string = symbolic_fields[event_name][field_name]['values'][idx]
                 break
-            if (value == idx):
-                string = symbolic_fields[event_name][field_name]['values'][idx]
+            if (value == idx):
+                string = symbolic_fields[event_name][field_name]['values'][idx]
                 break
 
     return string
@@ -74,19 +70,17 @@ def trace_flag_str(value):
     string = ""
     print_delim = 0
 
-    keys = trace_flags.keys()
-
-    for idx in keys:
-        if not value and not idx:
-            string += "NONE"
-            break
-
-        if idx and (value & idx) == idx:
-            if print_delim:
-                string += " | ";
-            string += trace_flags[idx]
-            print_delim = 1
-            value &= ~idx
+    for idx in trace_flags:
+        if not value and not idx:
+            string += "NONE"
+            break
+
+        if idx and (value & idx) == idx:
+            if print_delim:
+                string += " | ";
+            string += trace_flags[idx]
+            print_delim = 1
+            value &= ~idx
 
     return string
 
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
index 81a56cd2b3c1..21a7a1298094 100755
--- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
+++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
@@ -8,6 +8,7 @@
 # PerfEvent is the base class for all perf event sample, PebsEvent
 # is a HW base Intel x86 PEBS event, and user could add more SW/HW
 # event classes based on requirements.
+from __future__ import print_function
 
 import struct
 
@@ -44,7 +45,8 @@ class PerfEvent(object):
                 PerfEvent.event_num += 1
 
         def show(self):
-                print "PMU event: name=%12s, symbol=%24s, comm=%8s, dso=%12s" % (self.name, self.symbol, self.comm, self.dso)
+                print("PMU event: name=%12s, symbol=%24s, comm=%8s, dso=%12s" %
+                      (self.name, self.symbol, self.comm, self.dso))
 
 #
 # Basic Intel PEBS (Precise Event-based Sampling) event, whose raw buffer
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py
index fdd92f699055..cac7b2542ee8 100644
--- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py
+++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py
@@ -11,7 +11,7 @@
 try:
         import wx
 except ImportError:
-        raise ImportError, "You need to install the wxpython lib for this script"
+        raise ImportError("You need to install the wxpython lib for this script")
 
 
 class RootFrame(wx.Frame):
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
index f6c84966e4f8..7384dcb628c4 100644
--- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
+++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
@@ -5,6 +5,7 @@
 # This software may be distributed under the terms of the GNU General
 # Public License ("GPL") version 2 as published by the Free Software
 # Foundation.
+from __future__ import print_function
 
 import errno, os
 
@@ -33,7 +34,7 @@ def nsecs_str(nsecs):
     return str
 
 def add_stats(dict, key, value):
-        if not dict.has_key(key):
+        if key not in dict:
                 dict[key] = (value, value, value, 1)
         else:
                 min, max, avg, count = dict[key]
@@ -72,10 +73,10 @@ try:
 except:
         if not audit_package_warned:
                 audit_package_warned = True
-                print "Install the audit-libs-python package to get syscall names.\n" \
-                    "For example:\n  # apt-get install python-audit (Ubuntu)" \
-                    "\n  # yum install audit-libs-python (Fedora)" \
-                    "\n  etc.\n"
+                print("Install the audit-libs-python package to get syscall names.\n"
+                    "For example:\n  # apt-get install python-audit (Ubuntu)"
+                    "\n  # yum install audit-libs-python (Fedora)"
+                    "\n  etc.\n")
 
 def syscall_name(id):
         try:
diff --git a/tools/perf/scripts/python/bin/powerpc-hcalls-record b/tools/perf/scripts/python/bin/powerpc-hcalls-record
new file mode 100644
index 000000000000..b7402aa9147d
--- /dev/null
+++ b/tools/perf/scripts/python/bin/powerpc-hcalls-record
@@ -0,0 +1,2 @@
+#!/bin/bash
+perf record -e "{powerpc:hcall_entry,powerpc:hcall_exit}" $@
diff --git a/tools/perf/scripts/python/bin/powerpc-hcalls-report b/tools/perf/scripts/python/bin/powerpc-hcalls-report
new file mode 100644
index 000000000000..dd32ad7465f6
--- /dev/null
+++ b/tools/perf/scripts/python/bin/powerpc-hcalls-report
@@ -0,0 +1,2 @@
+#!/bin/bash
+perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/powerpc-hcalls.py
diff --git a/tools/perf/scripts/python/powerpc-hcalls.py b/tools/perf/scripts/python/powerpc-hcalls.py
new file mode 100644
index 000000000000..00e0e7476e55
--- /dev/null
+++ b/tools/perf/scripts/python/powerpc-hcalls.py
@@ -0,0 +1,200 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018 Ravi Bangoria, IBM Corporation
+#
+# Hypervisor call statisics
+
+import os
+import sys
+
+sys.path.append(os.environ['PERF_EXEC_PATH'] + \
+        '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
+
+from perf_trace_context import *
+from Core import *
+from Util import *
+
+# output: {
+#       opcode: {
+#               'min': minimum time nsec
+#               'max': maximum time nsec
+#               'time': average time nsec
+#               'cnt': counter
+#       } ...
+# }
+output = {}
+
+# d_enter: {
+#       cpu: {
+#               opcode: nsec
+#       } ...
+# }
+d_enter = {}
+
+hcall_table = {
+        4: 'H_REMOVE',
+        8: 'H_ENTER',
+        12: 'H_READ',
+        16: 'H_CLEAR_MOD',
+        20: 'H_CLEAR_REF',
+        24: 'H_PROTECT',
+        28: 'H_GET_TCE',
+        32: 'H_PUT_TCE',
+        36: 'H_SET_SPRG0',
+        40: 'H_SET_DABR',
+        44: 'H_PAGE_INIT',
+        48: 'H_SET_ASR',
+        52: 'H_ASR_ON',
+        56: 'H_ASR_OFF',
+        60: 'H_LOGICAL_CI_LOAD',
+        64: 'H_LOGICAL_CI_STORE',
+        68: 'H_LOGICAL_CACHE_LOAD',
+        72: 'H_LOGICAL_CACHE_STORE',
+        76: 'H_LOGICAL_ICBI',
+        80: 'H_LOGICAL_DCBF',
+        84: 'H_GET_TERM_CHAR',
+        88: 'H_PUT_TERM_CHAR',
+        92: 'H_REAL_TO_LOGICAL',
+        96: 'H_HYPERVISOR_DATA',
+        100: 'H_EOI',
+        104: 'H_CPPR',
+        108: 'H_IPI',
+        112: 'H_IPOLL',
+        116: 'H_XIRR',
+        120: 'H_MIGRATE_DMA',
+        124: 'H_PERFMON',
+        220: 'H_REGISTER_VPA',
+        224: 'H_CEDE',
+        228: 'H_CONFER',
+        232: 'H_PROD',
+        236: 'H_GET_PPP',
+        240: 'H_SET_PPP',
+        244: 'H_PURR',
+        248: 'H_PIC',
+        252: 'H_REG_CRQ',
+        256: 'H_FREE_CRQ',
+        260: 'H_VIO_SIGNAL',
+        264: 'H_SEND_CRQ',
+        272: 'H_COPY_RDMA',
+        276: 'H_REGISTER_LOGICAL_LAN',
+        280: 'H_FREE_LOGICAL_LAN',
+        284: 'H_ADD_LOGICAL_LAN_BUFFER',
+        288: 'H_SEND_LOGICAL_LAN',
+        292: 'H_BULK_REMOVE',
+        304: 'H_MULTICAST_CTRL',
+        308: 'H_SET_XDABR',
+        312: 'H_STUFF_TCE',
+        316: 'H_PUT_TCE_INDIRECT',
+        332: 'H_CHANGE_LOGICAL_LAN_MAC',
+        336: 'H_VTERM_PARTNER_INFO',
+        340: 'H_REGISTER_VTERM',
+        344: 'H_FREE_VTERM',
+        348: 'H_RESET_EVENTS',
+        352: 'H_ALLOC_RESOURCE',
+        356: 'H_FREE_RESOURCE',
+        360: 'H_MODIFY_QP',
+        364: 'H_QUERY_QP',
+        368: 'H_REREGISTER_PMR',
+        372: 'H_REGISTER_SMR',
+        376: 'H_QUERY_MR',
+        380: 'H_QUERY_MW',
+        384: 'H_QUERY_HCA',
+        388: 'H_QUERY_PORT',
+        392: 'H_MODIFY_PORT',
+        396: 'H_DEFINE_AQP1',
+        400: 'H_GET_TRACE_BUFFER',
+        404: 'H_DEFINE_AQP0',
+        408: 'H_RESIZE_MR',
+        412: 'H_ATTACH_MCQP',
+        416: 'H_DETACH_MCQP',
+        420: 'H_CREATE_RPT',
+        424: 'H_REMOVE_RPT',
+        428: 'H_REGISTER_RPAGES',
+        432: 'H_DISABLE_AND_GETC',
+        436: 'H_ERROR_DATA',
+        440: 'H_GET_HCA_INFO',
+        444: 'H_GET_PERF_COUNT',
+        448: 'H_MANAGE_TRACE',
+        468: 'H_FREE_LOGICAL_LAN_BUFFER',
+        472: 'H_POLL_PENDING',
+        484: 'H_QUERY_INT_STATE',
+        580: 'H_ILLAN_ATTRIBUTES',
+        592: 'H_MODIFY_HEA_QP',
+        596: 'H_QUERY_HEA_QP',
+        600: 'H_QUERY_HEA',
+        604: 'H_QUERY_HEA_PORT',
+        608: 'H_MODIFY_HEA_PORT',
+        612: 'H_REG_BCMC',
+        616: 'H_DEREG_BCMC',
+        620: 'H_REGISTER_HEA_RPAGES',
+        624: 'H_DISABLE_AND_GET_HEA',
+        628: 'H_GET_HEA_INFO',
+        632: 'H_ALLOC_HEA_RESOURCE',
+        644: 'H_ADD_CONN',
+        648: 'H_DEL_CONN',
+        664: 'H_JOIN',
+        676: 'H_VASI_STATE',
+        688: 'H_ENABLE_CRQ',
+        696: 'H_GET_EM_PARMS',
+        720: 'H_SET_MPP',
+        724: 'H_GET_MPP',
+        748: 'H_HOME_NODE_ASSOCIATIVITY',
+        756: 'H_BEST_ENERGY',
+        764: 'H_XIRR_X',
+        768: 'H_RANDOM',
+        772: 'H_COP',
+        788: 'H_GET_MPP_X',
+        796: 'H_SET_MODE',
+        61440: 'H_RTAS',
+}
+
+def hcall_table_lookup(opcode):
+        if (hcall_table.has_key(opcode)):
+                return hcall_table[opcode]
+        else:
+                return opcode
+
+print_ptrn = '%-28s%10s%10s%10s%10s'
+
+def trace_end():
+        print print_ptrn % ('hcall', 'count', 'min(ns)', 'max(ns)', 'avg(ns)')
+        print '-' * 68
+        for opcode in output:
+                h_name = hcall_table_lookup(opcode)
+                time = output[opcode]['time']
+                cnt = output[opcode]['cnt']
+                min_t = output[opcode]['min']
+                max_t = output[opcode]['max']
+
+                print print_ptrn % (h_name, cnt, min_t, max_t, time/cnt)
+
+def powerpc__hcall_exit(name, context, cpu, sec, nsec, pid, comm, callchain,
+                        opcode, retval):
+        if (d_enter.has_key(cpu) and d_enter[cpu].has_key(opcode)):
+                diff = nsecs(sec, nsec) - d_enter[cpu][opcode]
+
+                if (output.has_key(opcode)):
+                        output[opcode]['time'] += diff
+                        output[opcode]['cnt'] += 1
+                        if (output[opcode]['min'] > diff):
+                                output[opcode]['min'] = diff
+                        if (output[opcode]['max'] < diff):
+                                output[opcode]['max'] = diff
+                else:
+                        output[opcode] = {
+                                'time': diff,
+                                'cnt': 1,
+                                'min': diff,
+                                'max': diff,
+                        }
+
+                del d_enter[cpu][opcode]
+#       else:
+#               print "Can't find matching hcall_enter event. Ignoring sample"
+
+def powerpc__hcall_entry(event_name, context, cpu, sec, nsec, pid, comm,
+                         callchain, opcode):
+                if (d_enter.has_key(cpu)):
+                        d_enter[cpu][opcode] = nsecs(sec, nsec)
+                else:
+                        d_enter[cpu] = {opcode: nsecs(sec, nsec)}
diff --git a/tools/perf/scripts/python/sched-migration.py b/tools/perf/scripts/python/sched-migration.py
index de66cb3b72c9..3473e7f66081 100644
--- a/tools/perf/scripts/python/sched-migration.py
+++ b/tools/perf/scripts/python/sched-migration.py
@@ -9,13 +9,17 @@
 # This software is distributed under the terms of the GNU General
 # Public License ("GPL") version 2 as published by the Free Software
 # Foundation.
-
+from __future__ import print_function
 
 import os
 import sys
 
 from collections import defaultdict
-from UserList import UserList
+try:
+    from UserList import UserList
+except ImportError:
+    # Python 3: UserList moved to the collections package
+    from collections import UserList
 
 sys.path.append(os.environ['PERF_EXEC_PATH'] + \
         '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
@@ -300,7 +304,7 @@ class TimeSliceList(UserList):
                 if i == -1:
                         return
 
-                for i in xrange(i, len(self.data)):
+                for i in range(i, len(self.data)):
                         timeslice = self.data[i]
                         if timeslice.start > end:
                                 return
@@ -336,8 +340,8 @@ class SchedEventProxy:
                 on_cpu_task = self.current_tsk[headers.cpu]
 
                 if on_cpu_task != -1 and on_cpu_task != prev_pid:
-                        print "Sched switch event rejected ts: %s cpu: %d prev: %s(%d) next: %s(%d)" % \
-                                (headers.ts_format(), headers.cpu, prev_comm, prev_pid, next_comm, next_pid)
+                        print("Sched switch event rejected ts: %s cpu: %d prev: %s(%d) next: %s(%d)" % \
+                                headers.ts_format(), headers.cpu, prev_comm, prev_pid, next_comm, next_pid)
 
                 threads[prev_pid] = prev_comm
                 threads[next_pid] = next_comm