X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=markers-test%2Fruntest.sh;h=2fcf4d9d4ba9b62ef7f18a73824ce4267701c1f1;hb=70078fe6a573f7616eed7139b146cb15a64c594a;hp=be857b56d45ef59c226e56553bc79e2ea94af980;hpb=37c588307b5ee7bde72e2c1a054d18bd43e7ddf0;p=lttv.git

diff --git a/markers-test/runtest.sh b/markers-test/runtest.sh
index be857b56..2fcf4d9d 100644
--- a/markers-test/runtest.sh
+++ b/markers-test/runtest.sh
@@ -7,16 +7,19 @@ ITER=10
 LOOPS=20000
 
 insmod test-mark-speed-empty.ko
+cat /proc/testmark
 for a in `seq 1 $ITER`; do cat /proc/testmark;done
 rmmod test-mark-speed-empty
 RESEMP=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
 
 insmod test-mark-speed.ko
+cat /proc/testmark
 for a in `seq 1 $ITER`; do cat /proc/testmark;done
 rmmod test-mark-speed
 RESSTD=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
 
 insmod test-mark-speed-opt.ko
+cat /proc/testmark
 for a in `seq 1 $ITER`; do cat /proc/testmark;done
 rmmod test-mark-speed-opt
 RESOPT=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
@@ -38,20 +41,25 @@ rmmod test-mark-speed-local
 RESNOPLOCAL=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
 
 
-make clean
-make EXTRA_CFLAGS=-DCACHEFLUSH
+#make clean
+#make EXTRA_CFLAGS=-DCACHEFLUSH
+
+insmod cachectl.ko
 
 insmod test-mark-speed-empty.ko
+cat /proc/testmark
 for a in `seq 1 $ITER`; do cat /proc/testmark;done
 rmmod test-mark-speed-empty
 RESEMPFL=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
 
 insmod test-mark-speed.ko
+cat /proc/testmark
 for a in `seq 1 $ITER`; do cat /proc/testmark;done
 rmmod test-mark-speed
 RESSTDFL=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
 
 insmod test-mark-speed-opt.ko
+cat /proc/testmark
 for a in `seq 1 $ITER`; do cat /proc/testmark;done
 rmmod test-mark-speed-opt
 RESOPTFL=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
@@ -73,31 +81,32 @@ rmmod test-mark-speed-local
 RESNOPLOCALFL=`dmesg |grep "cycles : " |tail -n 10 |sed 's/^\[.*\] //'| sed 's/cycles : \(.*\)$/\1/'`
 
 
+rmmod cachectl
 
 
 echo "Results in cycles per loop"
 
 echo "Cycles for empty loop (will be substracted for cached runs)"
 SUM="0"
-for a in $RESEMP; do SUM=$[$SUM + $a]; done
+for a in $RESEMP; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESEMP=`echo $SUM/$ITER/$LOOPS | bc -l /dev/stdin`
 echo $RESEMP
 
 echo "Cycles for wbinvd() loop (will be substracted non-cached runs)"
 SUM="0"
-for a in $RESEMPFL; do SUM=$[$SUM + $a]; done
+for a in $RESEMPFL; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESEMPFL=`echo $SUM/$ITER/$LOOPS | bc -l /dev/stdin`
 echo $RESEMPFL
 
 
 echo -n "Added cycles for normal marker [cached, uncached]    "
 SUM="0"
-for a in $RESSTD; do SUM=$[$SUM + $a]; done
+for a in $RESSTD; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESSTD=`echo $SUM/$ITER/$LOOPS - $RESEMP | bc -l /dev/stdin`
 echo -n "[$RESSTD, "
 
 SUM="0"
-for a in $RESSTDFL; do SUM=$[$SUM + $a]; done
+for a in $RESSTDFL; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESSTDFL=`echo $SUM/$ITER/$LOOPS - $RESEMPFL | bc -l /dev/stdin`
 echo "$RESSTDFL]"
 
@@ -105,36 +114,36 @@ echo "$RESSTDFL]"
 
 echo -n "Added cycles for optimized marker [cached, uncached]    "
 SUM="0"
-for a in $RESOPT; do SUM=$[$SUM + $a]; done
+for a in $RESOPT; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESOPT=`echo $SUM/$ITER/$LOOPS - $RESEMP | bc -l /dev/stdin`
 echo -n "[$RESOPT, "
 
 SUM="0"
-for a in $RESOPTFL; do SUM=$[$SUM + $a]; done
+for a in $RESOPTFL; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESOPTFL=`echo $SUM/$ITER/$LOOPS - $RESEMPFL | bc -l /dev/stdin`
 echo "$RESOPTFL]"
 
 
 echo -n "Added cycles for NOP replacement of function call (1 pointer read, 5 local vars) [cached, uncached]    "
 SUM="0"
-for a in $RESNOP; do SUM=$[$SUM + $a]; done
+for a in $RESNOP; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESNOP=`echo $SUM/$ITER/$LOOPS - $RESEMP | bc -l /dev/stdin`
 echo -n "[$RESNOP, "
 
 SUM="0"
-for a in $RESNOPFL; do SUM=$[$SUM + $a]; done
+for a in $RESNOPFL; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESNOPFL=`echo $SUM/$ITER/$LOOPS - $RESEMPFL | bc -l /dev/stdin`
 echo "$RESNOPFL]"
 
 
 echo -n "Added cycles for NOP replacement of function call (6 local vars) [cached, uncached]    "
 SUM="0"
-for a in $RESNOPLOCAL; do SUM=$[$SUM + $a]; done
+for a in $RESNOPLOCAL; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESNOPLOCAL=`echo $SUM/$ITER/$LOOPS - $RESEMP | bc -l /dev/stdin`
 echo -n "[$RESNOPLOCAL, "
 
 SUM="0"
-for a in $RESNOPLOCALFL; do SUM=$[$SUM + $a]; done
+for a in $RESNOPLOCALFL; do SUM=`echo "$SUM + $a" | bc -l /dev/stdin`; done
 RESNOPLOCALFL=`echo $SUM/$ITER/$LOOPS - $RESEMPFL | bc -l /dev/stdin`
 echo "$RESNOPLOCALFL]"