report: fixes

Signed-off-by: Øyvind Harboe <[email protected]>

BUILD.bazel

@@ -400,9 +400,11 @@ BOOMTILE_VARIABLES = SKIP_REPORT_METRICS | FAST_BUILD_SETTINGS | {
     "HOLD_SLACK_MARGIN": "-200",
 }
 
+WNS_REPORT_SWEEP = [variant for variant in SWEEP if "naja" not in variant]
+
 SWEEP_JSON = {
     "base": BOOMTILE_VARIABLES,
-    "sweep": SWEEP,
+    "sweep": {variant: SWEEP[variant] for variant in WNS_REPORT_SWEEP},
     "stage": "cts",
     "stages": [
         "floorplan",
@@ -472,8 +474,6 @@ write_binary(
     visibility = [":__subpackages__"],
 ) for variant in SWEEP]
 
-WNS_REPORT_SWEEP = [variant for variant in SWEEP if "naja" not in variant]
-
 genrule(
     name = "wns_report",
     srcs = [

wns_report.py

@@ -82,7 +82,7 @@ def main():
     logs = sorted(map(os.path.basename, pathlib.Path(log_dir).glob("*.log")))
     logs_dir = os.path.join(log_dir, "..")
 
-    variables = sorted(set(k["variables"] for v in sweep.values() for k in v.keys()))
+    variables = sorted(set(k for v in sweep.values() for k in v.get("variables", {}).keys()))
 
     table_data = None
     for variant in sweep:
@@ -100,9 +100,9 @@ def main():
                 + [stats[name] for name in names]
                 + [
                     (
-                        sweep[variant]["variables"].get(variable, "")
+                        sweep[variant].get("variables", {}).get(variable, "")
                         if sweep_json["base"].get(variable, "")
-                        != sweep[variant]["variables"].get(variable, "")
+                        != sweep[variant].get("variables", {}).get(variable, "")
                         else ""
                     )
                     for variable in variables