From 88044340c1b7b8925e98bfa1195e147dca9dc8f8 Mon Sep 17 00:00:00 2001
From: Mark Callaghan <mdcallag@gmail.com>
Date: Sat, 2 May 2015 07:46:12 -0700
Subject: [PATCH] Add Size-GB column to benchmark reports

Summary:
See https://gist.github.com/mdcallag/b867ee051d765760be0d for a sample

Task ID: #

Blame Rev:

Test Plan:
Revert Plan:

Database Impact:

Memcache Impact:

Other Notes:

EImportant:

- begin *PUBLIC* platform impact section -
Bugzilla: #
- end platform impact -

Reviewers: igor

Reviewed By: igor

Subscribers: dhruba

Differential Revision: https://reviews.facebook.net/D37971
---
 tools/benchmark.sh       | 5 +++--
 tools/run_flash_bench.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/benchmark.sh b/tools/benchmark.sh
index 511817a11..68a327a2c 100755
--- a/tools/benchmark.sh
+++ b/tools/benchmark.sh
@@ -114,6 +114,7 @@ function summarize_result {
   mb_sec=$( grep ^${bench_name} $test_out | awk '{ print $7 }' )
   lo_wgb=$( grep "^  L0" $test_out | tail -1 | awk '{ print $8 }' )
   sum_wgb=$( grep "^ Sum" $test_out | tail -1 | awk '{ print $8 }' )
+  sum_size=$( grep "^ Sum" $test_out | tail -1 | awk '{ printf "%.1f", $3 / 1024.0 }' )
   wamp=$( echo "scale=1; $sum_wgb / $lo_wgb" | bc )
   wmb_ps=$( echo "scale=1; ( $sum_wgb * 1024.0 ) / $uptime" | bc )
   usecs_op=$( grep ^${bench_name} $test_out | awk '{ printf "%.1f", $3 }' )
@@ -122,7 +123,7 @@ function summarize_result {
   p99=$( grep "^Percentiles:" $test_out | awk '{ printf "%.0f", $7 }' )
   p999=$( grep "^Percentiles:" $test_out | awk '{ printf "%.0f", $9 }' )
   p9999=$( grep "^Percentiles:" $test_out | awk '{ printf "%.0f", $11 }' )
-  echo -e "$ops_sec\t$mb_sec\t$lo_wgb\t$sum_wgb\t$wamp\t$wmb_ps\t$usecs_op\t$p50\t$p75\t$p99\t$p999\t$p9999\t$uptime\t$stall_time\t$stall_pct\t$test_name" \
+  echo -e "$ops_sec\t$mb_sec\t$sum_size\t$lo_wgb\t$sum_wgb\t$wamp\t$wmb_ps\t$usecs_op\t$p50\t$p75\t$p99\t$p999\t$p9999\t$uptime\t$stall_time\t$stall_pct\t$test_name" \
     >> $output_dir/report.txt
 }
 
@@ -338,7 +339,7 @@ for job in ${jobs[@]}; do
     echo "Complete $job in $((end-start)) seconds" | tee -a $schedule
   fi
 
-  echo -e "ops/sec\tmb/sec\tL0_MB\tSum_GB\tW-Amp\tW-MB/s\tusec/op\tp50\tp75\tp99\tp99.9\tp99.99\tUptime\tStall-time\tStall%\tTest"
+  echo -e "ops/sec\tmb/sec\tSize-GB\tL0_MB\tSum_GB\tW-Amp\tW-MB/s\tusec/op\tp50\tp75\tp99\tp99.9\tp99.99\tUptime\tStall-time\tStall%\tTest"
   tail -1 $output_dir/report.txt
 
 done
diff --git a/tools/run_flash_bench.sh b/tools/run_flash_bench.sh
index 558a0fcfa..0b35ed34e 100755
--- a/tools/run_flash_bench.sh
+++ b/tools/run_flash_bench.sh
@@ -94,7 +94,7 @@ BLOCK_SIZE=$bs \
 CACHE_SIZE=$cs"
 
 mkdir -p $output_dir
-echo -e "ops/sec\tmb/sec\tL0_GB\tSum_GB\tW-Amp\tW-MB/s\tusec/op\tp50\tp75\tp99\tp99.9\tp99.99\tUptime\tStall-time\tStall%\tTest" \
+echo -e "ops/sec\tmb/sec\tSize-GB\tL0_GB\tSum_GB\tW-Amp\tW-MB/s\tusec/op\tp50\tp75\tp99\tp99.9\tp99.99\tUptime\tStall-time\tStall%\tTest" \
   > $output_dir/report.txt
 
 # Notes on test sequence: