Skip to content

Tools: Topology2: No need for HDA platform variants for benchmark tplg #8885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 1 commit into from
Mar 5, 2024
Merged

Tools: Topology2: No need for HDA platform variants for benchmark tplg #8885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions tools/topology/topology2/development/tplg-targets-bench.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause

#
# Append test topologies for multiple platforms and multiple formats
# Append test topologies for multiple formats
# to TPLGS array.
#

set(platforms "TGL" "MTL")
set(sampleformats "16" "24" "32")

set(components
Expand Down Expand Up @@ -44,23 +43,19 @@ set(component_parameters_s32
"BENCH_ARIA_PARAMS=default"
)

foreach(p ${platforms})
string(TOLOWER ${p} pl)

# Add components with all sample formats
foreach(sf ${sampleformats})
foreach(comp bench_param IN ZIP_LISTS components component_parameters)
set(item "sof-hda-generic\;sof-hda-benchmark-${comp}${sf}-${pl}\;PLATFORM=${p},HDA_CONFIG=benchmark,BENCH_CONFIG=${comp}${sf},${bench_param}")
#message(STATUS "Item=" ${item})
list(APPEND TPLGS "${item}")
endforeach()
endforeach()

# Add components with single format
set (sf "32")
foreach(comp bench_param IN ZIP_LISTS components_s32 component_parameters_s32)
set(item "sof-hda-generic\;sof-hda-benchmark-${comp}${sf}-${pl}\;PLATFORM=${p},HDA_CONFIG=benchmark,BENCH_CONFIG=${comp}${sf},${bench_param}")
# Add components with all sample formats
foreach(sf ${sampleformats})
foreach(comp bench_param IN ZIP_LISTS components component_parameters)
set(item "sof-hda-generic\;sof-hda-benchmark-${comp}${sf}\;HDA_CONFIG=benchmark,BENCH_CONFIG=${comp}${sf},${bench_param}")
#message(STATUS "Item=" ${item})
list(APPEND TPLGS "${item}")
endforeach()
endforeach()

# Add components with single format
set (sf "32")
foreach(comp bench_param IN ZIP_LISTS components_s32 component_parameters_s32)
set(item "sof-hda-generic\;sof-hda-benchmark-${comp}${sf}\;HDA_CONFIG=benchmark,BENCH_CONFIG=${comp}${sf},${bench_param}")
#message(STATUS "Item=" ${item})
list(APPEND TPLGS "${item}")
endforeach()
7 changes: 1 addition & 6 deletions tools/topology/topology2/development/tplg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,7 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-mtl-lbm.bin"

# CAVS HDA topology for benchmarking performance
# Copier - peak volume - mixin - mixout - aria - peak volume - mixin - mixout - copier
"sof-hda-generic\;sof-hda-benchmark-generic-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,\
BENCH_CONFIG=benchmark"
"sof-hda-generic\;sof-hda-benchmark-generic-mtl\;PLATFORM=MTL,HDA_CONFIG=benchmark,\
BENCH_CONFIG=benchmark"
"sof-hda-generic\;sof-hda-benchmark-generic-lnl\;PLATFORM=LNL,HDA_CONFIG=benchmark,\
BENCH_CONFIG=benchmark"
"sof-hda-generic\;sof-hda-benchmark-generic\;HDA_CONFIG=benchmark,BENCH_CONFIG=benchmark"

# Topology to test IPC4 Crossover
"development/cavs-nocodec-crossover\;sof-tgl-nocodec-crossover-2way\;PLATFORM=tgl,\
Expand Down