Volume: Change volume build based on HIFI_VERSION

btian1 · btian1 · commit 818ecfd90b2d · 2024-01-04T11:31:13.000+08:00
Previously, volume version selection is based on xtensa toolchain,
this change makes volume version select based on preprocessed build
environment variable HIFI_VERSION as default, it also can be selected
with menuconfig with this patch.

Signed-off-by: Baofeng Tian &lt;baofeng.tian@intel.com&gt;
diff --git a/src/audio/volume/Kconfig b/src/audio/volume/Kconfig
@@ -76,4 +76,29 @@ config COMP_GAIN
 	  This option enables gain to change volume. It works
 	  as peak volume without updating peak vol to host
 
-endif # volume
+choice "VOLUME_HIFI_VERSION_SELECT"
+	prompt "choose which hifi version used for volume module"
+	default VOLUME_HIFI4 if "$(HIFI_VERSION)" = "4"
+	default VOLUME_HIFI3 if "$(HIFI_VERSION)" = "3"
+	default VOLUME_GENERIC if "$(HIFI_VERSION)" = "generic" || "$(HIFI_VERSION)" = ""
+
+	config VOLUME_HIFI4
+		prompt "choose hifi4 instruction set for volume module"
+		bool
+		help
+			This option used to build HIFI4 optimized volume code
+
+	config VOLUME_HIFI3
+		prompt "choose hifi3 instruction set for volume module"
+		bool
+		help
+			This option used to build HIFI3 optimized volume code
+
+	config VOLUME_GENERIC
+		prompt "no hifi version selected for volume module"
+		bool
+		help
+			This option used to build volume generic code.
+endchoice
+
+endif # volume
diff --git a/src/audio/volume/volume.c b/src/audio/volume/volume.c
@@ -587,7 +587,7 @@ static int volume_process(struct processing_module *mod,
 		cd->peak_cnt = 0;
 		peak_vol_update(cd);
 		memset(cd->peak_regs.peak_meter, 0, sizeof(cd->peak_regs.peak_meter));
-#ifdef VOLUME_HIFI4
+#if CONFIG_VOLUME_HIFI4
 		memset(cd->peak_vol, 0, sizeof(int32_t) * SOF_IPC_MAX_CHANNELS * 4);
 #endif
 	}
diff --git a/src/audio/volume/volume.h b/src/audio/volume/volume.h
@@ -36,15 +36,6 @@ struct sof_ipc_ctrl_value_chan;
 
 #if defined(__XCC__)
 # include <xtensa/config/core-isa.h>
-# if XCHAL_HAVE_HIFI4
-#  define VOLUME_HIFI4
-# elif XCHAL_HAVE_HIFI3
-#  define VOLUME_HIFI3
-# else
-#  define VOLUME_GENERIC
-# endif
-#else
-# define VOLUME_GENERIC
 #endif
 
 /**
diff --git a/src/audio/volume/volume_generic.c b/src/audio/volume/volume_generic.c
@@ -27,7 +27,7 @@ LOG_MODULE_DECLARE(volume_generic, CONFIG_SOF_LOG_LEVEL);
 
 #include "volume.h"
 
-#ifdef VOLUME_GENERIC
+#if CONFIG_VOLUME_GENERIC
 
 #if (!CONFIG_COMP_PEAK_VOL)
 
diff --git a/src/audio/volume/volume_generic_with_peakvol.c b/src/audio/volume/volume_generic_with_peakvol.c
@@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(volume_generic, CONFIG_SOF_LOG_LEVEL);
 
 #include "volume.h"
 
-#ifdef VOLUME_GENERIC
+#if CONFIG_VOLUME_GENERIC
 
 #if CONFIG_COMP_PEAK_VOL
 
diff --git a/src/audio/volume/volume_hifi3.c b/src/audio/volume/volume_hifi3.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(volume_hifi3, CONFIG_SOF_LOG_LEVEL);
 
 #include "volume.h"
 
-#ifdef VOLUME_HIFI3
+#if CONFIG_VOLUME_HIFI3
 
 #if (!CONFIG_COMP_PEAK_VOL)
 
diff --git a/src/audio/volume/volume_hifi3_with_peakvol.c b/src/audio/volume/volume_hifi3_with_peakvol.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(volume_hifi3, CONFIG_SOF_LOG_LEVEL);
 
 #include "volume.h"
 
-#ifdef VOLUME_HIFI3
+#if CONFIG_VOLUME_HIFI3
 
 #if CONFIG_COMP_PEAK_VOL
 
diff --git a/src/audio/volume/volume_hifi4.c b/src/audio/volume/volume_hifi4.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(volume_hifi4, CONFIG_SOF_LOG_LEVEL);
 
 #include "volume.h"
 
-#ifdef VOLUME_HIFI4
+#if CONFIG_VOLUME_HIFI4
 
 #if (!CONFIG_COMP_PEAK_VOL)
 
diff --git a/src/audio/volume/volume_hifi4_with_peakvol.c b/src/audio/volume/volume_hifi4_with_peakvol.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(volume_hifi4, CONFIG_SOF_LOG_LEVEL);
 
 #include "volume.h"
 
-#ifdef VOLUME_HIFI4
+#if CONFIG_VOLUME_HIFI4
 
 #if CONFIG_COMP_PEAK_VOL
 #include <xtensa/tie/xt_hifi4.h>

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ static int volume_process(struct processing_module *mod,`
`587`	`587`	`cd->peak_cnt = 0;`
`588`	`588`	`peak_vol_update(cd);`
`589`	`589`	`memset(cd->peak_regs.peak_meter, 0, sizeof(cd->peak_regs.peak_meter));`
`590`		`-#ifdef VOLUME_HIFI4`
	`590`	`+#if CONFIG_VOLUME_HIFI4`
`591`	`591`	`memset(cd->peak_vol, 0, sizeof(int32_t) * SOF_IPC_MAX_CHANNELS * 4);`
`592`	`592`	`#endif`
`593`	`593`	`}`