Fix merge error

pull/10336/head
Craig Tiller 8 years ago
parent 03bab0af2e
commit c78c9158c0
  1. 6
      tools/profiling/microbenchmarks/bm_json.py

@ -177,8 +177,6 @@ def parse_name(name):
out.update(dict(zip(_BM_SPECS[name]['tpl'], tpl_args)))
return out
used_poison = {}
def expand_json(js, js2 = None):
for bm in js['benchmarks']:
if bm['name'].endswith('_stddev') or bm['name'].endswith('_mean'): continue
@ -200,9 +198,9 @@ def expand_json(js, js2 = None):
row.update(labels)
if js2:
for bm2 in js2['benchmarks']:
if bm['name'] == bm2['name'] and used_poison not in bm2:
if bm['name'] == bm2['name'] and 'already_used' not in bm2:
row['cpu_time'] = bm2['cpu_time']
row['real_time'] = bm2['real_time']
row['iterations'] = bm2['iterations']
bm2[used_poison] = True
bm2['already_used'] = True
yield row

Loading…
Cancel
Save