Merge PR #201: Allow float values for metrics captured in RebenchLog

Author: smarr

docs/extensions.md

@@ -76,11 +76,11 @@ Savina.Chameneos: iterations=1 runtime: 48581us
 Implementation Notes:
 
  - For parsing of the total run time, the following regular expression is used:
-   `r"^(?:.*: )?([^\s]+)( [\w\.]+)?: iterations=([0-9]+) runtime: ([0-9]+)([mu])s")`
+   `^(?:.*: )?([^\s]+)( [\w\.]+)?: iterations=([0-9]+) runtime: (?P<runtime>(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)(?P<unit>[mu])s`
 
  - For arbitrary criteria, which may also be used for the `total` criteria,
    the following regular expression should match
-   `r"^(?:.*: )?([^\s]+): ([^:]{1,30}):\s*([0-9]+)([a-zA-Z]+)")`
+   `^(?:.*: )?([^\s]+): (?P<criterion>[^:]{1,30}):\s*(?P<value>(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)(?P<unit>[a-zA-Z]+)`
 
 
 ## `Time`

rebench/interop/rebench_log_adapter.py

@@ -34,9 +34,13 @@ class RebenchLogAdapter(GaugeAdapter):
        Note: regular expressions are documented in /docs/extensions.md
     """
     re_log_line = re.compile(
-        r"^(?:.*: )?([^\s]+)( [\w\.]+)?: iterations=([0-9]+) runtime: ([0-9]+)([mu])s")
+        r"^(?:.*: )?([^\s]+)( [\w\.]+)?: iterations=([0-9]+) "
+        + r"runtime: (?P<runtime>(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)"
+        + r"(?P<unit>[mu])s")
     re_extra_criterion_log_line = re.compile(
-        r"^(?:.*: )?([^\s]+): ([^:]{1,30}):\s*([0-9]+)([a-zA-Z]+)")
+        r"^(?:.*: )?([^\s]+): (?P<criterion>[^:]{1,30}):\s*"
+        + r"(?P<value>(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)"
+        + r"(?P<unit>[a-zA-Z]+)")
 
     re_NPB_partial_invalid = re.compile(r".*Failed.*verification")
     re_NPB_invalid = re.compile(r".*Benchmark done.*verification failed")
@@ -60,8 +64,8 @@ def parse_data(self, data, run_id, invocation):
             measure = None
             match = self.re_log_line.match(line)
             if match:
-                time = float(match.group(4))
-                if match.group(5) == "u":
+                time = float(match.group("runtime"))
+                if match.group("unit") == "u":
                     time /= 1000
                 criterion = (match.group(2) or 'total').strip()
 
@@ -70,9 +74,9 @@ def parse_data(self, data, run_id, invocation):
             else:
                 match = self.re_extra_criterion_log_line.match(line)
                 if match:
-                    value = float(match.group(3))
-                    criterion = match.group(2)
-                    unit = match.group(4)
+                    value = float(match.group("value"))
+                    criterion = match.group("criterion")
+                    unit = match.group("unit")
 
                     measure = Measurement(invocation, iteration, value, unit, run_id, criterion)
 

rebench/tests/interop/rebench_log_adapter_test.py

@@ -130,3 +130,47 @@ def test_other_data(self):
         self.assertEqual(40, measure.value)
         self.assertEqual('external data', measure.criterion)
         self.assertEqual('byte', measure.unit)
+
+    def test_other_data_with_float_values(self):
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("""Savina.Chameneos: some metrics:    5.7foobar
+Savina.Chameneos: external data: 5.2e1GB
+Savina.Chameneos: iterations=1 runtime: 64208us""", None, 13)
+
+        point = data[0]
+        measure = point.get_measurements()[0]
+
+        self.assertEqual(5.7, measure.value)
+        self.assertEqual('some metrics', measure.criterion)
+        self.assertEqual('foobar', measure.unit)
+
+        measure = point.get_measurements()[1]
+        self.assertEqual(52, measure.value)
+        self.assertEqual('external data', measure.criterion)
+        self.assertEqual('GB', measure.unit)
+
+    def test_float_value(self):
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("Dispatch: iterations=1 runtime: 557.123ms", None, 1)
+        self._assert_basics(data, 557.123, 'ms', 'total', True)
+
+    def test_float_value_in_scientific_notation(self):
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("Dispatch: iterations=1 runtime: 5.57123e2ms", None, 1)
+        self._assert_basics(data, 557.123, 'ms', 'total', True)
+
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("Dispatch: iterations=1 runtime: 5.57123e-2ms", None, 1)
+        self._assert_basics(data, 0.0557123, 'ms', 'total', True)
+
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("Dispatch: iterations=1 runtime: 5.57123E-2ms", None, 1)
+        self._assert_basics(data, 0.0557123, 'ms', 'total', True)
+
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("Dispatch: iterations=1 runtime: .57ms", None, 1)
+        self._assert_basics(data, 0.57, 'ms', 'total', True)
+
+        adapter = RebenchLogAdapter(True, None)
+        data = adapter.parse_data("Dispatch: iterations=1 runtime: 57.ms", None, 1)
+        self._assert_basics(data, 57, 'ms', 'total', True)