[Fuego] [PATCH 26/29] Whetstone: adapt to new parser

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/tests/Benchmark.Whetstone/criteria.json  | 16 ++++++++++++++++
 engine/tests/Benchmark.Whetstone/parser.py      | 18 +++++++++---------
 engine/tests/Benchmark.Whetstone/reference.json | 18 ++++++++++++++++++
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 engine/tests/Benchmark.Whetstone/criteria.json
 create mode 100644 engine/tests/Benchmark.Whetstone/reference.json

diff --git a/engine/tests/Benchmark.Whetstone/criteria.json b/engine/tests/Benchmark.Whetstone/criteria.json
new file mode 100644
index 0000000..50d5763
--- /dev/null
+++ b/engine/tests/Benchmark.Whetstone/criteria.json
@@ -0,0 +1,16 @@
+{
+    "schema_version":"1.0",
+    "criteria":[
+        {
+            "tguid":"default.Whetstone.Score",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        },
+        {
+            "tguid":"default.Whetstone",
+            "min_pass":1
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.Whetstone/parser.py b/engine/tests/Benchmark.Whetstone/parser.py
index d5de9bd..eb76bcc 100755
--- a/engine/tests/Benchmark.Whetstone/parser.py
+++ b/engine/tests/Benchmark.Whetstone/parser.py
@@ -1,16 +1,16 @@
-#!/bin/python
+#!/usr/bin/python
 
-import os, re, sys
+import os, sys
 
 sys.path.insert(0, os.environ['FUEGO_CORE'] + '/engine/scripts/parser')
 import common as plib
 
-ref_section_pat = "\[[\w]+.[gle]{2}\]"
-cur_search_pat = re.compile("^(C Converted Double Precision Whetstones:)(\ )([\d]{1,4}.?[\d]{1,2})(.*)$", re.MULTILINE)
+regex_string = '^(C Converted Double Precision Whetstones:)(\ )([\d]{1,4}.?[\d]{1,2})(.*)$'
 
-cur_dict = {}
-pat_result = plib.parse(cur_search_pat)
-if pat_result:
-	cur_dict['Whetstone'] = pat_result[0][2]
+measurements = {}
+matches = plib.parse(regex_string)
 
-sys.exit(plib.process_data(ref_section_pat, cur_dict, 's', 'MIPS'))
+if matches:
+    measurements['default.Whetstone'] = [{'name': 'Score', 'measure' : float(matches[0][2])}]
+
+sys.exit(plib.process_data(measurements))
diff --git a/engine/tests/Benchmark.Whetstone/reference.json b/engine/tests/Benchmark.Whetstone/reference.json
new file mode 100644
index 0000000..dd4d7e1
--- /dev/null
+++ b/engine/tests/Benchmark.Whetstone/reference.json
@@ -0,0 +1,18 @@
+{
+    "test_sets":[
+        {
+            "name":"default",
+            "test_cases":[
+                {
+                    "name":"Whetstone",
+                    "measurements":[
+                        {
+                            "name":"Score",
+                            "unit":"MIPS"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
-- 
2.7.4