Bug 1691134 - Part 2: Make parsemark.py Python3-compatible. r=nbp

Differential Revision: https://phabricator.services.mozilla.com/D104434
This commit is contained in:
Tooru Fujisawa 2021-02-09 23:02:59 +00:00
parent 94e08cc460
commit 3960ec0dfe

View File

@ -78,7 +78,7 @@ def bench(shellpath, filepath, warmup_runs, counted_runs, stfu=False):
)
proc = subp.Popen([shellpath, "-e", code], stdout=subp.PIPE)
stdout, _ = proc.communicate()
milliseconds = [float(val) for val in stdout.split(",")]
milliseconds = [float(val) for val in stdout.decode().split(",")]
mean = avg(milliseconds)
sigma = stddev(milliseconds, mean)
if not stfu:
@ -97,7 +97,7 @@ def parsemark(filepaths, fbench, stfu=False):
print("Parsemarking {}...".format(filename))
bench_map[filename] = fbench(filepath)
print("{")
for i, (filename, (avg, stddev)) in enumerate(bench_map.iteritems()):
for i, (filename, (avg, stddev)) in enumerate(iter(bench_map.items())):
assert '"' not in filename
fmt = ' {:30s}: {{"average_ms": {:6.2f}, "stddev_ms": {:6.2f}}}'
if i != len(bench_map) - 1:
@ -107,7 +107,7 @@ def parsemark(filepaths, fbench, stfu=False):
print("}")
return dict(
(filename, dict(average_ms=avg, stddev_ms=stddev))
for filename, (avg, stddev) in bench_map.iteritems()
for filename, (avg, stddev) in iter(bench_map.items())
)