Tools: Topology2: Add sof-hda-benchmark-eqfir16/24/32-tgl build

This patch adds FIR EQ topologies build. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
thesofproject · Oct 13, 2023 · df8f9df · df8f9df
1 parent 311c030
commit df8f9df
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 0 deletions.
diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf
@@ -212,6 +212,22 @@ IncludeByKey.BENCH_CONFIG {
 		<include/bench/drc_s32.conf>
 	}
 
+	#
+	# EQFIR component
+	#
+
+	"eqfir16" {
+		<include/bench/eqfir_s16.conf>
+	}
+
+	"eqfir24" {
+		<include/bench/eqfir_s24.conf>
+	}
+
+	"eqfir32" {
+		<include/bench/eqfir_s32.conf>
+	}
+
 	#
 	# EQIIR component
 	#

diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake
@@ -130,6 +130,9 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-mtl-lbm.bin"
 "sof-hda-generic\;sof-hda-benchmark-eqiir16-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=eqiir16,BENCH_EQIIR_PARAMS=highpass_50hz_0db_48khz"
 "sof-hda-generic\;sof-hda-benchmark-eqiir24-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=eqiir24,BENCH_EQIIR_PARAMS=highpass_50hz_0db_48khz"
 "sof-hda-generic\;sof-hda-benchmark-eqiir32-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=eqiir32,BENCH_EQIIR_PARAMS=highpass_50hz_0db_48khz"
+"sof-hda-generic\;sof-hda-benchmark-eqfir16-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=eqfir16,BENCH_EQFIR_PARAMS=loudness"
+"sof-hda-generic\;sof-hda-benchmark-eqfir24-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=eqfir24,BENCH_EQFIR_PARAMS=loudness"
+"sof-hda-generic\;sof-hda-benchmark-eqfir32-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=eqfir32,BENCH_EQFIR_PARAMS=loudness"
 
 # Topology to test IPC4 Crossover
 "development/cavs-nocodec-crossover\;sof-tgl-nocodec-crossover-2way\;PLATFORM=tgl,\

diff --git a/tools/topology/topology2/include/bench/eqfir_control_bytes_capture.conf b/tools/topology/topology2/include/bench/eqfir_control_bytes_capture.conf
@@ -0,0 +1,10 @@
+			# Created initially with script "./bench_comp_generate.sh eqfir"
+			# may need edits to modify controls
+			Object.Control.bytes."1" {
+				name '$ANALOG_CAPTURE_PCM EQFIR bytes'
+				IncludeByKey.BENCH_EQFIR_PARAMS {
+					"default" "include/components/eqfir/default.conf"
+					"loudness" "include/components/eqfir/loudness.conf"
+					"passthrough" "include/components/eqfir/passthrough.conf"
+				}
+			}
diff --git a/tools/topology/topology2/include/bench/eqfir_control_bytes_playback.conf b/tools/topology/topology2/include/bench/eqfir_control_bytes_playback.conf
@@ -0,0 +1,10 @@
+			# Created initially with script "./bench_comp_generate.sh eqfir"
+			# may need edits to modify controls
+			Object.Control.bytes."1" {
+				name '$ANALOG_PLAYBACK_PCM EQFIR bytes'
+				IncludeByKey.BENCH_EQFIR_PARAMS {
+					"default" "include/components/eqfir/default.conf"
+					"loudness" "include/components/eqfir/loudness.conf"
+					"passthrough" "include/components/eqfir/passthrough.conf"
+				}
+			}
diff --git a/tools/topology/topology2/include/bench/eqfir_hda_route.conf b/tools/topology/topology2/include/bench/eqfir_hda_route.conf
@@ -0,0 +1,19 @@
+		# 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_s16.conf b/tools/topology/topology2/include/bench/eqfir_s16.conf
@@ -0,0 +1,13 @@
+		# Created with script "./bench_comp_generate.sh eqfir"
+		Object.Widget.eqfir.1 {
+			index 1
+			<include/bench/one_input_output_format_s16.conf>
+			<include/bench/eqfir_control_bytes_playback.conf>
+		}
+		Object.Widget.eqfir.2 {
+			index 3
+			<include/bench/one_input_output_format_s16.conf>
+			<include/bench/eqfir_control_bytes_capture.conf>
+		}
+		<include/bench/host_io_gateway_pipelines_s16.conf>
+		<include/bench/eqfir_hda_route.conf>
diff --git a/tools/topology/topology2/include/bench/eqfir_s24.conf b/tools/topology/topology2/include/bench/eqfir_s24.conf
@@ -0,0 +1,13 @@
+		# Created with script "./bench_comp_generate.sh eqfir"
+		Object.Widget.eqfir.1 {
+			index 1
+			<include/bench/one_input_output_format_s24.conf>
+			<include/bench/eqfir_control_bytes_playback.conf>
+		}
+		Object.Widget.eqfir.2 {
+			index 3
+			<include/bench/one_input_output_format_s24.conf>
+			<include/bench/eqfir_control_bytes_capture.conf>
+		}
+		<include/bench/host_io_gateway_pipelines_s24.conf>
+		<include/bench/eqfir_hda_route.conf>
diff --git a/tools/topology/topology2/include/bench/eqfir_s32.conf b/tools/topology/topology2/include/bench/eqfir_s32.conf
@@ -0,0 +1,13 @@
+		# Created with script "./bench_comp_generate.sh eqfir"
+		Object.Widget.eqfir.1 {
+			index 1
+			<include/bench/one_input_output_format_s32.conf>
+			<include/bench/eqfir_control_bytes_playback.conf>
+		}
+		Object.Widget.eqfir.2 {
+			index 3
+			<include/bench/one_input_output_format_s32.conf>
+			<include/bench/eqfir_control_bytes_capture.conf>
+		}
+		<include/bench/host_io_gateway_pipelines_s32.conf>
+		<include/bench/eqfir_hda_route.conf>