Merge: Subtyping test with perfect hashing in the Nit vm

[nit.git] / benchmarks / bench_languages.sh

diff --git a/benchmarks/bench_languages.sh b/benchmarks/bench_languages.sh
index b1e35b1..d9db525 100755 (executable)
--- a/benchmarks/bench_languages.sh
+++ b/benchmarks/bench_languages.sh
@@ -57,7 +57,7 @@ function bench_command()
 
        # Execute the commands $count times
        for i in `seq 1 "$count"`; do
-               (ulimit -t 60; /usr/bin/time -f "%U" -o "$timeout" -a "$@") > $outputopts 2>&1 || die "$1: failed"
+               (ulimit -t 300; /usr/bin/time -f "%U" -o "$timeout" -a "$@") > $outputopts 2>&1 || die "$1: failed"
                echo -n "$i. "
                tail -n 1 "$timeout"
        done
@@ -221,7 +221,7 @@ function bench_language()
        nitdir="${basedir}/nit"
        prepare_res $nitdir/$name-nitg.dat "nitg" "nitg"
        for b in $seq; do
-               run_command ./nitg $nitdir/${t}_$b.nit -o "$nitdir/${t}_$b.nitg.bin" --make-flags "CFLAGS=\"-g -O2 -DNOBOEHM\""
+               run_command ./nitg $nitdir/${t}_$b.nit --global -o "$nitdir/${t}_$b.nitg.bin" --make-flags "CFLAGS=\"-g -O2 -DNOBOEHM\""
                bench_command "$b" "" "$nitdir/${t}_$b.nitg.bin" $s
        done
 
@@ -232,27 +232,6 @@ function bench_language()
        done
 
 <<XXX
-       tg="nitg-s-bm"
-       prepare_res $nitdir/$name-$tg.dat "$tg" "$tg"
-       for b in $seq; do
-               run_command ./nitg $nitdir/${t}_$b.nit --separate --bm-typing -o "$nitdir/${t}_$b.$tg.bin" --make-flags "CFLAGS=\"-g -O2 -DNOBOEHM\""
-               bench_command "$b" "" "$nitdir/${t}_$b.$tg.bin" $s
-       done
-
-       tg="nitg-s-pha"
-       prepare_res $nitdir/$name-$tg.dat "$tg" "$tg"
-       for b in $seq; do
-               run_command ./nitg $nitdir/${t}_$b.nit --separate --phand-typing -o "$nitdir/${t}_$b.$tg.bin" --make-flags "CFLAGS=\"-g -O2 -DNOBOEHM\""
-               bench_command "$b" "" "$nitdir/${t}_$b.$tg.bin" $s
-       done
-
-       tg="nitg-s-phm"
-       prepare_res $nitdir/$name-$tg.dat "$tg" "$tg"
-       for b in $seq; do
-               run_command ./nitg $nitdir/${t}_$b.nit --separate --phmod-typing -o "$nitdir/${t}_$b.$tg.bin" --make-flags "CFLAGS=\"-g -O2 -DNOBOEHM\""
-               bench_command "$b" "" "$nitdir/${t}_$b.$tg.bin" $s
-       done
-
        prepare_res $nitdir/$name-nitg-su.dat "nitg-su" "nitg-su"
        for b in $seq; do
                run_command ./nitg $nitdir/${t}_$b.nit --separate --no-check-covariance -o "$nitdir/${t}_$b.nitg-su.bin" --make-flags "CFLAGS=\"-g -O2 -DNOBOEHM\""