From 61401f2fb6c3fbea91a00f0cc0dcdca45f3af467 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Wed, 4 Jun 2025 20:36:07 +0300 Subject: [PATCH] Tools: Topology: Add build of benchmark topologies for SDW This patch adds build of test topologies for SDW MTL platforms, e.g. sof-mtl-sdw-benchmark-<16/24/32>.tplg. The benchmark topologies were before this build only for HDA generic platforms that limits current test devices availability. The HDA topologies build is cleaned up and benchmark tplg build is removed from the production topology high level file sof-hda-generic.conf. The required definitions are moved to cavs-benchmark-hda.conf. The io-gateway or dai definitions are moved to this file to keep the component specific topologies parts agnostic to audio codec endpoint. A similar high level benchmark topologies configuration file is added for SDW into cavs-benchmark-sdw.conf. The tplg-targets-bench.cmake is modified to build topologies for both HDA and SDW. In component specific files the dai-copier endpoints are passed in macro since the names are codec type specific. The route configurations are renamed to be without hda. The host gateway configuration is removed to be without io since it was moved to platform type specific higher level configuration. Signed-off-by: Seppo Ingalsuo --- .../topology2/cavs-benchmark-hda.conf | 275 ++++++++- .../topology2/cavs-benchmark-sdw.conf | 523 ++++++++++++++++++ .../development/tplg-targets-bench.cmake | 24 +- .../topology2/development/tplg-targets.cmake | 3 +- .../include/bench/aria_hda_route.conf | 19 - .../topology2/include/bench/aria_route.conf | 19 + .../topology2/include/bench/aria_s24.conf | 8 +- .../include/bench/asrc_hda_route.conf | 19 - .../topology2/include/bench/asrc_route.conf | 19 + .../topology2/include/bench/asrc_s16.conf | 8 +- .../topology2/include/bench/asrc_s24.conf | 8 +- .../topology2/include/bench/asrc_s32.conf | 8 +- .../include/bench/bench_comp_generate.sh | 22 +- .../include/bench/dcblock_hda_route.conf | 19 - .../include/bench/dcblock_route.conf | 19 + .../topology2/include/bench/dcblock_s16.conf | 8 +- .../topology2/include/bench/dcblock_s24.conf | 8 +- .../topology2/include/bench/dcblock_s32.conf | 8 +- .../include/bench/drc_hda_route.conf | 19 - .../topology2/include/bench/drc_route.conf | 19 + .../topology2/include/bench/drc_s16.conf | 8 +- .../topology2/include/bench/drc_s24.conf | 8 +- .../topology2/include/bench/drc_s32.conf | 8 +- .../include/bench/eqfir_hda_route.conf | 19 - .../topology2/include/bench/eqfir_route.conf | 19 + .../topology2/include/bench/eqfir_s16.conf | 8 +- .../topology2/include/bench/eqfir_s24.conf | 8 +- .../topology2/include/bench/eqfir_s32.conf | 8 +- .../include/bench/eqiir_hda_route.conf | 19 - .../topology2/include/bench/eqiir_route.conf | 19 + .../topology2/include/bench/eqiir_s16.conf | 8 +- .../topology2/include/bench/eqiir_s24.conf | 8 +- .../topology2/include/bench/eqiir_s32.conf | 8 +- .../include/bench/gain_hda_route.conf | 19 - .../topology2/include/bench/gain_route.conf | 19 + .../topology2/include/bench/gain_s16.conf | 8 +- .../topology2/include/bench/gain_s24.conf | 8 +- .../topology2/include/bench/gain_s32.conf | 8 +- ...> host_gateway_pipelines_multich_s32.conf} | 74 +-- ...6.conf => host_gateway_pipelines_s16.conf} | 66 +-- ...4.conf => host_gateway_pipelines_s24.conf} | 62 +-- ...2.conf => host_gateway_pipelines_s32.conf} | 58 +- .../bench/host_gateway_pipelines_src_s16.conf | 24 + .../bench/host_gateway_pipelines_src_s24.conf | 24 + .../bench/host_gateway_pipelines_src_s32.conf | 24 + .../include/bench/igo_nr_hda_route.conf | 19 - .../topology2/include/bench/igo_nr_route.conf | 19 + .../topology2/include/bench/igo_nr_s16.conf | 8 +- .../topology2/include/bench/igo_nr_s24.conf | 8 +- .../topology2/include/bench/igo_nr_s32.conf | 8 +- .../include/bench/micsel_multich_s32.conf | 4 +- .../topology2/include/bench/micsel_route.conf | 19 + .../topology2/include/bench/micsel_s16.conf | 4 +- .../topology2/include/bench/micsel_s24.conf | 4 +- .../topology2/include/bench/micsel_s32.conf | 4 +- .../bench/multiband_drc_hda_route.conf | 19 - .../include/bench/multiband_drc_route.conf | 19 + .../include/bench/multiband_drc_s16.conf | 8 +- .../include/bench/multiband_drc_s24.conf | 8 +- .../include/bench/multiband_drc_s32.conf | 8 +- .../include/bench/rtnr_hda_route.conf | 19 - .../topology2/include/bench/rtnr_route.conf | 19 + .../topology2/include/bench/rtnr_s16.conf | 8 +- .../topology2/include/bench/rtnr_s24.conf | 8 +- .../topology2/include/bench/rtnr_s32.conf | 8 +- .../include/bench/src_hda_route.conf | 19 - .../include/bench/src_lite_hda_route.conf | 19 - .../include/bench/src_lite_route.conf | 19 + .../topology2/include/bench/src_lite_s16.conf | 8 +- .../topology2/include/bench/src_lite_s24.conf | 8 +- .../topology2/include/bench/src_lite_s32.conf | 8 +- .../topology2/include/bench/src_route.conf | 19 + .../topology2/include/bench/src_s16.conf | 8 +- .../topology2/include/bench/src_s24.conf | 8 +- .../topology2/include/bench/src_s32.conf | 8 +- .../include/bench/tdfb_hda_route.conf | 19 - .../topology2/include/bench/tdfb_route.conf | 19 + .../topology2/include/bench/tdfb_s16.conf | 8 +- .../topology2/include/bench/tdfb_s24.conf | 8 +- .../topology2/include/bench/tdfb_s32.conf | 8 +- .../bench/template_comp_hda_route.conf | 19 - .../include/bench/template_comp_route.conf | 19 + .../include/bench/template_comp_s16.conf | 8 +- .../include/bench/template_comp_s24.conf | 8 +- .../include/bench/template_comp_s32.conf | 8 +- tools/topology/topology2/sof-hda-generic.conf | 1 - 86 files changed, 1409 insertions(+), 658 deletions(-) create mode 100644 tools/topology/topology2/cavs-benchmark-sdw.conf delete mode 100644 tools/topology/topology2/include/bench/aria_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/aria_route.conf delete mode 100644 tools/topology/topology2/include/bench/asrc_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/asrc_route.conf delete mode 100644 tools/topology/topology2/include/bench/dcblock_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/dcblock_route.conf delete mode 100644 tools/topology/topology2/include/bench/drc_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/drc_route.conf delete mode 100644 tools/topology/topology2/include/bench/eqfir_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/eqfir_route.conf delete mode 100644 tools/topology/topology2/include/bench/eqiir_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/eqiir_route.conf delete mode 100644 tools/topology/topology2/include/bench/gain_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/gain_route.conf rename tools/topology/topology2/include/bench/{host_io_gateway_pipelines_multich_s32.conf => host_gateway_pipelines_multich_s32.conf} (87%) rename tools/topology/topology2/include/bench/{host_io_gateway_pipelines_src_s16.conf => host_gateway_pipelines_s16.conf} (60%) rename tools/topology/topology2/include/bench/{host_io_gateway_pipelines_src_s24.conf => host_gateway_pipelines_s24.conf} (60%) rename tools/topology/topology2/include/bench/{host_io_gateway_pipelines_src_s32.conf => host_gateway_pipelines_s32.conf} (60%) create mode 100644 tools/topology/topology2/include/bench/host_gateway_pipelines_src_s16.conf create mode 100644 tools/topology/topology2/include/bench/host_gateway_pipelines_src_s24.conf create mode 100644 tools/topology/topology2/include/bench/host_gateway_pipelines_src_s32.conf delete mode 100644 tools/topology/topology2/include/bench/igo_nr_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/igo_nr_route.conf create mode 100644 tools/topology/topology2/include/bench/micsel_route.conf delete mode 100644 tools/topology/topology2/include/bench/multiband_drc_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/multiband_drc_route.conf delete mode 100644 tools/topology/topology2/include/bench/rtnr_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/rtnr_route.conf delete mode 100644 tools/topology/topology2/include/bench/src_hda_route.conf delete mode 100644 tools/topology/topology2/include/bench/src_lite_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/src_lite_route.conf create mode 100644 tools/topology/topology2/include/bench/src_route.conf delete mode 100644 tools/topology/topology2/include/bench/tdfb_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/tdfb_route.conf delete mode 100644 tools/topology/topology2/include/bench/template_comp_hda_route.conf create mode 100644 tools/topology/topology2/include/bench/template_comp_route.conf diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf index 5985fa9b4da0..7fcdde52fed3 100644 --- a/tools/topology/topology2/cavs-benchmark-hda.conf +++ b/tools/topology/topology2/cavs-benchmark-hda.conf @@ -1,20 +1,171 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Define { + HDA_CONFIG "none" + PLATFORM "none" ANALOG_PLAYBACK_PCM 'Analog Playback' ANALOG_CAPTURE_PCM 'Analog Capture' HDA_ANALOG_DAI_NAME 'Analog' HDA_ANALOG_CAPTURE_RATE 48000 HDA_ANALOG_PLAYBACK_RATE 48000 + BENCH_PLAYBACK_HOST_PIPELINE 1 + BENCH_PLAYBACK_DAI_PIPELINE 2 + BENCH_CAPTURE_HOST_PIPELINE 3 + BENCH_CAPTURE_DAI_PIPELINE 4 + BENCH_PLAYBACK_DAI_COPIER "dai-copier.HDA.Analog.playback" + BENCH_CAPTURE_DAI_COPIER "dai-copier.HDA.Analog.capture" + BENCH_PCM_CHANNELS_MIN 2 + BENCH_PCM_CHANNELS_MAX 2 } +# override defaults with platform-specific config +IncludeByKey.PLATFORM { + "mtl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" + "ptl" "platform/intel/ptl.conf" +} + +Object.Widget.virtual [ + { + name 'codec0_in' + type input + index 1 + } + { + name 'codec1_in' + type input + index 2 + } + { + name 'codec0_out' + type output + index 3 + } + { + name 'codec1_out' + type output + index 4 + } + { + name 'codec2_in' + type input + index 5 + } + { + name 'codec2_out' + type output + index 6 + } + { + name 'iDisp1_out' + type output + index 7 + } + { + name 'iDisp2_out' + type output + index 8 + } + { + name 'iDisp3_out' + type output + index 9 + } + { + name 'iDisp3 Tx' + type out_drv + index 0 + } + { + name 'iDisp2 Tx' + type out_drv + index 1 + } + { + name 'iDisp1 Tx' + type out_drv + index 2 + } + { + name 'Analog CPU Playback' + type out_drv + index 3 + } + { + name 'Digital CPU Playback' + type out_drv + index 4 + } + { + name 'Alt Analog CPU Playback' + type out_drv + index 5 + } + { + name 'Analog CPU Capture' + type input + index 6 + } + { + name 'Digital CPU Capture' + type input + index 7 + } + { + name 'Alt Analog CPU Capture' + type input + index 8 + } +] + Object.Dai.HDA [ { name $HDA_ANALOG_DAI_NAME @@ -40,21 +191,119 @@ Object.PCM.pcm [ name $ANALOG_PLAYBACK_PCM formats 'S32_LE,S24_LE,S16_LE' rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000" - channels_min 1 - channels_max 8 + channels_min $BENCH_PCM_CHANNELS_MIN + channels_max $BENCH_PCM_CHANNELS_MAX } Object.PCM.pcm_caps.2 { direction "capture" name $ANALOG_CAPTURE_PCM formats 'S32_LE,S24_LE,S16_LE' rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000" - channels_min 1 - channels_max 8 + channels_min $BENCH_PCM_CHANNELS_MIN + channels_max $BENCH_PCM_CHANNELS_MAX } direction duplex } ] +Object.Pipeline { + io-gateway [ + { + index $BENCH_PLAYBACK_DAI_PIPELINE + direction playback + Object.Widget.dai-copier.1 { + node_type $HDA_LINK_OUTPUT_CLASS + stream_name $HDA_ANALOG_DAI_NAME + dai_type "HDA" + copier_type "HDA" + num_input_pins 1 + num_input_audio_formats 1 + num_output_audio_formats 1 + IncludeByKey.BENCH_MODULE_FORMAT { + "s16" { + Object.Base.input_audio_format [ + { + in_bit_depth 16 + in_valid_bit_depth 16 + } + ] + } + "s24" { + Object.Base.input_audio_format [ + { + in_bit_depth 32 + in_valid_bit_depth 24 + } + ] + } + "s32" { + Object.Base.input_audio_format [ + { + in_bit_depth 32 + in_valid_bit_depth 32 + } + ] + } + } + Object.Base.output_audio_format [ + { + out_bit_depth 32 + out_valid_bit_depth 32 + } + ] + } + } + ] + io-gateway-capture [ + { + index $BENCH_CAPTURE_DAI_PIPELINE + direction capture + Object.Widget.dai-copier.1 { + dai_type "HDA" + type "dai_out" + copier_type "HDA" + stream_name $HDA_ANALOG_DAI_NAME + node_type $HDA_LINK_INPUT_CLASS + num_output_pins 1 + num_input_audio_formats 1 + num_output_audio_formats 1 + Object.Base.input_audio_format [ + { + in_bit_depth 32 + in_valid_bit_depth 32 + } + ] + IncludeByKey.BENCH_MODULE_FORMAT { + "s16" { + Object.Base.output_audio_format [ + { + out_bit_depth 16 + out_valid_bit_depth 16 + } + ] + } + "s24" { + Object.Base.output_audio_format [ + { + out_bit_depth 32 + out_valid_bit_depth 24 + } + ] + } + "s32" { + Object.Base.output_audio_format [ + { + out_bit_depth 32 + out_valid_bit_depth 32 + } + ] + } + } + } + } + ] +} + IncludeByKey.BENCH_CONFIG { "benchmark" { Object.Pipeline { @@ -314,7 +563,7 @@ IncludeByKey.BENCH_CONFIG { index 5 direction capture - Object.Widget.dai-copier."1" { + Object.Widget.dai-copier.1 { dai_type "HDA" type "dai_out" copier_type "HDA" diff --git a/tools/topology/topology2/cavs-benchmark-sdw.conf b/tools/topology/topology2/cavs-benchmark-sdw.conf new file mode 100644 index 000000000000..0b8379639e27 --- /dev/null +++ b/tools/topology/topology2/cavs-benchmark-sdw.conf @@ -0,0 +1,523 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Define { + PLATFORM "none" + SDW_JACK_OUT_STREAM 'SDW0-Playback' + SDW_JACK_IN_STREAM 'SDW0-Capture' + SDW_JACK_OUT_BE_ID 0 + SDW_JACK_IN_BE_ID 1 + NUM_SDW_AMP_LINKS 0 + SDW_DMIC 0 + SDW_JACK true + PASSTHROUGH false + SDW_ANALOG_CAPTURE_CH 2 + SDW_LINK_VALID_BITS 24 + ANALOG_PLAYBACK_PCM "Jack Out" + ANALOG_CAPTURE_PCM "Jack In" + JACK_RATE 48000 + BENCH_PLAYBACK_HOST_PIPELINE 1 + BENCH_PLAYBACK_DAI_PIPELINE 2 + BENCH_CAPTURE_HOST_PIPELINE 3 + BENCH_CAPTURE_DAI_PIPELINE 4 + BENCH_PLAYBACK_DAI_COPIER "alh-copier.SDW0-Playback.0" + BENCH_CAPTURE_DAI_COPIER "alh-copier.SDW0-Capture.0" + BENCH_PCM_CHANNELS_MIN 2 + BENCH_PCM_CHANNELS_MAX 2 +} + +# override defaults with platform-specific config +IncludeByKey.PLATFORM { + "mtl" "platform/intel/mtl.conf" + "lnl" "platform/intel/lnl.conf" + "ptl" "platform/intel/ptl.conf" +} + +IncludeByKey.SDW_JACK_OUT_STREAM { + "Playback-SimpleJack" { + Define { + BENCH_PLAYBACK_DAI_COPIER "alh-copier.Playback-SimpleJack.0" + BENCH_CAPTURE_DAI_COPIER "alh-copier.Capture-SimpleJack.0" + } + } +} + +# +# List of all DAIs +# +Object.Dai.ALH [ + { + dai_index 0 + id $SDW_JACK_OUT_BE_ID + direction "playback" + name $SDW_JACK_OUT_STREAM + default_hw_conf_id 0 + rate $JACK_RATE + channels 2 + + Object.Base.hw_config.1 { + id 0 + name "ALH2" + } + } + { + dai_index 10 + id $SDW_JACK_IN_BE_ID + direction "capture" + name $SDW_JACK_IN_STREAM + default_hw_conf_id 0 + rate $JACK_RATE + channels 2 + + Object.Base.hw_config.1 { + id 0 + name "ALH3" + } + } +] + +Object.PCM.pcm [ + { + name "$ANALOG_PLAYBACK_PCM" + id 0 + direction "playback" + Object.Base.fe_dai.1 { + name "$ANALOG_PLAYBACK_PCM" + } + + Object.PCM.pcm_caps.1 { + name $ANALOG_PLAYBACK_PCM + formats 'S16_LE,S24_LE,S32_LE' + rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000" + channels_min $BENCH_PCM_CHANNELS_MIN + channels_max $BENCH_PCM_CHANNELS_MAX + } + } + { + name "$ANALOG_CAPTURE_PCM" + id 1 + direction "capture" + Object.Base.fe_dai.1 { + name "$ANALOG_CAPTURE_PCM" + } + + Object.PCM.pcm_caps.1 { + name $ANALOG_CAPTURE_PCM + formats 'S16_LE,S24_LE,S32_LE' + rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000" + channels_min $BENCH_PCM_CHANNELS_MIN + channels_max $BENCH_PCM_CHANNELS_MAX + } + } +] + +Object.Widget { + alh-copier [ + { + stream_name $SDW_JACK_OUT_STREAM + node_type $ALH_LINK_OUTPUT_CLASS + index $BENCH_PLAYBACK_DAI_PIPELINE + type dai_in + direction playback + num_input_pins 1 + num_input_audio_formats 1 + num_output_audio_formats 1 + IncludeByKey.BENCH_MODULE_FORMAT { + "s16" { + Object.Base.input_audio_format [ + { + in_rate $JACK_RATE + in_bit_depth 16 + in_valid_bit_depth 16 + } + ] + } + "s24" { + Object.Base.input_audio_format [ + { + in_rate $JACK_RATE + in_bit_depth 32 + in_valid_bit_depth 24 + } + ] + } + "s32" { + Object.Base.input_audio_format [ + { + in_rate $JACK_RATE + in_bit_depth 32 + in_valid_bit_depth 32 + } + ] + } + } + Object.Base.output_audio_format [ + { + out_rate $JACK_RATE + out_bit_depth 32 + out_valid_bit_depth $SDW_LINK_VALID_BITS + out_sample_type $SAMPLE_TYPE_MSB_INTEGER + out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" + } + ] + } + ] + pipeline [ + { + index $BENCH_PLAYBACK_DAI_PIPELINE + priority 0 + lp_mode 0 + dynamic_pipeline 1 + } + ] +} + +Object.Widget { + alh-copier [ + { + stream_name $SDW_JACK_IN_STREAM + direction "capture" + type "dai_out" + index $BENCH_CAPTURE_DAI_PIPELINE + node_type $ALH_LINK_INPUT_CLASS + num_input_audio_formats 1 + num_output_audio_formats 1 + num_output_pins 1 + + Object.Base.input_audio_format [ + { + in_rate $JACK_RATE + in_bit_depth 32 + in_valid_bit_depth $SDW_LINK_VALID_BITS + in_sample_type $SAMPLE_TYPE_MSB_INTEGER + in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" + } + ] + IncludeByKey.BENCH_MODULE_FORMAT { + "s16" { + Object.Base.output_audio_format [ + { + out_rate $JACK_RATE + out_bit_depth 16 + out_valid_bit_depth 16 + } + ] + } + "s24" { + Object.Base.output_audio_format [ + { + out_rate $JACK_RATE + out_bit_depth 32 + out_valid_bit_depth 24 + } + ] + } + "s32" { + Object.Base.output_audio_format [ + { + out_rate $JACK_RATE + out_bit_depth 32 + out_valid_bit_depth 32 + } + ] + } + } + } + ] + + pipeline [ + { + index $BENCH_CAPTURE_DAI_PIPELINE + priority 0 + lp_mode 0 + dynamic_pipeline 1 + } + ] +} + +IncludeByKey.BENCH_CONFIG { + # + # Aria component + # + + "aria24" { + + } + + # + # ASRC component + # + + # '^' indicates the start of the string and '$' means the end of string + # manually adding '^' and '$' for whole string precise matching + + "^asrc16$" { + + } + + "^asrc24$" { + + } + + "^asrc32$" { + + } + + # + # DCblock component + # + + "dcblock16" { + + } + + "dcblock24" { + + } + + "dcblock32" { + + } + + # + # DRC component + # + + "drc16" { + + } + + "drc24" { + + } + + "drc32" { + + } + + # Multiband-DRC component + # Note: Due to alsatplg regexp match feature in IncludeByKey call it e.g. drc_multiband16 + # to not match multiband_drc16 with drc16 and get error "No variable defined + # for BENCH_DRC_PARAMS" when building these. + + "drc_multiband16" { + + } + + "drc_multiband24" { + + } + + "drc_multiband32" { + + } + + # + # EQFIR component + # + + "eqfir16" { + + } + + "eqfir24" { + + } + + "eqfir32" { + + } + + # + # EQIIR component + # + + "eqiir16" { + + } + + "eqiir24" { + + } + + "eqiir32" { + + } + + # + # Gain component + # + + "gain16" { + + } + + "gain24" { + + } + + "gain32" { + + } + + # + # IGO NR component + # + + "igo_nr16" { + + } + + "igo_nr24" { + + } + + "igo_nr32" { + + } + + # + # Micsel component + # + + "^micsel16$" { + + } + + "^micsel24$" { + + } + + "^micsel32$" { + + } + + "^micsel_multich32$" { + + } + + # + # RTNR component + # + + "rtnr16" { + + } + + "rtnr24" { + + } + + "rtnr32" { + + } + + # + # SRC component + # + + "^src16$" { + + } + + "^src24$" { + + } + + "^src32$" { + + } + + # + # src_lite component + # + + "src_lite16" { + + } + + "src_lite24" { + + } + + "src_lite32" { + + } + + # + # tdfb component + # + + "tdfb16" { + + } + + "tdfb24" { + + } + + "tdfb32" { + + } + + # + # template_comp component + # + + "template_comp16" { + + } + + "template_comp24" { + + } + + "template_comp32" { + + } +} \ No newline at end of file diff --git a/tools/topology/topology2/development/tplg-targets-bench.cmake b/tools/topology/topology2/development/tplg-targets-bench.cmake index bd1426971475..eb962c99848f 100644 --- a/tools/topology/topology2/development/tplg-targets-bench.cmake +++ b/tools/topology/topology2/development/tplg-targets-bench.cmake @@ -57,27 +57,39 @@ set(component_parameters_s32 "BENCH_MICSEL_PARAMS=default" ) +set (plat "mtl") + # 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}) + set(item "cavs-benchmark-hda\;sof-hda-benchmark-${comp}${sf}\;PLATFORM=${plat},BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") + list(APPEND TPLGS "${item}") + set(item "cavs-benchmark-sdw\;sof-${plat}-sdw-benchmark-${comp}${sf}-sdw0\;PLATFORM=${plat},BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") list(APPEND TPLGS "${item}") + set(item "cavs-benchmark-sdw\;sof-${plat}-sdw-benchmark-${comp}${sf}-simplejack\;PLATFORM=${plat},SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") + list(APPEND TPLGS "${item}") +# #message(STATUS "Item=" ${item}) endforeach() endforeach() # Add components with single format set (sf "24") foreach(comp bench_param IN ZIP_LISTS components_s24 component_parameters_s24) - set(item "sof-hda-generic\;sof-hda-benchmark-${comp}${sf}\;HDA_CONFIG=benchmark,BENCH_CONFIG=${comp}${sf},${bench_param}") - #message(STATUS "Item=" ${item}) + set(item "cavs-benchmark-hda\;sof-hda-benchmark-${comp}${sf}\;PLATFORM=${plat},BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") + list(APPEND TPLGS "${item}") + set(item "cavs-benchmark-sdw\;sof-${plat}-sdw-benchmark-${comp}${sf}-sdw0\;PLATFORM=${plat},BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") + list(APPEND TPLGS "${item}") + set(item "cavs-benchmark-sdw\;sof-${plat}-sdw-benchmark-${comp}${sf}-simplejack\;PLATFORM=${plat},SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") list(APPEND TPLGS "${item}") endforeach() set (sf "32") foreach(comp bench_param IN ZIP_LISTS components_s32 component_parameters_s32) #message(STATUS "Bench_param=" ${bench_param}) - set(item "sof-hda-generic\;sof-hda-benchmark-${comp}${sf}\;HDA_CONFIG=benchmark,BENCH_CONFIG=${comp}${sf},${bench_param}") - #message(STATUS "Item=" ${item}) + set(item "cavs-benchmark-hda\;sof-hda-benchmark-${comp}${sf}\;PLATFORM=${plat},BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") + list(APPEND TPLGS "${item}") + set(item "cavs-benchmark-sdw\;sof-${plat}-sdw-benchmark-${comp}${sf}-sdw0\;PLATFORM=${plat},BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") + list(APPEND TPLGS "${item}") + set(item "cavs-benchmark-sdw\;sof-${plat}-sdw-benchmark-${comp}${sf}-simplejack\;PLATFORM=${plat},SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,BENCH_MODULE_FORMAT=s${sf},BENCH_CONFIG=${comp}${sf},${bench_param}") list(APPEND TPLGS "${item}") endforeach() diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake index f05571e5de15..5c20ef592806 100644 --- a/tools/topology/topology2/development/tplg-targets.cmake +++ b/tools/topology/topology2/development/tplg-targets.cmake @@ -289,7 +289,8 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-ptl-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\;HDA_CONFIG=benchmark,BENCH_CONFIG=benchmark,BENCH_ARIA_PARAMS=param_1" +"cavs-benchmark-hda\;sof-hda-benchmark-generic\;HDA_CONFIG=benchmark,BENCH_CONFIG=benchmark,\ +BENCH_ARIA_PARAMS=param_1,BENCH_MODULE_FORMAT=s24" # Topology to test IPC4 Crossover "development/cavs-nocodec-crossover\;sof-tgl-nocodec-crossover-2way\;PLATFORM=tgl,\ diff --git a/tools/topology/topology2/include/bench/aria_hda_route.conf b/tools/topology/topology2/include/bench/aria_hda_route.conf deleted file mode 100644 index ba50d062b11d..000000000000 --- a/tools/topology/topology2/include/bench/aria_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # 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_route.conf b/tools/topology/topology2/include/bench/aria_route.conf new file mode 100644 index 000000000000..441523691a51 --- /dev/null +++ b/tools/topology/topology2/include/bench/aria_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh aria" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'aria.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'aria.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'aria.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'aria.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/aria_s24.conf b/tools/topology/topology2/include/bench/aria_s24.conf index c8b0be21704c..eaaa34b18bf3 100644 --- a/tools/topology/topology2/include/bench/aria_s24.conf +++ b/tools/topology/topology2/include/bench/aria_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh aria" Object.Widget.aria.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.aria.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/asrc_hda_route.conf b/tools/topology/topology2/include/bench/asrc_hda_route.conf deleted file mode 100644 index 853085a164b1..000000000000 --- a/tools/topology/topology2/include/bench/asrc_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh asrc" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'asrc.1.1' - } - { - sink 'asrc.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'asrc.3.2' - } - { - source 'asrc.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/asrc_route.conf b/tools/topology/topology2/include/bench/asrc_route.conf new file mode 100644 index 000000000000..24985bff6176 --- /dev/null +++ b/tools/topology/topology2/include/bench/asrc_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh asrc" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'asrc.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'asrc.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'asrc.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'asrc.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/asrc_s16.conf b/tools/topology/topology2/include/bench/asrc_s16.conf index 3ba56b0c0622..a87d2a601c71 100644 --- a/tools/topology/topology2/include/bench/asrc_s16.conf +++ b/tools/topology/topology2/include/bench/asrc_s16.conf @@ -4,16 +4,16 @@ # - rate_out 48000 for the fixed playback sink rate # - rate_out 0 for the capture PCM defined sink rate Object.Widget.asrc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE operation_mode 1 rate_out 48000 } Object.Widget.asrc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE operation_mode 2 rate_out 0 } - - + + diff --git a/tools/topology/topology2/include/bench/asrc_s24.conf b/tools/topology/topology2/include/bench/asrc_s24.conf index 1c7288cd01a3..ef06b0e8e10b 100644 --- a/tools/topology/topology2/include/bench/asrc_s24.conf +++ b/tools/topology/topology2/include/bench/asrc_s24.conf @@ -4,16 +4,16 @@ # - rate_out 48000 for the fixed playback sink rate # - rate_out 0 for the capture PCM defined sink rate Object.Widget.asrc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE operation_mode 1 rate_out 48000 } Object.Widget.asrc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE operation_mode 2 rate_out 0 } - - + + diff --git a/tools/topology/topology2/include/bench/asrc_s32.conf b/tools/topology/topology2/include/bench/asrc_s32.conf index 2a0e3387f84e..9671f717a3d9 100644 --- a/tools/topology/topology2/include/bench/asrc_s32.conf +++ b/tools/topology/topology2/include/bench/asrc_s32.conf @@ -4,16 +4,16 @@ # - rate_out 48000 for the fixed playback sink rate # - rate_out 0 for the capture PCM defined sink rate Object.Widget.asrc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE operation_mode 1 rate_out 48000 } Object.Widget.asrc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE operation_mode 2 rate_out 0 } - - + + diff --git a/tools/topology/topology2/include/bench/bench_comp_generate.sh b/tools/topology/topology2/include/bench/bench_comp_generate.sh index 638628ccce57..3a9c5aa9c229 100755 --- a/tools/topology/topology2/include/bench/bench_comp_generate.sh +++ b/tools/topology/topology2/include/bench/bench_comp_generate.sh @@ -28,41 +28,41 @@ generate_comp () cat > "$fn" < } Object.Widget.${comp}.2 { - index 3 + index \$BENCH_CAPTURE_HOST_PIPELINE } - - + + EOF_COMP } generate_route () { - fn=${comp}_hda_route.conf + fn=${comp}_route.conf echo Creating file "$fn" cat > "$fn" < } Object.Widget.dcblock.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/dcblock_s24.conf b/tools/topology/topology2/include/bench/dcblock_s24.conf index ae24936a05a9..7f8d04082a03 100644 --- a/tools/topology/topology2/include/bench/dcblock_s24.conf +++ b/tools/topology/topology2/include/bench/dcblock_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh dcblock" Object.Widget.dcblock.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.dcblock.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/dcblock_s32.conf b/tools/topology/topology2/include/bench/dcblock_s32.conf index 37bea24dd7a3..8b2996a981cf 100644 --- a/tools/topology/topology2/include/bench/dcblock_s32.conf +++ b/tools/topology/topology2/include/bench/dcblock_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh dcblock" Object.Widget.dcblock.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.dcblock.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/drc_hda_route.conf b/tools/topology/topology2/include/bench/drc_hda_route.conf deleted file mode 100644 index 8e9f475bd777..000000000000 --- a/tools/topology/topology2/include/bench/drc_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh drc" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'drc.1.1' - } - { - sink 'drc.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'drc.3.2' - } - { - source 'drc.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/drc_route.conf b/tools/topology/topology2/include/bench/drc_route.conf new file mode 100644 index 000000000000..7814bbd3c663 --- /dev/null +++ b/tools/topology/topology2/include/bench/drc_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh drc" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'drc.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'drc.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'drc.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'drc.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/drc_s16.conf b/tools/topology/topology2/include/bench/drc_s16.conf index a91888928d25..cce34d391e14 100644 --- a/tools/topology/topology2/include/bench/drc_s16.conf +++ b/tools/topology/topology2/include/bench/drc_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh drc" Object.Widget.drc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.drc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/drc_s24.conf b/tools/topology/topology2/include/bench/drc_s24.conf index 4eb39eef9ad6..325916d4bd34 100644 --- a/tools/topology/topology2/include/bench/drc_s24.conf +++ b/tools/topology/topology2/include/bench/drc_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh drc" Object.Widget.drc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.drc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/drc_s32.conf b/tools/topology/topology2/include/bench/drc_s32.conf index beda0c0b210e..3c1cedddf439 100644 --- a/tools/topology/topology2/include/bench/drc_s32.conf +++ b/tools/topology/topology2/include/bench/drc_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh drc" Object.Widget.drc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.drc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/eqfir_hda_route.conf b/tools/topology/topology2/include/bench/eqfir_hda_route.conf deleted file mode 100644 index fd30c793326c..000000000000 --- a/tools/topology/topology2/include/bench/eqfir_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh eqfir" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'eqfir.1.1' - } - { - sink 'eqfir.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'eqfir.3.2' - } - { - source 'eqfir.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/eqfir_route.conf b/tools/topology/topology2/include/bench/eqfir_route.conf new file mode 100644 index 000000000000..345eb6f7e803 --- /dev/null +++ b/tools/topology/topology2/include/bench/eqfir_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh eqfir" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'eqfir.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'eqfir.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'eqfir.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'eqfir.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/eqfir_s16.conf b/tools/topology/topology2/include/bench/eqfir_s16.conf index 461323944062..06c60c2e6541 100644 --- a/tools/topology/topology2/include/bench/eqfir_s16.conf +++ b/tools/topology/topology2/include/bench/eqfir_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh eqfir" Object.Widget.eqfir.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.eqfir.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/eqfir_s24.conf b/tools/topology/topology2/include/bench/eqfir_s24.conf index ce2b303fe8f3..c90264d29607 100644 --- a/tools/topology/topology2/include/bench/eqfir_s24.conf +++ b/tools/topology/topology2/include/bench/eqfir_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh eqfir" Object.Widget.eqfir.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.eqfir.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/eqfir_s32.conf b/tools/topology/topology2/include/bench/eqfir_s32.conf index 0e3dfa3732b4..2ad841cda0f5 100644 --- a/tools/topology/topology2/include/bench/eqfir_s32.conf +++ b/tools/topology/topology2/include/bench/eqfir_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh eqfir" Object.Widget.eqfir.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.eqfir.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/eqiir_hda_route.conf b/tools/topology/topology2/include/bench/eqiir_hda_route.conf deleted file mode 100644 index 5f066b741969..000000000000 --- a/tools/topology/topology2/include/bench/eqiir_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh eqiir" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'eqiir.1.1' - } - { - sink 'eqiir.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'eqiir.3.2' - } - { - source 'eqiir.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/eqiir_route.conf b/tools/topology/topology2/include/bench/eqiir_route.conf new file mode 100644 index 000000000000..c08418ff51da --- /dev/null +++ b/tools/topology/topology2/include/bench/eqiir_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh eqiir" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'eqiir.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'eqiir.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'eqiir.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'eqiir.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/eqiir_s16.conf b/tools/topology/topology2/include/bench/eqiir_s16.conf index bcb01383e3d5..a343fdae4d0d 100644 --- a/tools/topology/topology2/include/bench/eqiir_s16.conf +++ b/tools/topology/topology2/include/bench/eqiir_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh eqiir" Object.Widget.eqiir.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.eqiir.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/eqiir_s24.conf b/tools/topology/topology2/include/bench/eqiir_s24.conf index aa327545beec..00eb91a9c426 100644 --- a/tools/topology/topology2/include/bench/eqiir_s24.conf +++ b/tools/topology/topology2/include/bench/eqiir_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh eqiir" Object.Widget.eqiir.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.eqiir.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/eqiir_s32.conf b/tools/topology/topology2/include/bench/eqiir_s32.conf index c6bf9b4e0fb7..9e6d19bcecb0 100644 --- a/tools/topology/topology2/include/bench/eqiir_s32.conf +++ b/tools/topology/topology2/include/bench/eqiir_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh eqiir" Object.Widget.eqiir.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.eqiir.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/gain_hda_route.conf b/tools/topology/topology2/include/bench/gain_hda_route.conf deleted file mode 100644 index 9f4eb3a2bcab..000000000000 --- a/tools/topology/topology2/include/bench/gain_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh gain" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'gain.1.1' - } - { - sink 'gain.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'gain.3.2' - } - { - source 'gain.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/gain_route.conf b/tools/topology/topology2/include/bench/gain_route.conf new file mode 100644 index 000000000000..6c22cb63fbfb --- /dev/null +++ b/tools/topology/topology2/include/bench/gain_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh gain" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'gain.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'gain.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'gain.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'gain.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/gain_s16.conf b/tools/topology/topology2/include/bench/gain_s16.conf index 3c3098c48f7c..0d736ece9d9e 100644 --- a/tools/topology/topology2/include/bench/gain_s16.conf +++ b/tools/topology/topology2/include/bench/gain_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh gain" Object.Widget.gain.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.gain.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/gain_s24.conf b/tools/topology/topology2/include/bench/gain_s24.conf index cb9ba3f416fd..cd2d1809aea1 100644 --- a/tools/topology/topology2/include/bench/gain_s24.conf +++ b/tools/topology/topology2/include/bench/gain_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh gain" Object.Widget.gain.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.gain.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/gain_s32.conf b/tools/topology/topology2/include/bench/gain_s32.conf index a9607383f59c..afac93e97f1b 100644 --- a/tools/topology/topology2/include/bench/gain_s32.conf +++ b/tools/topology/topology2/include/bench/gain_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh gain" Object.Widget.gain.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.gain.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_multich_s32.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_multich_s32.conf similarity index 87% rename from tools/topology/topology2/include/bench/host_io_gateway_pipelines_multich_s32.conf rename to tools/topology/topology2/include/bench/host_gateway_pipelines_multich_s32.conf index 0be05491fe52..95c57c8a48af 100644 --- a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_multich_s32.conf +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_multich_s32.conf @@ -1,8 +1,7 @@ Object.Pipeline { host-gateway-playback [ { - index 1 - + index $BENCH_PLAYBACK_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_PLAYBACK_PCM pcm_id 0 @@ -218,44 +217,9 @@ } ] - io-gateway [ - { - index 2 - direction playback - - Object.Widget.dai-copier.1 { - node_type $HDA_LINK_OUTPUT_CLASS - stream_name $HDA_ANALOG_DAI_NAME - dai_type "HDA" - copier_type "HDA" - num_input_pins 1 - num_input_audio_formats 1 - num_output_audio_formats 1 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - in_channels 2 - in_ch_cfg $CHANNEL_CONFIG_STEREO - in_ch_map $CHANNEL_MAP_STEREO - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - out_channels 2 - out_ch_cfg $CHANNEL_CONFIG_STEREO - out_ch_map $CHANNEL_MAP_STEREO - } - ] - } - } - ] - host-gateway-capture [ { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_CAPTURE_PCM pcm_id 0 @@ -470,39 +434,5 @@ } } ] - - io-gateway-capture [ - { - index 4 - direction capture - - Object.Widget.dai-copier."1" { - dai_type "HDA" - type "dai_out" - copier_type "HDA" - stream_name $HDA_ANALOG_DAI_NAME - node_type $HDA_LINK_INPUT_CLASS - num_output_pins 1 - num_input_audio_formats 1 - num_output_audio_formats 1 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_STEREO - in_ch_map $CHANNEL_MAP_STEREO - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_STEREO - out_ch_map $CHANNEL_MAP_STEREO - } - ] - } - } - ] } diff --git a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s16.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_s16.conf similarity index 60% rename from tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s16.conf rename to tools/topology/topology2/include/bench/host_gateway_pipelines_s16.conf index 0cb65c2e21c9..317c42ce824b 100644 --- a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s16.conf +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_s16.conf @@ -1,39 +1,30 @@ Object.Pipeline { host-gateway-playback [ { - index 1 - + index $BENCH_PLAYBACK_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_PLAYBACK_PCM pcm_id 0 - - } - } - ] - - io-gateway [ - { - index 2 - direction playback - - Object.Widget.dai-copier.1 { - node_type $HDA_LINK_OUTPUT_CLASS - stream_name $HDA_ANALOG_DAI_NAME - dai_type "HDA" - copier_type "HDA" - num_input_pins 1 - num_input_audio_formats 1 + num_input_audio_formats 3 num_output_audio_formats 1 Object.Base.input_audio_format [ { in_bit_depth 16 in_valid_bit_depth 16 } + { + in_bit_depth 32 + in_valid_bit_depth 24 + } + { + in_bit_depth 32 + in_valid_bit_depth 32 + } ] Object.Base.output_audio_format [ { - out_bit_depth 32 - out_valid_bit_depth 32 + out_bit_depth 16 + out_valid_bit_depth 16 } ] } @@ -42,33 +33,16 @@ host-gateway-capture [ { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_CAPTURE_PCM pcm_id 0 - - } - } - ] - - io-gateway-capture [ - { - index 4 - direction capture - - Object.Widget.dai-copier."1" { - dai_type "HDA" - type "dai_out" - copier_type "HDA" - stream_name $HDA_ANALOG_DAI_NAME - node_type $HDA_LINK_INPUT_CLASS - num_output_pins 1 num_input_audio_formats 1 - num_output_audio_formats 1 + num_output_audio_formats 3 Object.Base.input_audio_format [ { - in_bit_depth 32 - in_valid_bit_depth 32 + in_bit_depth 16 + in_valid_bit_depth 16 } ] Object.Base.output_audio_format [ @@ -76,6 +50,14 @@ out_bit_depth 16 out_valid_bit_depth 16 } + { + out_bit_depth 32 + out_valid_bit_depth 24 + } + { + out_bit_depth 32 + out_valid_bit_depth 32 + } ] } } diff --git a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s24.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_s24.conf similarity index 60% rename from tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s24.conf rename to tools/topology/topology2/include/bench/host_gateway_pipelines_s24.conf index 8da4d8410273..4f2a17a5f0e5 100644 --- a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s24.conf +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_s24.conf @@ -1,39 +1,30 @@ Object.Pipeline { host-gateway-playback [ { - index 1 - + index $BENCH_PLAYBACK_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_PLAYBACK_PCM pcm_id 0 - - } - } - ] - - io-gateway [ - { - index 2 - direction playback - - Object.Widget.dai-copier.1 { - node_type $HDA_LINK_OUTPUT_CLASS - stream_name $HDA_ANALOG_DAI_NAME - dai_type "HDA" - copier_type "HDA" - num_input_pins 1 - num_input_audio_formats 1 + num_input_audio_formats 3 num_output_audio_formats 1 Object.Base.input_audio_format [ + { + in_bit_depth 16 + in_valid_bit_depth 16 + } { in_bit_depth 32 in_valid_bit_depth 24 } + { + in_bit_depth 32 + in_valid_bit_depth 32 + } ] Object.Base.output_audio_format [ { out_bit_depth 32 - out_valid_bit_depth 32 + out_valid_bit_depth 24 } ] } @@ -42,40 +33,31 @@ host-gateway-capture [ { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_CAPTURE_PCM pcm_id 0 - - } - } - ] - - io-gateway-capture [ - { - index 4 - direction capture - - Object.Widget.dai-copier."1" { - dai_type "HDA" - type "dai_out" - copier_type "HDA" - stream_name $HDA_ANALOG_DAI_NAME - node_type $HDA_LINK_INPUT_CLASS - num_output_pins 1 num_input_audio_formats 1 - num_output_audio_formats 1 + num_output_audio_formats 3 Object.Base.input_audio_format [ { in_bit_depth 32 - in_valid_bit_depth 32 + in_valid_bit_depth 24 } ] Object.Base.output_audio_format [ + { + out_bit_depth 16 + out_valid_bit_depth 16 + } { out_bit_depth 32 out_valid_bit_depth 24 } + { + out_bit_depth 32 + out_valid_bit_depth 32 + } ] } } diff --git a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s32.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_s32.conf similarity index 60% rename from tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s32.conf rename to tools/topology/topology2/include/bench/host_gateway_pipelines_s32.conf index d82273e2a803..4ee80bf7c0a9 100644 --- a/tools/topology/topology2/include/bench/host_io_gateway_pipelines_src_s32.conf +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_s32.conf @@ -1,30 +1,21 @@ Object.Pipeline { host-gateway-playback [ { - index 1 - + index $BENCH_PLAYBACK_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_PLAYBACK_PCM pcm_id 0 - - } - } - ] - - io-gateway [ - { - index 2 - direction playback - - Object.Widget.dai-copier.1 { - node_type $HDA_LINK_OUTPUT_CLASS - stream_name $HDA_ANALOG_DAI_NAME - dai_type "HDA" - copier_type "HDA" - num_input_pins 1 - num_input_audio_formats 1 + num_input_audio_formats 3 num_output_audio_formats 1 Object.Base.input_audio_format [ + { + in_bit_depth 16 + in_valid_bit_depth 16 + } + { + in_bit_depth 32 + in_valid_bit_depth 24 + } { in_bit_depth 32 in_valid_bit_depth 32 @@ -42,29 +33,12 @@ host-gateway-capture [ { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE Object.Widget.host-copier.1 { stream_name $ANALOG_CAPTURE_PCM pcm_id 0 - - } - } - ] - - io-gateway-capture [ - { - index 4 - direction capture - - Object.Widget.dai-copier."1" { - dai_type "HDA" - type "dai_out" - copier_type "HDA" - stream_name $HDA_ANALOG_DAI_NAME - node_type $HDA_LINK_INPUT_CLASS - num_output_pins 1 num_input_audio_formats 1 - num_output_audio_formats 1 + num_output_audio_formats 3 Object.Base.input_audio_format [ { in_bit_depth 32 @@ -72,6 +46,14 @@ } ] Object.Base.output_audio_format [ + { + out_bit_depth 16 + out_valid_bit_depth 16 + } + { + out_bit_depth 32 + out_valid_bit_depth 24 + } { out_bit_depth 32 out_valid_bit_depth 32 diff --git a/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s16.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s16.conf new file mode 100644 index 000000000000..88526649833e --- /dev/null +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s16.conf @@ -0,0 +1,24 @@ + Object.Pipeline { + host-gateway-playback [ + { + index $BENCH_PLAYBACK_HOST_PIPELINE + Object.Widget.host-copier.1 { + stream_name $ANALOG_PLAYBACK_PCM + pcm_id 0 + + } + } + ] + + host-gateway-capture [ + { + index $BENCH_CAPTURE_HOST_PIPELINE + Object.Widget.host-copier.1 { + stream_name $ANALOG_CAPTURE_PCM + pcm_id 0 + + } + } + ] + } + diff --git a/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s24.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s24.conf new file mode 100644 index 000000000000..c8b259281c4e --- /dev/null +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s24.conf @@ -0,0 +1,24 @@ + Object.Pipeline { + host-gateway-playback [ + { + index $BENCH_PLAYBACK_HOST_PIPELINE + Object.Widget.host-copier.1 { + stream_name $ANALOG_PLAYBACK_PCM + pcm_id 0 + + } + } + ] + + host-gateway-capture [ + { + index $BENCH_CAPTURE_HOST_PIPELINE + Object.Widget.host-copier.1 { + stream_name $ANALOG_CAPTURE_PCM + pcm_id 0 + + } + } + ] + } + diff --git a/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s32.conf b/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s32.conf new file mode 100644 index 000000000000..bd6c82c6b479 --- /dev/null +++ b/tools/topology/topology2/include/bench/host_gateway_pipelines_src_s32.conf @@ -0,0 +1,24 @@ + Object.Pipeline { + host-gateway-playback [ + { + index $BENCH_PLAYBACK_HOST_PIPELINE + Object.Widget.host-copier.1 { + stream_name $ANALOG_PLAYBACK_PCM + pcm_id 0 + + } + } + ] + + host-gateway-capture [ + { + index $BENCH_CAPTURE_HOST_PIPELINE + Object.Widget.host-copier.1 { + stream_name $ANALOG_CAPTURE_PCM + pcm_id 0 + + } + } + ] + } + diff --git a/tools/topology/topology2/include/bench/igo_nr_hda_route.conf b/tools/topology/topology2/include/bench/igo_nr_hda_route.conf deleted file mode 100644 index a5d08cf3229f..000000000000 --- a/tools/topology/topology2/include/bench/igo_nr_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh igo_nr" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'igo_nr.1.1' - } - { - sink 'igo_nr.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'igo_nr.3.2' - } - { - source 'igo_nr.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/igo_nr_route.conf b/tools/topology/topology2/include/bench/igo_nr_route.conf new file mode 100644 index 000000000000..be977194fe9e --- /dev/null +++ b/tools/topology/topology2/include/bench/igo_nr_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh igo_nr" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'igo_nr.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'igo_nr.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'igo_nr.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'igo_nr.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/igo_nr_s16.conf b/tools/topology/topology2/include/bench/igo_nr_s16.conf index 944b905409ec..6704a9803abc 100644 --- a/tools/topology/topology2/include/bench/igo_nr_s16.conf +++ b/tools/topology/topology2/include/bench/igo_nr_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh igo_nr" Object.Widget.igo_nr.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.igo_nr.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/igo_nr_s24.conf b/tools/topology/topology2/include/bench/igo_nr_s24.conf index 40963c48b5eb..84ef21346784 100644 --- a/tools/topology/topology2/include/bench/igo_nr_s24.conf +++ b/tools/topology/topology2/include/bench/igo_nr_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh igo_nr" Object.Widget.igo_nr.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.igo_nr.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/igo_nr_s32.conf b/tools/topology/topology2/include/bench/igo_nr_s32.conf index ff81fe8e5ed8..5582b7349462 100644 --- a/tools/topology/topology2/include/bench/igo_nr_s32.conf +++ b/tools/topology/topology2/include/bench/igo_nr_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh igo_nr" Object.Widget.igo_nr.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.igo_nr.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/micsel_multich_s32.conf b/tools/topology/topology2/include/bench/micsel_multich_s32.conf index 936b9ce77d30..30ad60ccb76e 100644 --- a/tools/topology/topology2/include/bench/micsel_multich_s32.conf +++ b/tools/topology/topology2/include/bench/micsel_multich_s32.conf @@ -134,5 +134,5 @@ ] } - - + + diff --git a/tools/topology/topology2/include/bench/micsel_route.conf b/tools/topology/topology2/include/bench/micsel_route.conf new file mode 100644 index 000000000000..1164ddb2e694 --- /dev/null +++ b/tools/topology/topology2/include/bench/micsel_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh micsel" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'micsel.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'micsel.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'micsel.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'micsel.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/micsel_s16.conf b/tools/topology/topology2/include/bench/micsel_s16.conf index 04e46696bb06..a807f8695ad8 100644 --- a/tools/topology/topology2/include/bench/micsel_s16.conf +++ b/tools/topology/topology2/include/bench/micsel_s16.conf @@ -9,5 +9,5 @@ } - - + + diff --git a/tools/topology/topology2/include/bench/micsel_s24.conf b/tools/topology/topology2/include/bench/micsel_s24.conf index 6e45d6cf8447..3823935c1db3 100644 --- a/tools/topology/topology2/include/bench/micsel_s24.conf +++ b/tools/topology/topology2/include/bench/micsel_s24.conf @@ -9,5 +9,5 @@ } - - + + diff --git a/tools/topology/topology2/include/bench/micsel_s32.conf b/tools/topology/topology2/include/bench/micsel_s32.conf index 11c2f559f67f..fe1e8cc556e6 100644 --- a/tools/topology/topology2/include/bench/micsel_s32.conf +++ b/tools/topology/topology2/include/bench/micsel_s32.conf @@ -9,5 +9,5 @@ } - - + + diff --git a/tools/topology/topology2/include/bench/multiband_drc_hda_route.conf b/tools/topology/topology2/include/bench/multiband_drc_hda_route.conf deleted file mode 100644 index 41a218510856..000000000000 --- a/tools/topology/topology2/include/bench/multiband_drc_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh multiband_drc" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'multiband_drc.1.1' - } - { - sink 'multiband_drc.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'multiband_drc.3.2' - } - { - source 'multiband_drc.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/multiband_drc_route.conf b/tools/topology/topology2/include/bench/multiband_drc_route.conf new file mode 100644 index 000000000000..1a59ed86f982 --- /dev/null +++ b/tools/topology/topology2/include/bench/multiband_drc_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh multiband_drc" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'multiband_drc.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'multiband_drc.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'multiband_drc.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'multiband_drc.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/multiband_drc_s16.conf b/tools/topology/topology2/include/bench/multiband_drc_s16.conf index cc36cb8ab341..f29665f35799 100644 --- a/tools/topology/topology2/include/bench/multiband_drc_s16.conf +++ b/tools/topology/topology2/include/bench/multiband_drc_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh multiband_drc" Object.Widget.multiband_drc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.multiband_drc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/multiband_drc_s24.conf b/tools/topology/topology2/include/bench/multiband_drc_s24.conf index 93f9e33d1416..110258f4c866 100644 --- a/tools/topology/topology2/include/bench/multiband_drc_s24.conf +++ b/tools/topology/topology2/include/bench/multiband_drc_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh multiband_drc" Object.Widget.multiband_drc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.multiband_drc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/multiband_drc_s32.conf b/tools/topology/topology2/include/bench/multiband_drc_s32.conf index 3d2aadab0924..8bf433fbe94f 100644 --- a/tools/topology/topology2/include/bench/multiband_drc_s32.conf +++ b/tools/topology/topology2/include/bench/multiband_drc_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh multiband_drc" Object.Widget.multiband_drc.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.multiband_drc.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/rtnr_hda_route.conf b/tools/topology/topology2/include/bench/rtnr_hda_route.conf deleted file mode 100644 index 71f6de968f1b..000000000000 --- a/tools/topology/topology2/include/bench/rtnr_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh rtnr" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'rtnr.1.1' - } - { - sink 'rtnr.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'rtnr.3.2' - } - { - source 'rtnr.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/rtnr_route.conf b/tools/topology/topology2/include/bench/rtnr_route.conf new file mode 100644 index 000000000000..9238049baf79 --- /dev/null +++ b/tools/topology/topology2/include/bench/rtnr_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh rtnr" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'rtnr.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'rtnr.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'rtnr.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'rtnr.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/rtnr_s16.conf b/tools/topology/topology2/include/bench/rtnr_s16.conf index 94dd01873a18..e30c3843bf08 100644 --- a/tools/topology/topology2/include/bench/rtnr_s16.conf +++ b/tools/topology/topology2/include/bench/rtnr_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh rtnr" Object.Widget.rtnr.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.rtnr.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/rtnr_s24.conf b/tools/topology/topology2/include/bench/rtnr_s24.conf index 1a1475ee02a1..bcd9d2443e53 100644 --- a/tools/topology/topology2/include/bench/rtnr_s24.conf +++ b/tools/topology/topology2/include/bench/rtnr_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh rtnr" Object.Widget.rtnr.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.rtnr.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/rtnr_s32.conf b/tools/topology/topology2/include/bench/rtnr_s32.conf index b03d77b80b4a..239294c41afd 100644 --- a/tools/topology/topology2/include/bench/rtnr_s32.conf +++ b/tools/topology/topology2/include/bench/rtnr_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh rtnr" Object.Widget.rtnr.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.rtnr.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/src_hda_route.conf b/tools/topology/topology2/include/bench/src_hda_route.conf deleted file mode 100644 index 1c72c0f0601e..000000000000 --- a/tools/topology/topology2/include/bench/src_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh src" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'src.1.1' - } - { - sink 'src.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'src.3.2' - } - { - source 'src.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/src_lite_hda_route.conf b/tools/topology/topology2/include/bench/src_lite_hda_route.conf deleted file mode 100644 index 3e3f03b02aa2..000000000000 --- a/tools/topology/topology2/include/bench/src_lite_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh src_lite" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'src_lite.1.1' - } - { - sink 'src_lite.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'src_lite.3.2' - } - { - source 'src_lite.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/src_lite_route.conf b/tools/topology/topology2/include/bench/src_lite_route.conf new file mode 100644 index 000000000000..65713b5e62be --- /dev/null +++ b/tools/topology/topology2/include/bench/src_lite_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh src_lite" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'src_lite.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'src_lite.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'src_lite.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'src_lite.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/src_lite_s16.conf b/tools/topology/topology2/include/bench/src_lite_s16.conf index fdf803739ec4..559d47a1af4b 100644 --- a/tools/topology/topology2/include/bench/src_lite_s16.conf +++ b/tools/topology/topology2/include/bench/src_lite_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh src_lite" Object.Widget.src_lite.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE rate_out 48000 } Object.Widget.src_lite.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE rate_in 48000 } - - + + diff --git a/tools/topology/topology2/include/bench/src_lite_s24.conf b/tools/topology/topology2/include/bench/src_lite_s24.conf index eab349d84739..319a5e8d3475 100644 --- a/tools/topology/topology2/include/bench/src_lite_s24.conf +++ b/tools/topology/topology2/include/bench/src_lite_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh src_lite" Object.Widget.src_lite.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE rate_out 48000 } Object.Widget.src_lite.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE rate_in 48000 } - - + + diff --git a/tools/topology/topology2/include/bench/src_lite_s32.conf b/tools/topology/topology2/include/bench/src_lite_s32.conf index 33406cc0e45d..8339d191e39a 100644 --- a/tools/topology/topology2/include/bench/src_lite_s32.conf +++ b/tools/topology/topology2/include/bench/src_lite_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh src_lite" Object.Widget.src_lite.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE rate_out 48000 } Object.Widget.src_lite.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE rate_in 48000 } - - + + diff --git a/tools/topology/topology2/include/bench/src_route.conf b/tools/topology/topology2/include/bench/src_route.conf new file mode 100644 index 000000000000..aac36eb913df --- /dev/null +++ b/tools/topology/topology2/include/bench/src_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh src" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'src.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'src.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'src.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'src.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/src_s16.conf b/tools/topology/topology2/include/bench/src_s16.conf index 7c8568c88f3c..73a84b407be4 100644 --- a/tools/topology/topology2/include/bench/src_s16.conf +++ b/tools/topology/topology2/include/bench/src_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh src" Object.Widget.src.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE rate_out 48000 } Object.Widget.src.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE rate_in 48000 } - - + + diff --git a/tools/topology/topology2/include/bench/src_s24.conf b/tools/topology/topology2/include/bench/src_s24.conf index e16d2047aa49..355411b644eb 100644 --- a/tools/topology/topology2/include/bench/src_s24.conf +++ b/tools/topology/topology2/include/bench/src_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh src" Object.Widget.src.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE rate_out 48000 } Object.Widget.src.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE rate_in 48000 } - - + + diff --git a/tools/topology/topology2/include/bench/src_s32.conf b/tools/topology/topology2/include/bench/src_s32.conf index 3f2fa413d2bb..4262fa535d2b 100644 --- a/tools/topology/topology2/include/bench/src_s32.conf +++ b/tools/topology/topology2/include/bench/src_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh src" Object.Widget.src.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE rate_out 48000 } Object.Widget.src.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE rate_in 48000 } - - + + diff --git a/tools/topology/topology2/include/bench/tdfb_hda_route.conf b/tools/topology/topology2/include/bench/tdfb_hda_route.conf deleted file mode 100644 index a78857d44b64..000000000000 --- a/tools/topology/topology2/include/bench/tdfb_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh tdfb" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'tdfb.1.1' - } - { - sink 'tdfb.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'tdfb.3.2' - } - { - source 'tdfb.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/tdfb_route.conf b/tools/topology/topology2/include/bench/tdfb_route.conf new file mode 100644 index 000000000000..809dd627d6de --- /dev/null +++ b/tools/topology/topology2/include/bench/tdfb_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh tdfb" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'tdfb.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'tdfb.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'tdfb.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'tdfb.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/tdfb_s16.conf b/tools/topology/topology2/include/bench/tdfb_s16.conf index c2b1abd253eb..d08eea403981 100644 --- a/tools/topology/topology2/include/bench/tdfb_s16.conf +++ b/tools/topology/topology2/include/bench/tdfb_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh tdfb" Object.Widget.tdfb.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.tdfb.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/tdfb_s24.conf b/tools/topology/topology2/include/bench/tdfb_s24.conf index f57bdea003f1..418e48b53c04 100644 --- a/tools/topology/topology2/include/bench/tdfb_s24.conf +++ b/tools/topology/topology2/include/bench/tdfb_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh tdfb" Object.Widget.tdfb.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.tdfb.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/tdfb_s32.conf b/tools/topology/topology2/include/bench/tdfb_s32.conf index 5c74b11c1036..95e36dfdff34 100644 --- a/tools/topology/topology2/include/bench/tdfb_s32.conf +++ b/tools/topology/topology2/include/bench/tdfb_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh tdfb" Object.Widget.tdfb.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.tdfb.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/template_comp_hda_route.conf b/tools/topology/topology2/include/bench/template_comp_hda_route.conf deleted file mode 100644 index de1d0f55ca64..000000000000 --- a/tools/topology/topology2/include/bench/template_comp_hda_route.conf +++ /dev/null @@ -1,19 +0,0 @@ - # Created with script "./bench_comp_generate.sh template_comp" - Object.Base.route [ - { - sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback' - source 'template_comp.1.1' - } - { - sink 'template_comp.1.1' - source 'host-copier.0.playback' - } - { - source 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.capture' - sink 'template_comp.3.2' - } - { - source 'template_comp.3.2' - sink 'host-copier.0.capture' - } - ] diff --git a/tools/topology/topology2/include/bench/template_comp_route.conf b/tools/topology/topology2/include/bench/template_comp_route.conf new file mode 100644 index 000000000000..9fe72d672489 --- /dev/null +++ b/tools/topology/topology2/include/bench/template_comp_route.conf @@ -0,0 +1,19 @@ + # Created with script "./bench_comp_generate.sh template_comp" + Object.Base.route [ + { + sink '$BENCH_PLAYBACK_DAI_COPIER' + source 'template_comp.$BENCH_PLAYBACK_HOST_PIPELINE.1' + } + { + sink 'template_comp.$BENCH_PLAYBACK_HOST_PIPELINE.1' + source 'host-copier.0.playback' + } + { + source '$BENCH_CAPTURE_DAI_COPIER' + sink 'template_comp.$BENCH_CAPTURE_HOST_PIPELINE.2' + } + { + source 'template_comp.$BENCH_CAPTURE_HOST_PIPELINE.2' + sink 'host-copier.0.capture' + } + ] diff --git a/tools/topology/topology2/include/bench/template_comp_s16.conf b/tools/topology/topology2/include/bench/template_comp_s16.conf index 5fe3e6fdec61..57ab83eca6fa 100644 --- a/tools/topology/topology2/include/bench/template_comp_s16.conf +++ b/tools/topology/topology2/include/bench/template_comp_s16.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh template_comp" Object.Widget.template_comp.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.template_comp.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/template_comp_s24.conf b/tools/topology/topology2/include/bench/template_comp_s24.conf index 8ef790a80c96..83573abf19fe 100644 --- a/tools/topology/topology2/include/bench/template_comp_s24.conf +++ b/tools/topology/topology2/include/bench/template_comp_s24.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh template_comp" Object.Widget.template_comp.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.template_comp.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/include/bench/template_comp_s32.conf b/tools/topology/topology2/include/bench/template_comp_s32.conf index eff186e68b63..e05a346b82d7 100644 --- a/tools/topology/topology2/include/bench/template_comp_s32.conf +++ b/tools/topology/topology2/include/bench/template_comp_s32.conf @@ -1,13 +1,13 @@ # Created with script "./bench_comp_generate.sh template_comp" Object.Widget.template_comp.1 { - index 1 + index $BENCH_PLAYBACK_HOST_PIPELINE } Object.Widget.template_comp.2 { - index 3 + index $BENCH_CAPTURE_HOST_PIPELINE } - - + + diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index 022de4ce5c18..a84eae3fd27f 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -66,7 +66,6 @@ IncludeByKey.HDA_CONFIG { "mix" "cavs-mixin-mixout-hda.conf" "efx" "cavs-mixin-mixout-efx-hda.conf" "src" "cavs-src-mixin-mixout-hda.conf" - "benchmark" "cavs-benchmark-hda.conf" "passthrough" "cavs-passthrough-hda.conf" }