From 205e202c4dd184db4acb0953a61a006735b5b9c4 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 17 Nov 2023 23:09:13 +0000 Subject: [PATCH] zephyr/cmake: move math/*.c files to now common math/CMakeLists.txt CMake decentralization per #8260 Signed-off-by: Marc Herbert --- src/math/CMakeLists.txt | 18 +++++++++++++++--- zephyr/CMakeLists.txt | 31 +------------------------------ 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/src/math/CMakeLists.txt b/src/math/CMakeLists.txt index afbc4718fa59..4b6e806fbee1 100644 --- a/src/math/CMakeLists.txt +++ b/src/math/CMakeLists.txt @@ -5,9 +5,11 @@ if(BUILD_LIBRARY) return() endif() +is_zephyr(it_is_zephyr) + add_local_sources(sof numbers.c) -if(CONFIG_CORDIC_FIXED) +if(CONFIG_CORDIC_FIXED OR it_is_zephyr) add_local_sources(sof trig.c) endif() @@ -15,10 +17,12 @@ add_local_sources_ifdef(CONFIG_SQRT_FIXED sof sqrt_int16.c) add_local_sources_ifdef(CONFIG_MATH_EXP sof exp_fcn.c exp_fcn_hifi.c) -if(CONFIG_MATH_DECIBELS) +if(CONFIG_MATH_DECIBELS OR it_is_zephyr) add_local_sources(sof decibels.c) endif() +# Never used with Zephyr. +if(NOT it_is_zephyr) add_local_sources_ifdef(CONFIG_NATURAL_LOGARITHM_FIXED sof log_e.c) add_local_sources_ifdef(CONFIG_COMMON_LOGARITHM_FIXED sof log_10.c) @@ -26,10 +30,16 @@ add_local_sources_ifdef(CONFIG_COMMON_LOGARITHM_FIXED sof log_10.c) add_local_sources_ifdef(CONFIG_POWER_FIXED sof power.c) add_local_sources_ifdef(CONFIG_BINARY_LOGARITHM_FIXED sof base2log.c) +endif() +if(it_is_zephyr) +add_local_sources_ifdef(CONFIG_COMP_FIR sof fir_generic.c fir_hifi2ep.c fir_hifi3.c) +else() add_local_sources_ifdef(CONFIG_MATH_FIR sof fir_generic.c fir_hifi2ep.c fir_hifi3.c) +endif() -if(CONFIG_MATH_FFT) +# Never used with Zephyr. +if(CONFIG_MATH_FFT AND NOT it_is_zephyr) add_subdirectory(fft) endif() @@ -39,6 +49,7 @@ add_local_sources_ifdef(CONFIG_MATH_IIR_DF2T sof add_local_sources_ifdef(CONFIG_MATH_IIR_DF1 sof iir_df1_generic.c iir_df1_hifi3.c iir_df1.c) +if(NOT it_is_zephyr) if(CONFIG_MATH_WINDOW) add_local_sources(sof window.c) endif() @@ -54,3 +65,4 @@ endif() if(CONFIG_MATH_DCT) add_local_sources(sof dct.c) endif() +endif() # not Zephyr diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index a859282102c6..c48bbcaf452e 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -56,7 +56,6 @@ set(SOF_SAMPLES_PATH "${SOF_SRC_PATH}/samples") set(SOF_LIB_PATH "${SOF_SRC_PATH}/lib") set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers") set(SOF_DEBUG_PATH "${SOF_SRC_PATH}/debug") -set(SOF_MATH_PATH "${SOF_SRC_PATH}/math") set(SOF_TRACE_PATH "${SOF_SRC_PATH}/trace") set(RIMAGE_TOP ${sof_top_dir}/tools/rimage) @@ -146,6 +145,7 @@ endmacro() add_subdirectory(../src/init/ init_unused_install/) add_subdirectory(../src/ipc/ ipc_unused_install/) +add_subdirectory(../src/math/ math_unused_install/) @@ -366,11 +366,6 @@ zephyr_include_directories(${SOF_PLATFORM_PATH}/${PLATFORM}/include) # Commented files will be added/removed as integration dictates. zephyr_library_sources( - # SOF math utilities - ${SOF_MATH_PATH}/decibels.c - ${SOF_MATH_PATH}/numbers.c - ${SOF_MATH_PATH}/trig.c - # SOF library - parts to transition to Zephyr over time ${SOF_LIB_PATH}/clk.c ${SOF_LIB_PATH}/notifier.c @@ -461,9 +456,6 @@ zephyr_library_sources_ifdef(CONFIG_COMP_FIR ${SOF_AUDIO_PATH}/eq_fir/eq_fir_hifi2ep.c ${SOF_AUDIO_PATH}/eq_fir/eq_fir_generic.c ${SOF_AUDIO_PATH}/eq_fir/eq_fir.c - ${SOF_MATH_PATH}/fir_generic.c - ${SOF_MATH_PATH}/fir_hifi2ep.c - ${SOF_MATH_PATH}/fir_hifi3.c ) if(CONFIG_IPC_MAJOR_3) @@ -488,18 +480,6 @@ elseif(CONFIG_IPC_MAJOR_4) ) endif() -zephyr_library_sources_ifdef(CONFIG_MATH_IIR_DF1 - ${SOF_MATH_PATH}/iir_df1_generic.c - ${SOF_MATH_PATH}/iir_df1_hifi3.c - ${SOF_MATH_PATH}/iir_df1.c -) - -zephyr_library_sources_ifdef(CONFIG_MATH_IIR_DF2T - ${SOF_MATH_PATH}/iir_df2t_generic.c - ${SOF_MATH_PATH}/iir_df2t_hifi3.c - ${SOF_MATH_PATH}/iir_df2t.c -) - zephyr_library_sources_ifdef(CONFIG_COMP_ASRC ${SOF_AUDIO_PATH}/asrc/asrc.c ${SOF_AUDIO_PATH}/asrc/asrc_farrow_hifi3.c @@ -762,15 +742,6 @@ zephyr_library_sources_ifdef(CONFIG_COMP_TDFB ${SOF_AUDIO_PATH}/tdfb/tdfb_hifi3.c ) -zephyr_library_sources_ifdef(CONFIG_SQRT_FIXED - ${SOF_MATH_PATH}/sqrt_int16.c -) - -zephyr_library_sources_ifdef(CONFIG_MATH_EXP - ${SOF_MATH_PATH}/exp_fcn.c - ${SOF_MATH_PATH}/exp_fcn_hifi.c -) - zephyr_library_sources_ifdef(CONFIG_COMP_UP_DOWN_MIXER ${SOF_AUDIO_PATH}/up_down_mixer/up_down_mixer.c ${SOF_AUDIO_PATH}/up_down_mixer/up_down_mixer_hifi3.c