Address comments from PR

Author: mdboom

bench_runner/config.py

@@ -46,7 +46,10 @@ class PublishMirror:
 @dataclasses.dataclass
 class Benchmarks:
     # Benchmarks to exclude from plots.
-    excluded_benchmarks: list[str] = dataclasses.field(default_factory=list)
+    excluded_benchmarks: set[str] = dataclasses.field(default_factory=set)
+
+    def __post_init__(self):
+        self.excluded_benchmarks = set(self.excluded_benchmarks)
 
 
 @dataclasses.dataclass

bench_runner/hpt.py

@@ -35,7 +35,7 @@
 from numpy.typing import NDArray
 
 
-from . import util
+from . import config
 from .util import PathLike
 
 ACC_MAXSU = 2
@@ -68,8 +68,9 @@ def load_data(data: Mapping[str, Any]) -> dict[str, NDArray[np.float64]]:
 def create_matrices(
     a: Mapping[str, NDArray[np.float64]], b: Mapping[str, NDArray[np.float64]]
 ) -> tuple[dict[str, NDArray[np.float64]], dict[str, NDArray[np.float64]]]:
+    cfg = config.get_config()
     benchmarks = sorted(list(set(a.keys()) & set(b.keys())))
-    excluded = util.get_excluded_benchmarks()
+    excluded = cfg.benchmarks.excluded_benchmarks
     benchmarks = [bm for bm in benchmarks if bm not in excluded]
     return {bm: a[bm] for bm in benchmarks}, {bm: b[bm] for bm in benchmarks}
 

bench_runner/result.py

@@ -205,7 +205,8 @@ def calculate_diffs(ref_values, head_values) -> tuple[np.ndarray | None, float]:
             values.sort()
             return values, float(values.mean())
 
-        excluded = util.get_excluded_benchmarks()
+        cfg = config.get_config()
+        excluded = cfg.benchmarks.excluded_benchmarks
         combined_data = []
         for name, ref in ref_data.items():
             if len(ref) != 0 and name in head_data and name not in excluded:
@@ -689,8 +690,9 @@ def parsed_version(self):
         return pkg_version.parse(self.version.replace("+", "0"))
 
     def get_timing_data(self) -> dict[str, np.ndarray]:
+        cfg = config.get_config()
         data = {}
-        excluded = util.get_excluded_benchmarks()
+        excluded = cfg.benchmarks.excluded_benchmarks
 
         for benchmark in self.contents["benchmarks"]:
             name = benchmark.get("metadata", self.contents["metadata"])["name"]
@@ -703,8 +705,9 @@ def get_timing_data(self) -> dict[str, np.ndarray]:
         return data
 
     def get_memory_data(self) -> dict[str, np.ndarray]:
+        cfg = config.get_config()
         data = {}
-        excluded = util.get_excluded_benchmarks()
+        excluded = cfg.benchmarks.excluded_benchmarks
 
         # On MacOS, there was a bug in pyperf where the `mem_max_rss` value was
         # erroneously multiplied by 1024.  (BSD defines maxrss in bytes, Linux

bench_runner/scripts/run_benchmarks.py

@@ -19,6 +19,7 @@
 
 
 from bench_runner import benchmark_definitions
+from bench_runner import config
 from bench_runner import flags
 from bench_runner import git
 from bench_runner.result import Result
@@ -366,9 +367,10 @@ def run_summarize_stats(
 
 
 def select_benchmarks(benchmarks: str):
+    cfg = config.get_config()
     if benchmarks == "all":
         return ",".join(
-            ["all", *[f"-{x}" for x in util.get_excluded_benchmarks() if x]]
+            ["all", *[f"-{x}" for x in cfg.benchmarks.excluded_benchmarks if x]]
         )
     elif benchmarks == "all_and_excluded":
         return "all"

bench_runner/util.py

@@ -27,15 +27,6 @@ def apply_suffix(path: PathLike, suffix: str) -> Path:
     return path_.parent / (path_.stem + suffix)
 
 
-@functools.cache
-def get_excluded_benchmarks() -> set[str]:
-    from . import config
-
-    conf = config.get_config()
-    excluded_benchmarks = conf.benchmarks.excluded_benchmarks
-    return set(excluded_benchmarks)
-
-
 def has_any_element(iterable):
     """
     Checks if an iterable (like a generator) has at least one element