Audio: Aria: Use new ARIA HiFi config style

Use the new CONFIG_ARIA_HIFI style to choose right processing file. Signed-off-by: Andrula Song <andrula.song@intel.com>
singalsu · Jan 31, 2024 · d9bd3d2 · d9bd3d2
1 parent d46d783
commit d9bd3d2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/src/audio/aria/Kconfig b/src/audio/aria/Kconfig
@@ -10,3 +10,22 @@ config COMP_ARIA
 	  Applied gain is in range <1, 2 power attenuation>
 	  Currently ARIA introduces gain transition and algorithmic
 	  latency equal to 1 ms.
+
+choice
+	prompt "ARIA HIFI level"
+	depends on COMP_ARIA
+	default ARIA_HIFI_MAX
+
+config ARIA_HIFI_MAX
+	bool "Max level available in the toolchain"
+
+config ARIA_HIFI_4
+	bool "HIFI4 ARIA"
+
+config ARIA_HIFI_3
+	bool "HIFI3 ARIA"
+
+config ARIA_HIFI_NONE
+	bool "Generic ARIA, no HIFI"
+
+endchoice
diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
@@ -162,9 +162,9 @@ static void aria_set_stream_params(struct comp_buffer *buffer,
 	const struct ipc4_audio_format *audio_fmt = &mod->priv.cfg.base_cfg.audio_fmt;
 
 	ipc4_update_buffer_format(buffer, audio_fmt);
-#ifdef ARIA_HIFI3
+#if SOF_USE_HIFI(3, ARIA) || SOF_USE_HIFI(4, ARIA)
 	audio_stream_set_align(8, 1, &buffer->stream);
-#elif ARIA_HIFI5
+#elif SOF_USE_HIFI(5, ARIA)
 	audio_stream_set_align(16, 1, &buffer->stream);
 #endif
 }

diff --git a/src/audio/aria/aria.h b/src/audio/aria/aria.h
@@ -28,19 +28,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#if defined(__XCC__)
-# include <xtensa/config/core-isa.h>
-# if XCHAL_HAVE_HIFI5
-#  define ARIA_HIFI5
-# elif XCHAL_HAVE_HIFI3 || XCHAL_HAVE_HIFI4
-#  define ARIA_HIFI3
-# else
-#  define ARIA_GENERIC
-# endif
-#else
-# define ARIA_GENERIC
-#endif
-
 /** \brief Aria max gain states */
 #define ARIA_MAX_GAIN_STATES 10
 

diff --git a/src/audio/aria/aria_generic.c b/src/audio/aria/aria_generic.c
@@ -4,7 +4,7 @@
 
 #include "aria.h"
 
-#ifdef ARIA_GENERIC
+#if SOF_USE_HIFI(NONE, ARIA)
 
 /**
  * \brief Aria gain index mapping table

diff --git a/src/audio/aria/aria_hifi3.c b/src/audio/aria/aria_hifi3.c
@@ -4,7 +4,7 @@
 
 #include "aria.h"
 
-#ifdef ARIA_HIFI3
+#if SOF_USE_HIFI(3, ARIA) || SOF_USE_HIFI(4, ARIA)
 #include <xtensa/config/defs.h>
 #include <xtensa/tie/xt_hifi3.h>
 

diff --git a/src/audio/aria/aria_hifi5.c b/src/audio/aria/aria_hifi5.c
@@ -4,7 +4,7 @@
 
 #include "aria.h"
 
-#ifdef ARIA_HIFI5
+#if SOF_USE_HIFI(5, ARIA)
 #include <xtensa/config/defs.h>
 #include <xtensa/tie/xt_hifi5.h>