diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-30 13:24:59 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-30 13:24:59 -0700 |
| commit | 03bab0af2ebdd0e690e2362d8d2c4d06d58f9629 (patch) | |
| tree | 4825056761100d3cec76b2a587fe7922745cf929 /tools | |
| parent | d2461e522a32d4fb97efa39b48a18a67603527c7 (diff) | |
Fix merge error
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/profiling/microbenchmarks/bm_json.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/profiling/microbenchmarks/bm_json.py b/tools/profiling/microbenchmarks/bm_json.py index 1a618a690d..cd39d707a6 100644 --- a/tools/profiling/microbenchmarks/bm_json.py +++ b/tools/profiling/microbenchmarks/bm_json.py @@ -177,6 +177,8 @@ 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 @@ -198,8 +200,9 @@ def expand_json(js, js2 = None): row.update(labels) if js2: for bm2 in js2['benchmarks']: - if bm['name'] == bm2['name']: + if bm['name'] == bm2['name'] and used_poison not in bm2: row['cpu_time'] = bm2['cpu_time'] row['real_time'] = bm2['real_time'] row['iterations'] = bm2['iterations'] + bm2[used_poison] = True yield row |