From eb24a7bd847409091893e0f75f97fecaff99ebcf Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 7 Mar 2017 17:04:46 -0800
Subject: [PATCH] Use new diff script
---
tools/profiling/microbenchmarks/bm_diff.py | 0
tools/run_tests/run_microbenchmark.py | 18 +++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
create mode 100644 tools/profiling/microbenchmarks/bm_diff.py
diff --git a/tools/profiling/microbenchmarks/bm_diff.py b/tools/profiling/microbenchmarks/bm_diff.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/run_tests/run_microbenchmark.py b/tools/run_tests/run_microbenchmark.py
index 3a9461ecd3..0b5fc5ec46 100755
--- a/tools/run_tests/run_microbenchmark.py
+++ b/tools/run_tests/run_microbenchmark.py
@@ -228,8 +228,10 @@ for bm_name in args.benchmarks:
for collect in args.collect:
collectors[collect](bm_name, args)
if args.diff_perf:
- for bm_name in args.benchmarks:
- run_summary(bm_name, 'opt', '%s.new' % bm_name)
+ if 'summary' not in args.collect:
+ for bm_name in args.benchmarks:
+ run_summary(bm_name, 'opt', bm_name)
+ run_summary(bm_name, 'counters', bm_name)
where_am_i = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip()
subprocess.check_call(['git', 'checkout', args.diff_perf])
comparables = []
@@ -238,15 +240,21 @@ if args.diff_perf:
for bm_name in args.benchmarks:
try:
run_summary(bm_name, 'opt', '%s.old' % bm_name)
+ run_summary(bm_name, 'counters', '%s.old' % bm_name)
comparables.append(bm_name)
except subprocess.CalledProcessError, e:
pass
finally:
subprocess.check_call(['git', 'checkout', where_am_i])
for bm_name in comparables:
- subprocess.check_call(['third_party/benchmark/tools/compare_bench.py',
- '%s.new.opt.json' % bm_name,
- '%s.old.opt.json' % bm_name])
+ diff = subprocess.check_output(['tools/profiling/microbenchmarks/bm_diff.py',
+ '%s.opt.json' % bm_name,
+ '%s.counters.json' % bm_name,
+ '%s.old.opt.json' % bm_name,
+ '%s.old.counters.json' % bm_name]).strip()
+ if diff:
+ heading('Performance diff: %s' % bm_name)
+ text(diff)
index_html += "</body>\n</html>\n"
with open('reports/index.html', 'w') as f:
--
GitLab