[Mplayer-cvslog] CVS: main/TOOLS/benchmark-gab benchmark,1.2,1.3 start,1.2,1.3 variables,1.2,1.3

[Winner of tha face compo]

Update of /cvsroot/mplayer/main/TOOLS/benchmark-gab
In directory mail:/var/tmp.root/cvs-serv10457

Modified Files:
	benchmark start variables 
Log Message:
some fixes


Index: benchmark
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/benchmark-gab/benchmark,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- benchmark	31 Aug 2002 08:16:44 -0000	1.2
+++ benchmark	31 Aug 2002 14:19:11 -0000	1.3
@@ -2,6 +2,11 @@
 
 . ./variables
 
+if [ ! -e $MPBIN ]; then
+  wrtlog No MPlayer binary compiled for this arch, trying ./mplayer
+  export MPBIN="./mplayer"
+fi
+
 function benchsamples {
 for i in `ls samples/* | grep -v -e '\.opts'`; do
   BENCHOPTS=`cat $i.opts 2> /dev/null`
@@ -12,17 +17,17 @@
   wrtlog "$DEFAULTOPTS"
   wrtlog "Options for this file:"
   wrtlog "$BENCHOPTS"
-  BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
+  BENCH="`$MPBIN $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
   VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
   wrtlog Total: $VC \(Sys: $SYS\)
 
-  BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
+  BENCH="`$MPBIN $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
   VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
   wrtlog Total: $VC \(Sys: $SYS\)
 
-  BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
+  BENCH="`$MPBIN $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
   VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
   wrtlog Total: $VC \(Sys: $SYS\)

Index: start
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/benchmark-gab/start,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- start	31 Aug 2002 08:16:44 -0000	1.2
+++ start	31 Aug 2002 14:19:11 -0000	1.3
@@ -6,6 +6,7 @@
 
 wrtlog Script version v0.91
 wrtlog CPU: $VENDOR $MODEL $MHZ
+wrtlog CPUFLAGS: $CPUFLAGS
 wrtlog MEM: $MEMORY
 wrtlog VGA: $VGA
 

Index: variables
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/benchmark-gab/variables,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- variables	31 Aug 2002 08:16:44 -0000	1.2
+++ variables	31 Aug 2002 14:19:11 -0000	1.3
@@ -3,10 +3,12 @@
 
 VENDOR="`cat /proc/cpuinfo | grep vendor_id | cut -c 13-`"
 MODEL="`cat /proc/cpuinfo | grep "model name" | cut -c 14-`"
+CPUFLAGS="`cat /proc/cpuinfo | grep flags | cut -c 10-`"
 MHZ="`cat /proc/cpuinfo  | grep MHz | cut -c 12-14` MHz"
 MEMORY="`cat /proc/meminfo | grep MemTotal | awk '{print $2}'` Kb"
-BUILD="`echo $VENDOR $MODEL $MHZ | tr [\ ] [_]`"
+BUILD="`echo $VENDOR $MODEL $MHZ | tr [\ ] [_] | tr [\/] [_]`"
 VGA="`lspci | grep VGA | cut -c 36-`"
+MPBIN="$BUILD/mplayer"
 
 export LOGFILE="`pwd`/log-$BUILD-`date +\"%Y-%m-%d\"`"
 export COMPILEOPTIONS="--enable-runtime-cpudetection"