History

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

Tony Jones committed 7 years ago

Commit e985bf71 parent 6d22d991 file · +6 −4Browse files

Unified · Split

tools/perf/scripts/python/stat-cpi.py+6−4
@@ -1,5 +1,7 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2 2
3from __future__ import print_function
4
3data = {}5data = {}
4times = []6times = []
5threads = []7threads = []
@@ -19,8 +21,8 @@ def store_key(time, cpu, thread): · 13 unmodified lines
19 threads.append(thread)21 threads.append(thread)
20 22
21def store(time, event, cpu, thread, val, ena, run):23def store(time, event, cpu, thread, val, ena, run):
22 #print "event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" % \24 #print("event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" %
23 # (event, cpu, thread, time, val, ena, run)25 # (event, cpu, thread, time, val, ena, run))
24 26
25 store_key(time, cpu, thread)27 store_key(time, cpu, thread)
26 key = get_key(time, event, cpu, thread)28 key = get_key(time, event, cpu, thread)
@@ -58,7 +60,7 @@ def stat__interval(time): · 31 unmodified lines
58 if ins != 0:60 if ins != 0:
59 cpi = cyc/float(ins)61 cpi = cyc/float(ins)
60 62
61 print "%15f: cpu %d, thread %d -> cpi %f (%d/%d)" % (time/(float(1000000000)), cpu, thread, cpi, cyc, ins)63 print("%15f: cpu %d, thread %d -> cpi %f (%d/%d)" % (time/(float(1000000000)), cpu, thread, cpi, cyc, ins))
62 64
63def trace_end():65def trace_end():
64 pass66 pass
@@ -74,4 +76,4 @@ def trace_end(): · 9 unmodified lines
74# if ins != 0:76# if ins != 0:
75# cpi = cyc/float(ins)77# cpi = cyc/float(ins)
76#78#
77# print "time %.9f, cpu %d, thread %d -> cpi %f" % (time/(float(1000000000)), cpu, thread, cpi)79# print("time %.9f, cpu %d, thread %d -> cpi %f" % (time/(float(1000000000)), cpu, thread, cpi))