diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf index e77d932085b7..aaa5c914e053 100644 --- a/tools/topology/topology2/cavs-benchmark-hda.conf +++ b/tools/topology/topology2/cavs-benchmark-hda.conf @@ -180,6 +180,14 @@ IncludeByKey.BENCH_CONFIG { ] } + # + # Aria component + # + + "aria32" { + + } + # # DCblock component # diff --git a/tools/topology/topology2/development/tplg-targets-bench.cmake b/tools/topology/topology2/development/tplg-targets-bench.cmake index b04feef180f9..06ddbfa3b80e 100644 --- a/tools/topology/topology2/development/tplg-targets-bench.cmake +++ b/tools/topology/topology2/development/tplg-targets-bench.cmake @@ -26,6 +26,14 @@ set(component_parameters "BENCH_GAIN_PARAMS=default" ) +set(components_s32 + "aria" +) + +set(component_parameters_s32 + "BENCH_ARIA_PARAMS=default" +) + foreach(p ${platforms}) string(TOLOWER ${p} pl) @@ -37,4 +45,12 @@ foreach(p ${platforms}) 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}") + #message(STATUS "Item=" ${item}) + list(APPEND TPLGS "${item}") + endforeach() endforeach() diff --git a/tools/topology/topology2/include/bench/aria_controls_capture.conf b/tools/topology/topology2/include/bench/aria_controls_capture.conf new file mode 100644 index 000000000000..9c5f0c476d0d --- /dev/null +++ b/tools/topology/topology2/include/bench/aria_controls_capture.conf @@ -0,0 +1,13 @@ + # Created initially with script "./bench_comp_generate.sh aria" + # may need edits to modify controls + Object.Control { + bytes."1" { + name '$ANALOG_CAPTURE_PCM ARIA bytes' + } + #mixer."1" { + # name '$ANALOG_CAPTURE_PCM ARIA switch or volume' + #} + #enum."1" { + # name '$ANALOG_CAPTURE_PCM ARIA enum' + #} + } diff --git a/tools/topology/topology2/include/bench/aria_controls_playback.conf b/tools/topology/topology2/include/bench/aria_controls_playback.conf new file mode 100644 index 000000000000..a3ab068b5095 --- /dev/null +++ b/tools/topology/topology2/include/bench/aria_controls_playback.conf @@ -0,0 +1,13 @@ + # Created initially with script "./bench_comp_generate.sh aria" + # may need edits to modify controls + Object.Control { + bytes."1" { + name '$ANALOG_PLAYBACK_PCM ARIA bytes' + } + #mixer."1" { + # name '$ANALOG_PLAYBACK_PCM ARIA switch or volume' + #} + #enum."1" { + # name '$ANALOG_PLAYBACK_PCM ARIA enum' + #} + } diff --git a/tools/topology/topology2/include/bench/aria_hda_route.conf b/tools/topology/topology2/include/bench/aria_hda_route.conf new file mode 100644 index 000000000000..ba50d062b11d --- /dev/null +++ b/tools/topology/topology2/include/bench/aria_hda_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh aria" + Object.Base.route [ + { + sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' + source 'aria.1.1' + } + { + sink 'aria.1.1' + source 'host-copier.0.playback' + } + { + source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' + sink 'aria.3.2' + } + { + source 'aria.3.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/aria_s32.conf b/tools/topology/topology2/include/bench/aria_s32.conf new file mode 100644 index 000000000000..6cea0a9b0905 --- /dev/null +++ b/tools/topology/topology2/include/bench/aria_s32.conf @@ -0,0 +1,13 @@ + # Created with script "./bench_comp_generate.sh aria" + Object.Widget.aria.1 { + index 1 + + + } + Object.Widget.aria.2 { + index 3 + + + } + +