Merge PR #202: Make gauge adapter names in configuration case insensitive

Author: smarr

docs/extensions.md

@@ -16,6 +16,7 @@ ReBench currently provides builtin support for the following benchmark harnesses
 - `ValidationLog`: the format used by [SOMns](https://github.com/smarr/SOMns)'s ImpactHarness
 - `Time`: a harness that uses `/usr/bin/time` automatically
 
+
 ### `PlainSecondsLog`
 
 This adapter attempts to read every line of program output as a millisecond
@@ -35,6 +36,7 @@ Implementation Notes:
 
  - Python's `float()` function is used for parsing
 
+
 ### `ReBenchLog`
 
 The ReBenchLog parser is the most commonly used and has most features.
@@ -80,6 +82,24 @@ Implementation Notes:
    the following regular expression should match
    `r"^(?:.*: )?([^\s]+): ([^:]{1,30}):\s*([0-9]+)([a-zA-Z]+)")`
 
+
+## `Time`
+
+The `Time` adapter uses Unix's `/usr/bin/time` command.
+On Linux, or more generally the platforms that support it, it will also use the
+`-f` switch of the `time` command to record the maximum resident set size,
+i.e., the maximum amount of memory the program used.
+
+Example configuration for a suite:
+
+```yaml
+    Suite:
+        gauge_adapter: Time
+        benchmarks:
+          - Bench1
+```
+
+
 ## Supporting other Benchmark Harnesses
 
 To add support for your own harness, check the `rebench.interop` module.

rebench/executor.py

@@ -24,15 +24,13 @@
 from math import floor
 from multiprocessing import cpu_count
 import os
-import pkgutil
 import random
 import subprocess
-import sys
 from threading import Thread, RLock
 from time import time
 
 from . import subprocess_with_timeout as subprocess_timeout
-from .interop.adapter import ExecutionDeliveredNoResults
+from .interop.adapter import ExecutionDeliveredNoResults, instantiate_adapter
 from .ui import escape_braces
 
 
@@ -444,22 +442,7 @@ def execute_run(self, run_id):
         return terminate
 
     def _get_gauge_adapter_instance(self, adapter_name):
-        adapter_name += "Adapter"
-
-        root = sys.modules['rebench.interop'].__path__
-
-        for _, name, _ in pkgutil.walk_packages(root):
-            # depending on how ReBench was executed, name might one of the two
-            try:
-                mod = __import__("rebench.interop." + name, fromlist=adapter_name)
-            except ImportError:
-                try:
-                    mod = __import__("interop." + name, fromlist=adapter_name)
-                except ImportError:
-                    mod = None
-            if mod is not None and hasattr(mod, adapter_name):
-                return getattr(mod, adapter_name)(self._include_faulty, self)
-        return None
+        return instantiate_adapter(adapter_name, self._include_faulty, self)
 
     def _generate_data_point(self, cmdline, gauge_adapter, run_id,
                              termination_check):

rebench/interop/adapter.py

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 import re
+import pkgutil
+import sys
 
 
 class GaugeAdapter(object):
@@ -78,3 +80,24 @@ class OutputNotParseable(ExecutionDeliveredNoResults):
 
 class ResultsIndicatedAsInvalid(ExecutionDeliveredNoResults):
     pass
+
+
+def instantiate_adapter(name, include_faulty, executor):
+    adapter_name = name + "Adapter"
+    root = sys.modules['rebench.interop'].__path__
+
+    for _, module_name, _ in pkgutil.walk_packages(root):
+        # depending on how ReBench was executed, name might one of the two
+        try:
+            mod = __import__("rebench.interop." + module_name, fromlist=adapter_name)
+        except ImportError:
+            try:
+                mod = __import__("interop." + module_name, fromlist=adapter_name)
+            except ImportError:
+                mod = None
+        if mod is not None:
+            for key in dir(mod):
+                if key.lower() == adapter_name.lower():
+                    return getattr(mod, key)(include_faulty, executor)
+
+    return None

rebench/interop/rebench_log_adapter.py

@@ -30,6 +30,8 @@ class RebenchLogAdapter(GaugeAdapter):
     """RebenchLogPerformance is the standard log parser of ReBench.
        It reads a simple log format, which includes the number of iterations of
        a benchmark and its runtime in microseconds.
+
+       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")

rebench/tests/interop/adapter_test.py

@@ -0,0 +1,22 @@
+from unittest import TestCase
+from ...interop.adapter import instantiate_adapter
+
+
+class AdapterTest(TestCase):
+    def test_load_all_known_adapters(self):
+        self.assertIsNotNone(instantiate_adapter("JMH", False, None))
+        self.assertIsNotNone(instantiate_adapter("Multivariate", False, None))
+        self.assertIsNotNone(instantiate_adapter("Perf", False, None))
+        self.assertIsNotNone(instantiate_adapter("PlainSecondsLog", False, None))
+        self.assertIsNotNone(instantiate_adapter("RebenchLog", False, None))
+        self.assertIsNotNone(instantiate_adapter("SavinaLog", False, None))
+        self.assertIsNotNone(instantiate_adapter("Test", False, None))
+        self.assertIsNotNone(instantiate_adapter("TestExecutor", False, None))
+        self.assertIsNotNone(instantiate_adapter("Time", False, None))
+        self.assertIsNotNone(instantiate_adapter("ValidationLog", False, None))
+
+    def test_case_insensitive_names(self):
+        self.assertIsNotNone(instantiate_adapter("RebenchLog", False, None))
+        self.assertIsNotNone(instantiate_adapter("ReBenchLog", False, None))
+        self.assertIsNotNone(instantiate_adapter("rebenchlog", False, None))
+        self.assertIsNotNone(instantiate_adapter("REBENCHLOG", False, None))