added lmbench and generalize hackbench_parse script2013.10

1. move hackbench_parse.py to common/scripts/min_max_avg_parsh.sh
   and try to generalize it so lmbench can use it as well.
2. add new lmbench.yaml file to OE

Change-Id: I9ce50fb5830d2f1a6f45ca043f93da70f32041b1
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

6 files changed, 86 insertions, 27 deletions

diff --git a/common/scripts/lmbench.sh b/common/scripts/lmbench.sh
new file mode 100755
index 0000000..e985f1d
--- /dev/null
+++ b/common/scripts/lmbench.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "BEGIN LMBENCH"
+for i in $(seq 1 1000)
+do
+    echo "lat_ctx iteration number $i "
+    /usr/bin/lat_ctx  -s 64 2
+    /usr/bin/lat_ctx  -s 64 8
+    /usr/bin/lat_ctx  -s 64 16
+    /usr/bin/lat_ctx  -s 64 20
+done
+echo "END LMBENCH"
diff --git a/common/scripts/min_max_avg_parse.py b/common/scripts/min_max_avg_parse.py
new file mode 100755
index 0000000..7518049
--- /dev/null
+++ b/common/scripts/min_max_avg_parse.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+
+import re
+import sys
+from numpy import *
+
+values = []
+
+r = re.compile(sys.argv[2]+"\s+(?P<measurement>[0-9.])")
+f = open(sys.argv[1], "r")
+for line in f.readlines():
+    search = r.search(line)
+    if search:
+        values.append(float(search.group('measurement')))
+
+if "hackbench" in sys.argv[1]:
+    # Usually the first value is inexplicably high
+    values.pop(0)
+
+try:
+    sys.argv[4]
+except IndexError:
+    cmd_options = ""
+else:
+    cmd_options = sys.argv[4]
+
+np_array = array(values)
+
+format = "%-16s%-16s%-16s%-16s"
+print format % (sys.argv[1].split('.', 1)[0]+cmd_options+"_min:", str(min(np_array)),    sys.argv[3], "pass")
+print format % (sys.argv[1].split('.', 1)[0]+cmd_options+"_max:", str(max(np_array)),    sys.argv[3], "pass")
+print format % (sys.argv[1].split('.', 1)[0]+cmd_options+"_avg:", str(mean(np_array)),   sys.argv[3], "pass")
+print format % (sys.argv[1].split('.', 1)[0]+cmd_options+"_mdn:", str(median(np_array)), sys.argv[3], "pass")
diff --git a/common/scripts/parse_lmbench.sh b/common/scripts/parse_lmbench.sh
new file mode 100755
index 0000000..1036b69
--- /dev/null
+++ b/common/scripts/parse_lmbench.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+LOG_FILE=$1
+OUTPUT_FILE=$3
+TMP_FILE="$1.$$"
+BEGIN=$(grep -n "^BEGIN LMBENCH" $LOG_FILE | awk -F ':' '{print $1}')
+END=$(grep -n "^END LMBENCH" $LOG_FILE | awk -F ':' '{print $1}')
+BEGINNING=$(expr $(expr $END - $BEGIN) + 1)
+head -n $END $LOG_FILE | tail -n $BEGINNING >$TMP_FILE
+
+for i in 2 8 16 20
+do
+    ./common/scripts/min_max_avg_parse.py $TMP_FILE "^$i" $2 "64_$i" >>$OUTPUT_FILE
+done
+rm $TMP_FILE
diff --git a/openembedded/hackbench.yaml b/openembedded/hackbench.yaml
index 921b3a8..4a6ef1b 100644
--- a/openembedded/hackbench.yaml
+++ b/openembedded/hackbench.yaml
@@ -19,8 +19,8 @@ run:
         - ./openembedded/scripts/dd_infinite.sh &> /dev/null &
         - while true; do sleep 5; killall hackbench; done &
         - for i in {1..1001}; do hackbench | tee -a hackbench_res.txt; done
-        - ./openembedded/scripts/hackbench_parse.py hackbench_res.txt
+        - ./common/scripts/min_max_avg_parse.py hackbench_res.txt "Time:" "Seconds"
         - killall dd_infinite.sh
 
 parse:
-    pattern: '^(?P<test_case_id>\w+):\s+(?P<measurement>\d+(\.\d+)?)\s+(?P<units>\S+)\s+(?P<result>\w+)'
+    pattern: '^(?P<test_case_id>[^:]+):\s*(?P<measurement>[0-9.]+)\s+(?P<units>\w+)\s+(?P<result>\w+)'
diff --git a/openembedded/lmbench.yaml b/openembedded/lmbench.yaml
new file mode 100644
index 0000000..9590bc4
--- /dev/null
+++ b/openembedded/lmbench.yaml
@@ -0,0 +1,24 @@
+metadata:
+    name: lmbench
+    format: "Lava-Test-Shell Test Definition 1.0"
+    version: 1.0
+    description: "Lmbench Suite"
+    maintainer:
+        - anders.roxell@linaro.org
+
+    os:
+        - openembedded
+    devices:
+        - arndale
+    scope:
+        - performance
+
+run:
+    steps:
+        - './common/scripts/lmbench.sh 2>&1| tee lmbench.log'
+        - './common/scripts/parse_lmbench.sh lmbench.log ms result_lmbench.log'
+        - 'cat result_lmbench.log'
+        - 'lava-test-run-attach result_lmbench.log text/plain'
+
+parse:
+    pattern: '^(?P<test_case_id>[^:]+):\s*(?P<measurement>[0-9.]+)\s+(?P<units>\w+)\s+(?P<result>\w+)'
diff --git a/openembedded/scripts/hackbench_parse.py b/openembedded/scripts/hackbench_parse.py
deleted file mode 100755
index 9c31434..0000000
--- a/openembedded/scripts/hackbench_parse.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-import re
-import sys
-from numpy import *
-
-values = []
-
-r = re.compile("Time:\s(?P<measurement>\d+\.\d*)")
-f = open(sys.argv[1], "r")
-for line in f.readlines():
-    search = r.search(line)
-    if search: 
-       values.append(float(search.group('measurement')))
-
-# Usually the first value is inexplicably high
-values.pop(0)
-
-np_array = array(values)
-
-format = "%-16s%-16s%-16s%-16s"
-print format % ("hackbench_min:", str(min(np_array)),    "seconds", "pass")
-print format % ("hakcbench_max:", str(max(np_array)),    "seconds", "pass")
-print format % ("hackbench_avg:", str(mean(np_array)),   "seconds", "pass")
-print format % ("hackbench_mdn:", str(median(np_array)), "seconds", "pass")