Update scripts/vlac2_release_common.py

scripts/vlac2_release_common.py

@@ -23,6 +23,8 @@ LEGACY_PORTABLE_IMAGE_ROOTS = (
 GENERATED_MARKER_FILENAME = "_GENERATED"
 PUBLIC_BENCHMARK_JSON_NAME = "video_progress_benchmark_file.json"
 PUBLIC_RELEASE_ROOT_PLACEHOLDER = "__VLAC2_RELEASE_ROOT__"
+PUBLIC_BENCHMARK_DIRNAME = "benchmark_data"
+LEGACY_BENCHMARK_DIRNAME = "benchmark_json"
 
 
 def portable_image_roots() -> tuple[Path, ...]:
@@ -62,7 +64,7 @@ def ensure_release_tree(release_root: Path) -> dict[str, Path]:
     paths = {
         "release_root": release_root,
         "raw_root": release_root / "vlac2_release_data",
-        "benchmark_root": release_root / "benchmark_json",
+        "benchmark_root": release_root / PUBLIC_BENCHMARK_DIRNAME,
         "portable_image_root": release_root / PORTABLE_IMAGE_ROOT,
         "scripts_root": release_root / "scripts",
     }
@@ -248,3 +250,14 @@ def discover_benchmark_jsons(benchmark_root: Path) -> list[Path]:
             seen.add(resolved)
             candidates.append(resolved)
     return candidates
+
+
+def resolve_benchmark_root(release_root: Path) -> Path:
+    release_root = release_root.resolve()
+    preferred = release_root / PUBLIC_BENCHMARK_DIRNAME
+    legacy = release_root / LEGACY_BENCHMARK_DIRNAME
+    if preferred.exists():
+        return preferred
+    if legacy.exists():
+        return legacy
+    return preferred