Skip to content

west, sof-builder, testbench: Integrate sof-topologies discovery via west - #7

Merged
lgirdwood merged 1 commit into
mainfrom
feat/west-sof-topologies-discovery
Nov 21, 2026
Merged

lgirdwood merged 1 commit into
mainfrom
feat/west-sof-topologies-discovery

Conversation

@lgirdwood

Copy link
Copy Markdown
Member

Phase 1 integration with sof and sof-topologies via west:

  • Add sof-topologies to west.yml so standalone west init -l sof-utils && west update workspaces include topology2.
  • Update sof-builder (model.py, window.py, compiler.py, testbench.py, main.py, README.md) to discover sof-topologies/topology2 and resolve sof / workspace_root via west list / west topdir / env vars rather than assuming topology2 lives at sof/tools/topology/topology2.
  • Update sof-testbench/run_test_suite.sh to locate built topologies via west list sof-topologies and sibling sof-topologies checkouts.
  • Remove developer-specific sibling fallback paths from Makefile, sof-testbench/CMakeLists.txt, and sof-tplg-parser/CMakeLists.txt.

…west

Prepare `sof-utils` for standalone `west` workspaces and `sof`-managed
workspaces where `topology2` lives in `sof-topologies` rather than
`sof/tools/topology/topology2`:

- `west.yml`: Add `sof-topologies` alongside `sof` (still using
  `name-allowlist: [zephyr]` to avoid circular `sof-utils` import) and
  document standalone vs. `sof`-workspace update conventions.
- `sof-builder/` (`model.py`, `window.py`, `compiler.py`, `testbench.py`,
  `main.py`, `README.md`): Add shared `west` and workspace-root helpers
  (`west_project_path()`, `west_topdir()`,
  `resolve_sof_and_workspace_roots()`, `discover_topology2_dir()`) so
  `sof-builder` locates `sof-topologies/topology2`, `alsatplg`,
  `sof-testbench4`, and `abi.h` (from `sof` or standalone
  `sof-topologies`) without assuming `topology2_root/../../..` is `sof`.
- `sof-testbench/run_test_suite.sh`: Discover built topologies via
  `west list -f "{abspath}" sof-topologies` and sibling
  `sof-topologies`/`sof-topology` directories before legacy paths.
- `Makefile`, `sof-testbench/CMakeLists.txt`,
  `sof-tplg-parser/CMakeLists.txt`: Remove developer-specific sibling
  path fallbacks.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lgirdwood
lgirdwood force-pushed the feat/west-sof-topologies-discovery branch from 551082e to d99e3ba Compare November 21, 2026 19:09
@lgirdwood
lgirdwood marked this pull request as ready for review November 21, 2026 20:06
@lgirdwood
lgirdwood merged commit 737e975 into main Nov 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants