Commit e985bf76 authored by Tony Jones's avatar Tony Jones Committed by Arnaldo Carvalho de Melo

perf script python: Add Python3 support to stat-cpi.py

Support both Python2 and Python3 in the stat-cpi.py script

There may be differences in the ordering of output lines due to
differences in dictionary ordering etc.  However the format within lines
should be unchanged.

The use of 'from __future__' implies the minimum supported Python2 version
is now v2.6
Signed-off-by: default avatarSeeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20190222230619.17887-13-tonyj@suse.deSigned-off-by: default avatarTony Jones <tonyj@suse.de>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6d22d999
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
from __future__ import print_function
data = {} data = {}
times = [] times = []
threads = [] threads = []
...@@ -19,8 +21,8 @@ def store_key(time, cpu, thread): ...@@ -19,8 +21,8 @@ def store_key(time, cpu, thread):
threads.append(thread) threads.append(thread)
def store(time, event, cpu, thread, val, ena, run): def store(time, event, cpu, thread, val, ena, run):
#print "event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" % \ #print("event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" %
# (event, cpu, thread, time, val, ena, run) # (event, cpu, thread, time, val, ena, run))
store_key(time, cpu, thread) store_key(time, cpu, thread)
key = get_key(time, event, cpu, thread) key = get_key(time, event, cpu, thread)
...@@ -58,7 +60,7 @@ def stat__interval(time): ...@@ -58,7 +60,7 @@ def stat__interval(time):
if ins != 0: if ins != 0:
cpi = cyc/float(ins) cpi = cyc/float(ins)
print "%15f: cpu %d, thread %d -> cpi %f (%d/%d)" % (time/(float(1000000000)), cpu, thread, cpi, cyc, ins) print("%15f: cpu %d, thread %d -> cpi %f (%d/%d)" % (time/(float(1000000000)), cpu, thread, cpi, cyc, ins))
def trace_end(): def trace_end():
pass pass
...@@ -74,4 +76,4 @@ def trace_end(): ...@@ -74,4 +76,4 @@ def trace_end():
# if ins != 0: # if ins != 0:
# cpi = cyc/float(ins) # cpi = cyc/float(ins)
# #
# print "time %.9f, cpu %d, thread %d -> cpi %f" % (time/(float(1000000000)), cpu, thread, cpi) # print("time %.9f, cpu %d, thread %d -> cpi %f" % (time/(float(1000000000)), cpu, thread, cpi))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment