X-Git-Url: http://nitlanguage.org

diff --git a/benchmarks/bench_engines.sh b/benchmarks/bench_engines.sh
index 1fe51d0..a021553 100755
--- a/benchmarks/bench_engines.sh
+++ b/benchmarks/bench_engines.sh
@@ -176,8 +176,8 @@ fi
 
 ## COMPILE ENGINES
 
-test -f ../src/nitc_3 || ../src/ncall.sh -O
-test -f ./nitg || ../src/nitc_3 ../src/nitg.nit -O -v
+# force to use the last nitg, not the bootstraped one
+test -f ./nitg || ../bin/nitg ../src/nitg.nit -v
 
 ## EFFECTIVE BENCHS ##
 
@@ -225,13 +225,14 @@ function bench_nitg-g_options()
 	fi
 
 	for opt in "$@"; do
-		prepare_res "$name$opt.dat" "$opt" "nitg-g with option $opt"
-		run_compiler "nitg-g$opt" ./nitg --global $opt
+		ot=${opt// /+}
+		prepare_res "$name$ot.dat" "$opt" "nitg-g with option $opt"
+		run_compiler "nitg-g$ot" ./nitg --global $opt
 	done
 
 	plot "$name.gnu"
 }
-bench_nitg-g_options "hardening" --hardening
+bench_nitg-g_options "slower" --hardening
 bench_nitg-g_options "nocheck" --no-check-covariance --no-check-initialization --no-check-assert --no-check-autocast --no-check-other
 
 function bench_nitg-s_options()
@@ -251,13 +252,14 @@ function bench_nitg-s_options()
 	fi
 
 	for opt in "$@"; do
-		prepare_res "$name$opt.dat" "$opt" "nitg-s with option $opt"
-		run_compiler "nitg-s$opt" ./nitg --separate $opt
+		ot=${opt// /+}
+		prepare_res "$name-$ot.dat" "$opt" "nitg-s with option $opt"
+		run_compiler "nitg-s$ot" ./nitg --separate $opt
 	done
 
 	plot "$name.gnu"
 }
-bench_nitg-s_options "slower" --hardening --no-inline-intern --no-union-attribute --no-shortcut-equal --no-shortcut-range
+bench_nitg-s_options "slower" --hardening --no-inline-intern --no-union-attribute --no-shortcut-equal --no-shortcut-range "--no-gcc-directive likely" "--no-gcc-directive noreturn"
 bench_nitg-s_options "nocheck" --no-check-covariance --no-check-initialization --no-check-assert --no-check-autocast --no-check-other
 bench_nitg-s_options "faster" --inline-coloring-numbers
 bench_nitg-s_options "typing" NOALL --bm-typing --phand-typing
@@ -279,8 +281,9 @@ function bench_nitg-e_options()
 	fi
 
 	for opt in "$@"; do
-		prepare_res "$name$opt.dat" "$opt" "nitg-e with option $opt"
-		run_compiler "nitg-e$opt" ./nitg --erasure $opt
+		ot=${opt// /+}
+		prepare_res "$name$ot.dat" "$opt" "nitg-e with option $opt"
+		run_compiler "nitg-e$ot" ./nitg --erasure $opt
 	done
 
 	plot "$name.gnu"
@@ -350,15 +353,11 @@ function bench_compilation_time
 {
 	name="$FUNCNAME"
 	skip_test "$name" && return
-	prepare_res "$name-nitc.dat" "nitc" "nitc"
-	for i in ../examples/hello_world.nit ../src/test_parser.nit ../src/nitg.nit; do
-		bench_command `basename "$i" .nit` "" ../src/nitc_3 -O "$i" --no-cc
-	done
-	prepare_res "$name-nitg.dat" "nitg-g" "nitg --global"
+	prepare_res "$name-nitg-g.dat" "nitg-g" "nitg --global"
 	for i in ../examples/hello_world.nit ../src/test_parser.nit ../src/nitg.nit; do
 		bench_command `basename "$i" .nit` "" ./nitg --global "$i" --no-cc
 	done
-	prepare_res "$name-nitg-e.dat" "nitg-e" "nitg --separate"
+	prepare_res "$name-nitg-s.dat" "nitg-s" "nitg --separate"
 	for i in ../examples/hello_world.nit ../src/test_parser.nit ../src/nitg.nit; do
 		bench_command `basename "$i" .nit` "" ./nitg --separate "$i" --no-cc
 	done