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
Showing the changes to tools/perf/scripts/python (1 of 1 file). Show all
Unified · Split
| @@ -1,5 +1,7 @@ | ||
| 1 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | 2 | |
| 3 | +from __future__ import print_function | |
| 4 | + | |
| 3 | 5 | data = {} |
| 4 | 6 | times = [] |
| 5 | 7 | threads = [] |
| @@ -19,8 +21,8 @@ def store_key(time, cpu, thread): · 13 unmodified lines | ||
| 19 | 21 | threads.append(thread) |
| 20 | 22 | |
| 21 | 23 | def store(time, event, cpu, thread, val, ena, run): |
| 22 | − #print "event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" % \ | |
| 23 | − # (event, cpu, thread, time, val, ena, run) | |
| 24 | + #print("event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" % | |
| 25 | + # (event, cpu, thread, time, val, ena, run)) | |
| 24 | 26 | |
| 25 | 27 | store_key(time, cpu, thread) |
| 26 | 28 | key = get_key(time, event, cpu, thread) |
| @@ -58,7 +60,7 @@ def stat__interval(time): · 31 unmodified lines | ||
| 58 | 60 | if ins != 0: |
| 59 | 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 | |
| 63 | 65 | def trace_end(): |
| 64 | 66 | pass |
| @@ -74,4 +76,4 @@ def trace_end(): · 9 unmodified lines | ||
| 74 | 76 | # if ins != 0: |
| 75 | 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)) | |