X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=testub10.git;a=blobdiff_plain;f=scripts%2Fbench.sh;h=51aa12bae441f153734ef3a669795cd361ca1766;hp=a4dd0d29ceb1a65b63d0e8f8145d17eed7325b16;hb=11fb3bd2ab5634f5fd501dc26fca88d3e6cfefc5;hpb=f2d07766cf347820f07bd0dc186c13b2b0fc626a

diff --git a/scripts/bench.sh b/scripts/bench.sh
index a4dd0d2..51aa12b 100755
--- a/scripts/bench.sh
+++ b/scripts/bench.sh
@@ -53,12 +53,18 @@ for i in $TEST/*.0; do
     #LABEL=`grep '.globl' $TMPNAME.s | sed 's/^.*\\.globl *\\([a-zA-Z0-9_]\\+\\).*$/\1/g'`
 
     # this won't work, we need all actual labels
-    LABEL=`grep '[a-zA-Z0-9_.$]\\+:' $TMPNAME.s | sed 's/^\\(.*[^a-zA-Z0-9_.$]\\)\\?\\([a-zA-Z0-9_.$]\\+\\):.*$/\2/g'`
+     grep '[a-zA-Z0-9_.$]\+:' $TMPNAME.s | sed 's/^\(.*[^a-zA-Z0-9_.$]\)\?\([a-zA-Z0-9_.$]\+\):.*$/\2/g' > $TMPNAME.uniq
+
+     LABEL_ASM=`cat $TMPNAME.uniq`
+
+     # functionidentifiers from CALL-file
+     grep '[a-zA-Z_][a-zA-Z0-9_]*(.*)' ${i%.0}.call | sed 's/.*[^a-zA-Z_]\([a-zA-Z_][a-zA-Z0-9_]*\)(.*)\;/\1/g' | sort | uniq >> $TMPNAME.uniq
+
+     LABEL=`sort $TMPNAME.uniq | uniq -d`
+     rm $TMPNAME.uniq
 
     rm -f $TMPNAME.trace
-    MATCHES=0
     for j in $LABEL; do
-		MATCHES="$MATCHES\\|$j"
 		# count instructions
 		$DUMPINSTR $TMPNAME $j > /dev/null
 		if [ $? != 0 ]; then
@@ -67,6 +73,11 @@ for i in $TEST/*.0; do
 		fi
     done
 
+    MATCHES=0
+	for j in $LABEL_ASM; do
+		MATCHES="$MATCHES\\|$j"
+	done
+
     # filter trace
     grep "<\\($MATCHES\\)\\(+[0-9]*\\)\\?>:" $TMPNAME.trace > $TRACEDIR/$bi.trace
 
@@ -74,7 +85,7 @@ for i in $TEST/*.0; do
 	if [ -f $TEST/${bi}.instr ]; then
 		ti=`cat $TEST/$bi.instr`
 	else
-		echo "err: fuer den testfall \"$bi\" existiert noch keine referenzdatei"
+		echo "err: fuer den testfall \"$bi\" existiert noch keine referenzdatei. instruktionen werden verworfen."
 		ti=0
 	fi
 
@@ -94,8 +105,10 @@ for i in $TEST/*.0; do
     echo -e "$bcolor $bi: $ni (referenz: $ti) \033[0m"
     echo "$bi $ni" >> $RESULT
 
-	let gni=gni+$ni
-	let gti=gti+$ti
+	if [ -f $TEST/${bi}.instr ]; then
+		let gni=gni+$ni
+		let gti=gti+$ti
+	fi
 
     # remove waste
     rm -f $TMPNAME $TMPNAME.s $TMPNAME.trace