diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-30 13:29:02 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-30 13:29:02 -0700 |
| commit | c78c9158c085245f9fee3b8307fa7434ea2fdd7f (patch) | |
| tree | 02a1f1d94f6e2b4cd0d6710410cb37c55eee0bf6 | |
| parent | 03bab0af2ebdd0e690e2362d8d2c4d06d58f9629 (diff) | |
Fix merge error
| -rw-r--r-- | tools/profiling/microbenchmarks/bm_json.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/profiling/microbenchmarks/bm_json.py b/tools/profiling/microbenchmarks/bm_json.py index cd39d707a6..e885444f41 100644 --- a/tools/profiling/microbenchmarks/bm_json.py +++ b/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 |