Add the ability to list tags in the list of weekly runners.

Author: Yhg1s

bench_runner/runners.py

@@ -130,3 +130,22 @@ def get_tags(cfgpath: PathLike | None = None) -> dict[str, list[Runner]]:
             for tag in runner.tags:
                 d[tag].append(runner)
     return dict(d)
+
+
+def get_runners_from_nicknames_and_tags(
+    nicknames: list[str], cfgpath: PathLike | None = None
+) -> list[Runner]:
+    result = []
+    tags = get_tags(cfgpath)
+    runners = get_runners_by_nickname(cfgpath)
+    for nickname in nicknames:
+        if nickname.startswith("tag "):
+            tag = nickname.removeprefix("tag ")
+            if tag not in tags:
+                raise ValueError(f"Tag {tag} not found in bench_runner.toml")
+            result.extend(tags[nickname.removeprefix("tag ")])
+        else:
+            if nickname not in runners:
+                raise ValueError(f"Runner {nickname} not found in bench_runner.toml")
+            result.append(runners[nickname])
+    return result

bench_runner/scripts/get_merge_base.py

@@ -52,12 +52,9 @@ def _main(
     if machine in ("__really_all", "all"):
         need_to_run = True
     else:
-        if machine.startswith("tag "):
-            tag = machine.removeprefix("tag ")
-            tags = mrunners.get_tags()
-            machines = [r.nickname for r in tags[tag]]
-        else:
-            machines = [machine]
+        machines = [
+            r.nickname for r in mrunners.get_runners_from_nicknames_and_tags([machine])
+        ]
         for m in machines:
             if (
                 has_result(

bench_runner/scripts/install.py

@@ -215,9 +215,7 @@ def generate_benchmark(dst: Any) -> Any:
     presented to the user.
     """
     available_runners = [r for r in runners.get_runners() if r.available]
-    tags = sorted(
-        set(f"tag {g}" for r in available_runners if r.tags for g in r.tags)
-    )
+    tags = sorted(set(f"tag {g}" for r in available_runners if r.tags for g in r.tags))
     runner_choices = [
         *tags,
         *[x.name for x in available_runners],
@@ -278,12 +276,10 @@ def generate__weekly(dst: Any) -> Any:
     all_jobs = []
 
     for name, weekly_cfg in weekly.items():
-        for runner_nickname in weekly_cfg.get("runners", []):
-            runner = runners.get_runner_by_nickname(runner_nickname)
-            if runner.nickname == "unknown":
-                raise ValueError(
-                    f"Runner {runner_nickname} not found in bench_runner.toml"
-                )
+        cfg_runners = runners.get_runners_from_nicknames_and_tags(
+            weekly_cfg.get("runners", [])
+        )
+        for runner_nickname in cfg_runners:
             weekly_flags = weekly_cfg.get("flags", [])
             job = {
                 "uses": "./.github/workflows/_benchmark.yml",