Add readnb-noirq test + make bench-all.sh faster

diff --git a/rootfs/build/prepare_boot b/rootfs/build/prepare_boot
index 59dc00011a13935d63ed173158e56510e6c1e03d..14270a484bba8c0c3da996c1187968f5f9147755 100755 (executable)
--- a/rootfs/build/prepare_boot
+++ b/rootfs/build/prepare_boot
@@ -1,3 +1,4 @@
 #!/bin/sh
 set -x
+cp $1/rootfs.cpio ../../boot/images/
 mkimage -T ramdisk -A powerpc -O linux -d $1/rootfs.cpio ../../boot/images/rootfs.uImage

diff --git a/ugw/data/bench-all.sh b/ugw/data/bench-all.sh
index 4ead5e6f79575a3784cfb07d8131944d310ef52e..266fea798095c9e2d82baed03dd96220e18c1156 100755 (executable)
--- a/ugw/data/bench-all.sh
+++ b/ugw/data/bench-all.sh
@@ -12,11 +12,18 @@ while [ "${1#-}" != "$1" ]; do
     case "$1" in
        -o)
            args=--oneattime
-           dir=oneatatime
+           dirs=oneatatime
            ;;
        -ftrace)
            args=--oneattime
-           dir=oneatatime.ftrace
+           dirs=oneatatime.ftrace
+           ;;
+       -p)
+           dirs=($(seq 126 2 170))
+           declare -a args
+           for i in ${!dirs[*]}; do
+               args[$i]=-p${dirs[$i]}
+           done
            ;;
        -p*)
            args=$1
@@ -26,15 +33,16 @@ while [ "${1#-}" != "$1" ]; do
     shift
 done
 
-methods=${@:-rtems kernel read-write readnb-write mmap-write mmap-mmap mmapbusy-write mmapbusy-mmap readbusy-write}
+methods=${@:-rtems kernel read-write readnb-write readnb-noirq mmap-write mmap-mmap mmapbusy-write mmapbusy-mmap readbusy-write}
 
+set -x
 for method in $methods; do
-    set -x
     case $method in
        rtems) ../../rtems/gw/boot --expect-raw '"]", sub { shift->send_slow(0.1, "startGW\n"); }' --exiton 'tasks started';;
        kernel)         ../ppc/boot -a kernelgw --exiton "Kernel GW started";;
        read-write)     ../ppc/boot             --exiton "UGW started";;
        readnb-write)   ../ppc/boot -a "ugw=|-n|" --exiton "UGW started";;
+       readnb-noirq)   ../ppc/boot -a "ugw=|-n|" --kernel uImage.noirq --exiton "UGW started";;
        mmap-write)     ../ppc/boot -a "ugw=|-r mmap|" --exiton "UGW started";;
        mmap-mmap)      ../ppc/boot -a "ugw=|-r mmap -t mmap|" --exiton "UGW started";;
        mmapbusy-write) ../ppc/boot -a "ugw=|-r mmapbusy|" --exiton "UGW started";;
@@ -44,10 +52,22 @@ for method in $methods; do
            echo >&2 "Unknown method '$method'";
            exit 1;
     esac
-    ssh glab "latester -d can0 -d can1 -d can2 -c 10000 -q -n $method $args"
-    mkdir -p $dir
-    scp glab:"$method-*.txt" $dir
-    (cd $dir && ln -sf ../Makefile ../plot.gp ../preprocess.m .)
     set +x
+    for i in ${!dirs[*]}; do
+       arg=${args[$i]}
+       dir=${dirs[$i]}
+       set -x
+       ssh glab "latester -d can0 -d can1 -d can2 -c 10000 -q -n $method $arg"
+       mkdir -p $dir
+       scp glab:"$method-*.txt" $dir
+       (cd $dir && ln -sf ../Makefile ../plot.gp ../preprocess.m .)
+       set -x
+    done
     sleep 2 # Wait for cu at glab to die
 done
+
+if [ ${#dirs[*]} -gt 1 ]; then
+    for d in ${dirs[@]}; do
+       make -C $d
+    done
+fi

diff --git a/ugw/data/preprocess.m b/ugw/data/preprocess.m
index bd6f7684626dcff0c5fbdebab5c165cf29d6364e..08246247f19afbaa19d8f6170fede55a77e19257 100755 (executable)
--- a/ugw/data/preprocess.m
+++ b/ugw/data/preprocess.m
@@ -8,6 +8,7 @@ datafiles = {
             "mmapbusy-mmap.dat"
             "mmapbusy-write.dat"
             "readnb-write.dat"
+            "readnb-noirq.dat"
             "readbusy-write.dat"
             "read-write.dat"
             "mmap-write.dat"

diff --git a/ugw/data/throughput-dep.sh b/ugw/data/throughput-dep.sh
index ee13f8f0f9f011a2c9bc8a58a4f2c1bee6baf42f..57c839151a5856f92a700def96587b0156e16558 100755 (executable)
--- a/ugw/data/throughput-dep.sh
+++ b/ugw/data/throughput-dep.sh
@@ -2,10 +2,15 @@
 
 
 titles=$(awk '{print $1}' 150/result)
+delays=$(seq 126 2 170)
+
+for i in $delays; do
+    make -s -C $i
+done
 
 for t in $titles; do
     exec > $t.dat
-    for i in $(seq 125 5 170); do
+    for i in $delays; do
        echo "$i $(awk "/$t/ { print \$3, \$6 }" $i/result)"
     done
 done

diff --git a/ugw/ppc/uImage.noirq b/ugw/ppc/uImage.noirq
new file mode 120000 (symlink)
index 0000000..71964a6
--- /dev/null
+++ b/ugw/ppc/uImage.noirq
@@ -0,0 +1 @@
+../../boot/images/uImage.noirq
\ No newline at end of file