From e9575f968c07a8ffb482aca029d9525dfc167f6e Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Fri, 7 Dec 2012 17:18:04 -0500
Subject: [PATCH] bench: split and specialize "options" benchs

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/run_bench.sh |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/run_bench.sh b/src/run_bench.sh
index c35ab79..9381f89 100755
--- a/src/run_bench.sh
+++ b/src/run_bench.sh
@@ -294,11 +294,18 @@ bench_steps
 # $#: options to compare
 function bench_nitg_options()
 {
-	name="$FUNCNAME"
+	tag=$1
+	shift
+	name="$FUNCNAME-$tag"
 	skip_test "$name" && return
 	prepare_res "$name.dat" "no options" "nitg without options"
 	run_compiler "nitg" ./nitg
 
+	if test -n "$2"; then
+		prepare_res "$name-all.dat" "all" "nitg with all options $@"
+		run_compiler "nitg-$tag" ./nitg $@
+	fi
+
 	for opt in "$@"; do
 		prepare_res "$name$opt.dat" "$opt" "nitg with option $opt"
 		run_compiler "nitg$opt" ./nitg $opt
@@ -306,15 +313,23 @@ function bench_nitg_options()
 
 	plot "$name.gnu"
 }
-bench_nitg_options --hardening --no-check-covariance --no-check-initialization --no-check-assert --no-check-autocast --no-check-other
+bench_nitg_options "hardening" --hardening
+bench_nitg_options "nocheck" --no-check-covariance --no-check-initialization --no-check-assert --no-check-autocast --no-check-other
 
 function bench_nitg-e_options()
 {
-	name="$FUNCNAME"
+	tag=$1
+	shift
+	name="$FUNCNAME-$tag"
 	skip_test "$name" && return
 	prepare_res "$name.dat" "no options" "nitg-e without options"
 	run_compiler "nitg-e" ./nitg --erasure
 
+	if test -n "$2"; then
+		prepare_res "$name-all.dat" "all" "nitg-e with all options $@"
+		run_compiler "nitg-e-$tag" ./nitg --erasure $@
+	fi
+
 	for opt in "$@"; do
 		prepare_res "$name$opt.dat" "$opt" "nitg-e with option $opt"
 		run_compiler "nitg-e$opt" ./nitg --erasure $opt
@@ -322,7 +337,8 @@ function bench_nitg-e_options()
 
 	plot "$name.gnu"
 }
-bench_nitg-e_options --hardening --no-inline-intern --no-check-covariance --no-check-initialization --no-check-assert --no-check-other
+bench_nitg-e_options "hardening" --hardening
+bench_nitg-e_options "nocheck" --no-inline-intern --no-check-covariance --no-check-initialization --no-check-assert --no-check-other
 
 function bench_nitc_gc()
 {
-- 
1.7.9.5