X-Git-Url: http://nitlanguage.org
diff --git a/benchmarks/bench_engines.sh b/benchmarks/bench_engines.sh
index 1fe51d0..385d033 100755
--- a/benchmarks/bench_engines.sh
+++ b/benchmarks/bench_engines.sh
@@ -17,6 +17,7 @@
# TODO: cleanup and libify the helper-parts
+source ./bench_common.sh
source ./bench_plot.sh
## CONFIGURATION OPTIONS ##
@@ -25,8 +26,6 @@ source ./bench_plot.sh
# Can be overrided with 'the option -n'
count=2
-pep8analysis=../../pep8analysis
-
### HELPER FUNCTIONS ##
function die()
@@ -35,76 +34,6 @@ function die()
died=1
}
-# Run a single command multiple time and store the execution times
-# in the current $res file.
-#
-# $1: title of the command
-# $2: long desription of the command
-# rest: the command to execute
-function bench_command()
-{
- if [ "$dry_run" = "true" ]; then return; fi
- local title="$1"
- local desc="$2"
- shift
- shift
- if test "$verbose" = true; then outputopts="/dev/stdout"; else outputopts="/dev/null"; fi
- timeout="time.out"
- echo "$title" > "$timeout"
- echo "# $desc" >> "$timeout"
- echo "\$ $@" >> "$timeout"
- echo
- echo "** [$title] $desc **"
- echo " $ $@"
-
- # Execute the commands $count times
- for i in `seq 1 "$count"`; do
- /usr/bin/time -f "%U" -o "$timeout" -a "$@" > $outputopts 2>&1 || die "$1: failed"
- echo -n "$i. "
- tail -n 1 "$timeout"
- done
-
- line=`compute_stats "$timeout"`
- echo "$line ($res)"
- echo $line >> "$res"
-}
-
-# Run a simble command witout storing the execution time
-# Used to display command on verbose and skip long executions when dry_run is given
-# $@ command to execute
-function run_command()
-{
- if [ "$dry_run" = "true" ]; then return; fi
- echo " $ $@"
- "$@" || die "$@: failed"
-}
-
-# Check if the test should be skiped according to its name
-# $1: name of the test
-# $2: description of the test
-# $NOTSKIPED: arguments
-function skip_test()
-{
- if test -z "$NOTSKIPED"; then
- echo "* $1"
- return 0
- fi
- if test "$NOTSKIPED" = "all"; then
- : # Execute anyway
- elif echo "$1" | egrep "$NOTSKIPED" >/dev/null 2>&1; then
- : # Found one to execute
- else
- return 0
- fi
- if test -n "$html"; then
- echo >>"$html" "
$1
"
- fi
- echo "*"
- echo "* $1 *****"
- echo "*"
- return 1
-}
-
# HELPER FOR NIT #
# Run standards benchs on a compiler command
@@ -125,19 +54,27 @@ function run_compiler()
bench_command "bintrees" "bench_bintree_gen 16" "./bintrees.$title.bin" 16
else
run_command "$@" ../src/nitg.nit -o "nitg.$title.bin"
- bench_command "nitg-g" "nitg --global --no-cc ../src/nitmetrics.nit" "./nitg.$title.bin" -v --global --no-cc ../src/nitmetrics.nit
+ bench_command "nitg-g" "nitg --global --no-cc ../src/nitls.nit" "./nitg.$title.bin" -v --global --no-cc ../src/nitls.nit
bench_command "nitg-s" "nitg --separate ../src/nitg.nit" "./nitg.$title.bin" -v --no-cc --separate ../src/nitg.nit
run_command "$@" ../src/nit.nit -o "nit.$title.bin"
- bench_command "nit" "nit ../src/test_parser.nit ../src/rapid_type_analysis.nit" "./nit.$title.bin" -v ../src/test_parser.nit -- -n ../src/rapid_type_analysis.nit
+ bench_command "nit" "nit ../src/test_parser.nit ../src/nitls.nit" "./nit.$title.bin" -v ../src/test_parser.nit -- -n ../src/nitls.nit
+ run_command "$@" ../src/nitdoc.nit -o "nitdoc.$title.bin"
+ rm -r out 2> /dev/null
+ mkdir out 2> /dev/null
+ bench_command "nitdoc" "nitdoc ../src/nitls.nit" "./nitdoc.$title.bin" -v ../src/nitls.nit -d out
run_command "$@" ../examples/shoot/src/shoot_logic.nit -o "shoot.$title.bin"
- bench_command "shoot" "shoot_logic 30" "./shoot.$title.bin" 30
+ bench_command "shoot" "shoot_logic 15" "./shoot.$title.bin" 15
run_command "$@" ../tests/bench_bintree_gen.nit -o "bintrees.$title.bin"
- bench_command "bintrees" "bench_bintree_gen 18" "./bintrees.$title.bin" 18
- if test -f "$pep8analysis/src/pep8analysis.nit"; then
- run_command "$@" "$pep8analysis/src/pep8analysis.nit" -I "$pep8analysis/lib" -o "pep8a.$title.bin"
- bench_command "pep8analisis" "bench_bintree_gen 18" "./pep8a.$title.bin" "$pep8analysis/tests/privat/"*.pep
- fi
+ bench_command "bintrees" "bench_bintree_gen 17" "./bintrees.$title.bin" 17
+ #run_command "$@" "../contrib/pep8analysis/src/pep8analysis.nit" -o "pep8a.$title.bin"
+ #bench_command "pep8analisis" "bench_pep8analisis" "./pep8a.$title.bin" "../contrib/pep8analysis/tests/privat/"*.pep
+ run_command "$@" "../lib/ai/examples/queens.nit" -o "queens.$title.bin"
+ bench_command "queens" "bench_queens 13" "./queens.$title.bin" 13
+ run_command "$@" "../lib/ai/examples/puzzle.nit" -o "puzzle.$title.bin"
+ bench_command "puzzle" "puzzle 15-hard" "./puzzle.$title.bin" kleg.mondcafjhbi
fi
+
+ rm -r *.bin .nit_compile out
}
## HANDLE OPTIONS ##
@@ -166,6 +103,9 @@ while [ "$stop" = false ]; do
esac
done
+xml="bench_engines.xml"
+echo "" > "$xml"
+
NOTSKIPED="$*"
if test -z "$NOTSKIPED"; then
@@ -176,8 +116,8 @@ fi
## COMPILE ENGINES
-test -f ../src/nitc_3 || ../src/ncall.sh -O
-test -f ./nitg || ../src/nitc_3 ../src/nitg.nit -O -v
+# get the bootstrapped nitg
+cp ../bin/nitg .
## EFFECTIVE BENCHS ##
@@ -225,14 +165,15 @@ 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 "nocheck" --no-check-covariance --no-check-initialization --no-check-assert --no-check-autocast --no-check-other
+bench_nitg-g_options "slower" --hardening --no-shortcut-range
+bench_nitg-g_options "nocheck" --no-check-null --no-check-autocast --no-check-attr-isset --no-check-covariance --no-check-assert
function bench_nitg-s_options()
{
@@ -251,16 +192,16 @@ 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 "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
+bench_nitg-s_options "slower" --hardening --no-shortcut-equal --no-union-attribute --no-shortcut-range --no-inline-intern "--no-gcc-directive likely --no-gcc-directive noreturn"
+bench_nitg-s_options "nocheck" --no-check-null --no-check-autocast --no-check-attr-isset --no-check-covariance --no-check-assert
+bench_nitg-s_options "faster" --skip-dead-methods --inline-coloring-numbers --inline-some-methods --direct-call-monomorph "--inline-some-methods --direct-call-monomorph" ""
function bench_nitg-e_options()
{
@@ -279,27 +220,33 @@ 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"
}
-bench_nitg-e_options "slower" --hardening --no-inline-intern --no-union-attribute --no-shortcut-equal --no-shortcut-range
-bench_nitg-e_options "nocheck" --no-check-covariance --no-check-initialization --no-check-assert --no-check-autocast --no-check-other --no-check-erasure-cast
-bench_nitg-e_options "faster" --inline-coloring-numbers
-bench_nitg-e_options "typing" NOALL --bm-typing # --phand-typing
+bench_nitg-e_options "slower" --hardening --no-shortcut-equal --no-union-attribute --no-shortcut-range --no-inline-intern
+bench_nitg-e_options "nocheck" --no-check-null --no-check-autocast --no-check-attr-isset --no-check-covariance --no-check-assert --no-check-erasure-cast
+bench_nitg-e_options "faster" --skip-dead-methods --inline-coloring-numbers --inline-some-methods --direct-call-monomorph --rta
function bench_engines()
{
name="$FUNCNAME"
skip_test "$name" && return
- prepare_res "$name-nitg-g.dat" "nitg-g" "nitg with --global"
- run_compiler "nitg-g" ./nitg --global
prepare_res "$name-nitg-s.dat" "nitg-s" "nitg with --separate"
run_compiler "nitg-s" ./nitg --separate
prepare_res "$name-nitg-e.dat" "nitg-e" "nitg with --erasure"
run_compiler "nitg-e" ./nitg --erasure
+ prepare_res "$name-nitg-sg.dat" "nitg-sg" "nitg with --separate --semi-global"
+ run_compiler "nitg-sg" ./nitg --separate --semi-global
+ prepare_res "$name-nitg-eg.dat" "nitg-eg" "nitg with --erasure --semi-global"
+ run_compiler "nitg-eg" ./nitg --erasure --semi-global
+ prepare_res "$name-nitg-egt.dat" "nitg-egt" "nitg with --erasure --semi-global --rta"
+ run_compiler "nitg-egt" ./nitg --erasure --semi-global --rta
+ prepare_res "$name-nitg-g.dat" "nitg-g" "nitg with --global"
+ run_compiler "nitg-g" ./nitg --global
plot "$name.gnu"
}
bench_engines
@@ -308,10 +255,12 @@ function bench_nitg-e_gc()
{
name="$FUNCNAME"
skip_test "$name" && return
- prepare_res "$name-nitg-e-malloc.dat" "nitg-e-malloc" "nitg with --erasure and malloc"
- NIT_GC_OPTION="malloc" run_compiler "nitg-e-malloc" ./nitg --erasure
prepare_res "$name-nitg-e.dat" "nitg-e" "nitg with --erasure"
run_compiler "nitg-e" ./nitg --erasure
+ prepare_res "$name-nitg-e-malloc.dat" "nitg-e-malloc" "nitg with --erasure and malloc"
+ NIT_GC_OPTION="malloc" run_compiler "nitg-e-malloc" ./nitg --erasure
+ prepare_res "$name-nitg-e-large.dat" "nitg-e-large" "nitg with --erasure and large"
+ NIT_GC_OPTION="large" run_compiler "nitg-e-large" ./nitg --erasure
plot "$name.gnu"
}
bench_nitg-e_gc
@@ -346,19 +295,31 @@ function bench_policy()
}
bench_policy
+function bench_nullables()
+{
+ name="$FUNCNAME"
+ skip_test "$name" && return
+ prepare_res "$name-nitc.dat" "nitc" "nitc no options"
+ run_compiler "nitc" ./nitg --separate
+ prepare_res "$name-nitc-ni.dat" "nitc-ni" "nitc --no-check-attr-isset"
+ run_compiler "nitc" ./nitg --separate --no-check-attr-isset
+ prepare_res "$name-nitc-nu.dat" "nitc-nu" "nitc --no-union-attribute"
+ run_compiler "nitc" ./nitg --separate --no-union-attribute
+ prepare_res "$name-nitc-nu-ni.dat" "nitc-nu-ni" "nitc --no-union-attribute --no-check-attr-isset"
+ run_compiler "nitc" ./nitg --separate --no-union-attribute --no-check-attr-isset
+ plot "$name.gnu"
+}
+bench_nullables
+
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
@@ -374,6 +335,8 @@ if test -n "$html"; then
echo >>"$html" "