Tools: Topology2: Add sof-hda-benchmark-eqiir16/24/32-tgl generate

This patch adds IIR EQ topologies build. Signed-off-by: Seppo Ingalsuo <[email protected]>
thesofproject · Oct 13, 2023 · 311c030 · 311c030
1 parent 501816a
commit 311c030
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 0 deletions.
diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf
@@ -211,4 +211,20 @@ IncludeByKey.BENCH_CONFIG {
 	"drc32" {
 		<include/bench/drc_s32.conf>
 	}
+
+	#
+	# EQIIR component
+	#
+
+	"eqiir16" {
+		<include/bench/eqiir_s16.conf>
+	}
+
+	"eqiir24" {
+		<include/bench/eqiir_s24.conf>
+	}
+
+	"eqiir32" {
+		<include/bench/eqiir_s32.conf>
+	}
 }
diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake
@@ -127,6 +127,9 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-mtl-lbm.bin"
 "sof-hda-generic\;sof-hda-benchmark-drc16-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=drc16,BENCH_DRC_PARAMS=enabled"
 "sof-hda-generic\;sof-hda-benchmark-drc24-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=drc24,BENCH_DRC_PARAMS=enabled"
 "sof-hda-generic\;sof-hda-benchmark-drc32-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,BENCH_CONFIG=drc32,BENCH_DRC_PARAMS=enabled"
+"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"
 
 # Topology to test IPC4 Crossover
 "development/cavs-nocodec-crossover\;sof-tgl-nocodec-crossover-2way\;PLATFORM=tgl,\

diff --git a/tools/topology/topology2/include/bench/eqiir_control_bytes_capture.conf b/tools/topology/topology2/include/bench/eqiir_control_bytes_capture.conf
@@ -0,0 +1,9 @@
+			# Created initially with script "./bench_comp_generate.sh eqiir"
+			# may need edits to modify controls
+			Object.Control.bytes."1" {
+				name '$ANALOG_CAPTURE_PCM EQIIR bytes'
+				IncludeByKey.BENCH_EQIIR_PARAMS {
+					"default" "include/components/eqiir/default.conf"
+					"highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf"
+				}
+			}
diff --git a/tools/topology/topology2/include/bench/eqiir_control_bytes_playback.conf b/tools/topology/topology2/include/bench/eqiir_control_bytes_playback.conf
@@ -0,0 +1,9 @@
+			# Created initially with script "./bench_comp_generate.sh eqiir"
+			# may need edits to modify controls
+			Object.Control.bytes."1" {
+				name '$ANALOG_PLAYBACK_PCM EQIIR bytes'
+				IncludeByKey.BENCH_EQIIR_PARAMS {
+					"default" "include/components/eqiir/default.conf"
+					"highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf"
+				}
+			}
diff --git a/tools/topology/topology2/include/bench/eqiir_hda_route.conf b/tools/topology/topology2/include/bench/eqiir_hda_route.conf
@@ -0,0 +1,19 @@
+		# 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_s16.conf b/tools/topology/topology2/include/bench/eqiir_s16.conf
@@ -0,0 +1,13 @@
+		# Created with script "./bench_comp_generate.sh eqiir"
+		Object.Widget.eqiir.1 {
+			index 1
+			<include/bench/one_input_output_format_s16.conf>
+			<include/bench/eqiir_control_bytes_playback.conf>
+		}
+		Object.Widget.eqiir.2 {
+			index 3
+			<include/bench/one_input_output_format_s16.conf>
+			<include/bench/eqiir_control_bytes_capture.conf>
+		}
+		<include/bench/host_io_gateway_pipelines_s16.conf>
+		<include/bench/eqiir_hda_route.conf>
diff --git a/tools/topology/topology2/include/bench/eqiir_s24.conf b/tools/topology/topology2/include/bench/eqiir_s24.conf
@@ -0,0 +1,13 @@
+		# Created with script "./bench_comp_generate.sh eqiir"
+		Object.Widget.eqiir.1 {
+			index 1
+			<include/bench/one_input_output_format_s24.conf>
+			<include/bench/eqiir_control_bytes_playback.conf>
+		}
+		Object.Widget.eqiir.2 {
+			index 3
+			<include/bench/one_input_output_format_s24.conf>
+			<include/bench/eqiir_control_bytes_capture.conf>
+		}
+		<include/bench/host_io_gateway_pipelines_s24.conf>
+		<include/bench/eqiir_hda_route.conf>
diff --git a/tools/topology/topology2/include/bench/eqiir_s32.conf b/tools/topology/topology2/include/bench/eqiir_s32.conf
@@ -0,0 +1,13 @@
+		# Created with script "./bench_comp_generate.sh eqiir"
+		Object.Widget.eqiir.1 {
+			index 1
+			<include/bench/one_input_output_format_s32.conf>
+			<include/bench/eqiir_control_bytes_playback.conf>
+		}
+		Object.Widget.eqiir.2 {
+			index 3
+			<include/bench/one_input_output_format_s32.conf>
+			<include/bench/eqiir_control_bytes_capture.conf>
+		}
+		<include/bench/host_io_gateway_pipelines_s32.conf>
+		<include/bench/eqiir_hda_route.conf>