v0.91

small misc fixes
100l fix, for xv+xmga benchmarks, only VC was benchmarked, now total time
everywhere


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7185 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 18 insertions, 19 deletions

diff --git a/TOOLS/benchmark-gab/benchmark b/TOOLS/benchmark-gab/benchmark
index 966251e84b..0c438e2bef 100755
--- a/TOOLS/benchmark-gab/benchmark
+++ b/TOOLS/benchmark-gab/benchmark
@@ -13,19 +13,19 @@ for i in `ls samples/* | grep -v -e '\.opts'`; do
   wrtlog "Options for this file:"
   wrtlog "$BENCHOPTS"
   BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
-  VC=`echo $BENCH | awk '{print $3}'`
+  VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
-  wrtlog VC: $VC \(Sys: $SYS\)
+  wrtlog Total: $VC \(Sys: $SYS\)
 
   BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
-  VC=`echo $BENCH | awk '{print $3}'`
+  VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
-  wrtlog VC: $VC \(Sys: $SYS\)
+  wrtlog Total: $VC \(Sys: $SYS\)
 
   BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
-  VC=`echo $BENCH | awk '{print $3}'`
+  VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
-  wrtlog VC: $VC \(Sys: $SYS\)
+  wrtlog Total: $VC \(Sys: $SYS\)
 done
 }
 
@@ -38,7 +38,7 @@ wrtlog Starting benchmarks
 
 if [ ! -e no_codec ]; then
   wrtlog Starting CODEC benchmark runs, with 3 tries...
-  DEFAULTOPTS="-nosound -benchmark -vo null -vop disabled -autoq 0"
+  DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vop disabled -autoq 0"
   benchsamples
 fi
 
@@ -48,25 +48,25 @@ export XAUTHORITY=$HOME/.Xauthority
 if [ ! -e no_xv ]; then
   if [ ! -e no_xv_nodr ]; then
     wrtlog Starting XVideo \(no DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xv -fs -nodr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vop disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_nodr_noslices ]; then
     wrtlog Starting XVideo \(no DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xv -fs -nodr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vop disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_dr ]; then
     wrtlog Starting XVideo \(DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xv -fs -dr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vop disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_dr_noslices ]; then
     wrtlog Starting XVideo \(DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xv -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vop disabled -autoq 0"
     benchsamples
   fi
 fi
@@ -74,25 +74,25 @@ fi
 if [ -e xmga ]; then
   if [ ! -e xmga_nodr ]; then
     wrtlog Starting XMGA \(no DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xmga -fs -dr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vop disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_nodr_noslices ]; then
     wrtlog Starting XMGA \(no DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_dr ]; then
     wrtlog Starting XMGA \(DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xmga -fs -dr -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vop disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_dr ]; then
     wrtlog Starting XMGA \(DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
     benchsamples
   fi
 fi
diff --git a/TOOLS/benchmark-gab/start b/TOOLS/benchmark-gab/start
index 9872077e67..dd4540a96a 100755
--- a/TOOLS/benchmark-gab/start
+++ b/TOOLS/benchmark-gab/start
@@ -4,7 +4,7 @@
 
 rm -f $LOGFILE
 
-wrtlog Script version v0.9
+wrtlog Script version v0.91
 wrtlog CPU: $VENDOR $MODEL $MHZ
 wrtlog MEM: $MEMORY
 wrtlog VGA: $VGA
diff --git a/TOOLS/benchmark-gab/variables b/TOOLS/benchmark-gab/variables
index 482c003744..4c94826632 100755
--- a/TOOLS/benchmark-gab/variables
+++ b/TOOLS/benchmark-gab/variables
@@ -1,4 +1,5 @@
 #!/bin/sh
+export PATH=$PATH:/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin
 
 VENDOR="`cat /proc/cpuinfo | grep vendor_id | cut -c 13-`"
 MODEL="`cat /proc/cpuinfo | grep "model name" | cut -c 14-`"
@@ -7,11 +8,9 @@ MEMORY="`cat /proc/meminfo | grep MemTotal | awk '{print $2}'` Kb"
 BUILD="`echo $VENDOR $MODEL $MHZ | tr [\ ] [_]`"
 VGA="`lspci | grep VGA | cut -c 36-`"
 
-export LOGFILE="`pwd`/$BUILD.logs/log-`date +\"%Y-%m-%d\"`"
+export LOGFILE="`pwd`/log-$BUILD-`date +\"%Y-%m-%d\"`"
 export COMPILEOPTIONS="--enable-runtime-cpudetection"
 
-mkdir $BUILD.logs 2> /dev/null
-
 function wrtlog {
 	echo "[ `date +\"%Y-%m-%d %T\"` ] $*" >> "$LOGFILE"
 }