From 5c6ac876bf0bda66b8b916e6ce42e8ad782673a8 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Tue, 30 Jan 2024 01:11:35 +0000 Subject: [PATCH 1/2] src/ipc/CMakeLists.txt: remove now useless return() Commit 7680a7b0dcea ("cmake: add testbench host build") added `if (CONFIG_LIBRARY) return()` in `src/ipc/CMakeLists.txt` to exclude some .c files from testbench compilation. Then commit 8b680d53386b ("host: enable ipc handler module") moved the `return()` later in the files to exclude fewer files and add more files to fuzzing. Then commit 0a7df45e87fb ("library: add trace and shared memory region") moved it down again to add more files. Then commit d62e9267f6a0 ("ipc: split IPC major code into IPC specific directories") removed the last bit of code that was still after the return() Now there is no code left after the `return()`!? Remove it. Signed-off-by: Marc Herbert --- src/ipc/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ipc/CMakeLists.txt b/src/ipc/CMakeLists.txt index 8fc26acb7e3f..15702ef9679d 100644 --- a/src/ipc/CMakeLists.txt +++ b/src/ipc/CMakeLists.txt @@ -34,9 +34,4 @@ if (CONFIG_TRACE) dma-copy.c) endif() -if (CONFIG_LIBRARY) - return() -endif() - - endif() # Zephyr From 174e10a3190b1a630f600fbc270e571a050b39bf Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 31 Jan 2024 01:35:43 +0000 Subject: [PATCH 2/2] audio/CMakeLists.txt: move testbench/plugin to new, separate file Commit 7680a7b0dcea ("cmake: add testbench host build") added a `return()` in the middle of `src/audio/CMakeLists.txt` to exclude some C files from testbench compilation. It wasn't easy to read already at the time. Now that the file has grown bigger it's become even harder to spot and even more confusing. Soon, #8260 will also add Zephyr to this file which will make things much worse. Solve all this by moving testbench and plugin compilation to a new, separate, `native.cmake` file. Reported in #8606 Signed-off-by: Marc Herbert --- src/audio/CMakeLists.txt | 112 +++------------------------------------ src/audio/native.cmake | 108 +++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 105 deletions(-) create mode 100644 src/audio/native.cmake diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt index 2494c7ba578e..4549fc048cb4 100644 --- a/src/audio/CMakeLists.txt +++ b/src/audio/CMakeLists.txt @@ -6,7 +6,13 @@ elseif(CONFIG_IPC_MAJOR_4) set(mixer_src mixin_mixout/mixin_mixout.c mixin_mixout/mixin_mixout_generic.c mixin_mixout/mixin_mixout_hifi3.c) endif() -if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) +if(CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) + include(native.cmake) + return() +endif() + +# Older indentation temporarily preserved to help git and git users. + add_local_sources(sof host-legacy.c component.c @@ -115,107 +121,3 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD) if(CONFIG_DTS_CODEC) add_subdirectory(codec) endif() - - return() -endif() - -subdirs(pipeline) - -if(CONFIG_COMP_MODULE_ADAPTER) - add_subdirectory(module_adapter) -endif() - -add_local_sources(sof - component.c - data_blob.c - buffer.c - source_api_helper.c - sink_api_helper.c - sink_source_utils.c - audio_stream.c - channel_map.c -) - -# Audio Modules with various optimizaitons - -# add rules for module compilation and installation -function(sof_audio_add_module lib_name compile_flags) - add_library(${lib_name} MODULE "") - target_link_libraries(${lib_name} PRIVATE sof_options) - target_link_libraries(${lib_name} PRIVATE -Wl,--export-dynamic) - target_compile_options(${lib_name} PRIVATE ${compile_flags}) - add_local_sources(${lib_name} ${ARGN}) - sof_append_relative_path_definitions(${lib_name}) - install(TARGETS ${lib_name} DESTINATION lib) -endfunction() - -include(CheckCCompilerFlag) - -set(available_optimizations) - -# checks if flag is supported by compiler and sets needed flags -# note: to debug vectorisation please add "-fopt-info-vec-note" option after -# the enable command below. -macro(check_optimization opt_name flag enable_cmd extra_define) - check_c_compiler_flag(${flag} compiles_flag_${opt_name}) - if(compiles_flag_${opt_name}) - list(APPEND available_optimizations ${opt_name}) - set(${opt_name}_flags ${flag} ${extra_define} ${enable_cmd} -ffast-math) - endif() -endmacro() - -# modules will be compiled only for flags supported by compiler -check_optimization(sse42 -msse4.2 -ftree-vectorize -DOPS_SSE42) -check_optimization(avx -mavx -ftree-vectorize -DOPS_AVX) -check_optimization(avx2 -mavx2 -ftree-vectorize -DOPS_AVX2) -check_optimization(fma -mfma -ftree-vectorize -DOPS_FMA) -check_optimization(hifi2ep -mhifi2ep "" -DOPS_HIFI2EP) -check_optimization(hifi3 -mhifi3 "" -DOPS_HIFI3) - -set(sof_audio_modules mixer volume src asrc eq-fir eq-iir dcblock crossover tdfb drc multiband_drc mfcc mux) - -# sources for each module -if(CONFIG_IPC_MAJOR_3) - set(volume_sources volume/volume.c volume/volume_generic.c volume/volume_ipc3.c) - set(asrc_sources asrc/asrc_ipc3.c) - set(src_sources src/src.c src/src_ipc3.c src/src_generic.c) - set(eq-iir_sources eq_iir/eq_iir_ipc3.c eq_iir/eq_iir_generic.c) - set(eq-fir_sources eq_fir/eq_fir_ipc3.c) - set(tdfb_sources tdfb/tdfb_ipc3.c) - set(tdfb_sources multiband_drc/multiband_drc_ipc3.c) - set(dcblock_sources dcblock/dcblock_ipc3.c) - set(mux_sources mux/mux_ipc3.c) - set(crossover_sources crossover/crossover_ipc3.c) -elseif(CONFIG_IPC_MAJOR_4) - set(volume_sources volume/volume.c volume/volume_generic.c volume/volume_ipc4.c) - set(asrc_sources asrc/asrc_ipc4.c) - set(src_sources src/src.c src/src_ipc4.c src/src_generic.c) - set(eq-iir_sources eq_iir/eq_iir_ipc4.c eq_iir/eq_iir_generic.c) - set(eq-fir_sources eq_fir/eq_fir_ipc4.c) - set(tdfb_sources tdfb/tdfb_ipc4.c) - set(tdfb_sources multiband_drc/multiband_drc_ipc4.c) - set(dcblock_sources dcblock/dcblock_ipc4.c) - set(mux_sources mux/mux_ipc4.c) - set(crossover_sources crossover/crossover_ipc4.c) -endif() -set(mixer_sources ${mixer_src}) -set(asrc_sources asrc/asrc.c asrc/asrc_farrow.c asrc/asrc_farrow_generic.c) -set(eq-fir_sources eq_fir/eq_fir.c eq_fir/eq_fir_generic.c) -set(eq-iir_sources eq_iir/eq_iir.c) -set(dcblock_sources dcblock/dcblock.c dcblock/dcblock_generic.c dcblock/dcblock_hifi4.c) -set(crossover_sources crossover/crossover.c crossover/crossover_generic.c) -set(tdfb_sources tdfb/tdfb.c tdfb/tdfb_generic.c tdfb/tdfb_direction.c) -set(drc_sources drc/drc.c drc/drc_generic.c drc/drc_math_generic.c) -set(multiband_drc_sources multiband_drc/multiband_drc_generic.c crossover/crossover.c drc/drc.c drc/drc_generic.c drc/drc_math_generic.c multiband_drc/multiband_drc.c ) -set(mfcc_sources mfcc/mfcc.c mfcc/mfcc_setup.c mfcc/mfcc_common.c mfcc/mfcc_generic.c mfcc/mfcc_hifi4.c mfcc/mfcc_hifi3.c) -set(mux_sources mux/mux.c mux/mux_generic.c) - -foreach(audio_module ${sof_audio_modules}) - # first compile with no optimizations - sof_audio_add_module(sof_${audio_module} "" ${${audio_module}_sources}) - - # compile for each optimization - foreach(opt ${available_optimizations}) - sof_audio_add_module(sof_${audio_module}_${opt} "${${opt}_flags}" ${${audio_module}_sources}) - endforeach() -endforeach() diff --git a/src/audio/native.cmake b/src/audio/native.cmake new file mode 100644 index 000000000000..56d0f4cc3750 --- /dev/null +++ b/src/audio/native.cmake @@ -0,0 +1,108 @@ +# SPDX-License-Identifier: BSD-3-Clause + +if(CONFIG_IPC_MAJOR_3) + set(mixer_src mixer/mixer.c mixer/mixer_generic.c mixer/mixer_hifi3.c) +elseif(CONFIG_IPC_MAJOR_4) + set(mixer_src mixin_mixout/mixin_mixout.c mixin_mixout/mixin_mixout_generic.c mixin_mixout/mixin_mixout_hifi3.c) +endif() + +subdirs(pipeline) + +if(CONFIG_COMP_MODULE_ADAPTER) + add_subdirectory(module_adapter) +endif() + +add_local_sources(sof + component.c + data_blob.c + buffer.c + source_api_helper.c + sink_api_helper.c + sink_source_utils.c + audio_stream.c + channel_map.c +) + +# Audio Modules with various optimizaitons + +# add rules for module compilation and installation +function(sof_audio_add_module lib_name compile_flags) + add_library(${lib_name} MODULE "") + target_link_libraries(${lib_name} PRIVATE sof_options) + target_link_libraries(${lib_name} PRIVATE -Wl,--export-dynamic) + target_compile_options(${lib_name} PRIVATE ${compile_flags}) + add_local_sources(${lib_name} ${ARGN}) + sof_append_relative_path_definitions(${lib_name}) + install(TARGETS ${lib_name} DESTINATION lib) +endfunction() + +include(CheckCCompilerFlag) + +set(available_optimizations) + +# checks if flag is supported by compiler and sets needed flags +# note: to debug vectorisation please add "-fopt-info-vec-note" option after +# the enable command below. +macro(check_optimization opt_name flag enable_cmd extra_define) + check_c_compiler_flag(${flag} compiles_flag_${opt_name}) + if(compiles_flag_${opt_name}) + list(APPEND available_optimizations ${opt_name}) + set(${opt_name}_flags ${flag} ${extra_define} ${enable_cmd} -ffast-math) + endif() +endmacro() + +# modules will be compiled only for flags supported by compiler +check_optimization(sse42 -msse4.2 -ftree-vectorize -DOPS_SSE42) +check_optimization(avx -mavx -ftree-vectorize -DOPS_AVX) +check_optimization(avx2 -mavx2 -ftree-vectorize -DOPS_AVX2) +check_optimization(fma -mfma -ftree-vectorize -DOPS_FMA) +check_optimization(hifi2ep -mhifi2ep "" -DOPS_HIFI2EP) +check_optimization(hifi3 -mhifi3 "" -DOPS_HIFI3) + +set(sof_audio_modules mixer volume src asrc eq-fir eq-iir dcblock crossover tdfb drc multiband_drc mfcc mux) + +# sources for each module +if(CONFIG_IPC_MAJOR_3) + set(volume_sources volume/volume.c volume/volume_generic.c volume/volume_ipc3.c) + set(asrc_sources asrc/asrc_ipc3.c) + set(src_sources src/src.c src/src_ipc3.c src/src_generic.c) + set(eq-iir_sources eq_iir/eq_iir_ipc3.c eq_iir/eq_iir_generic.c) + set(eq-fir_sources eq_fir/eq_fir_ipc3.c) + set(tdfb_sources tdfb/tdfb_ipc3.c) + set(tdfb_sources multiband_drc/multiband_drc_ipc3.c) + set(dcblock_sources dcblock/dcblock_ipc3.c) + set(mux_sources mux/mux_ipc3.c) + set(crossover_sources crossover/crossover_ipc3.c) +elseif(CONFIG_IPC_MAJOR_4) + set(volume_sources volume/volume.c volume/volume_generic.c volume/volume_ipc4.c) + set(asrc_sources asrc/asrc_ipc4.c) + set(src_sources src/src.c src/src_ipc4.c src/src_generic.c) + set(eq-iir_sources eq_iir/eq_iir_ipc4.c eq_iir/eq_iir_generic.c) + set(eq-fir_sources eq_fir/eq_fir_ipc4.c) + set(tdfb_sources tdfb/tdfb_ipc4.c) + set(tdfb_sources multiband_drc/multiband_drc_ipc4.c) + set(dcblock_sources dcblock/dcblock_ipc4.c) + set(mux_sources mux/mux_ipc4.c) + set(crossover_sources crossover/crossover_ipc4.c) +endif() +set(mixer_sources ${mixer_src}) +set(asrc_sources asrc/asrc.c asrc/asrc_farrow.c asrc/asrc_farrow_generic.c) +set(eq-fir_sources eq_fir/eq_fir.c eq_fir/eq_fir_generic.c) +set(eq-iir_sources eq_iir/eq_iir.c) +set(dcblock_sources dcblock/dcblock.c dcblock/dcblock_generic.c dcblock/dcblock_hifi4.c) +set(crossover_sources crossover/crossover.c crossover/crossover_generic.c) +set(tdfb_sources tdfb/tdfb.c tdfb/tdfb_generic.c tdfb/tdfb_direction.c) +set(drc_sources drc/drc.c drc/drc_generic.c drc/drc_math_generic.c) +set(multiband_drc_sources multiband_drc/multiband_drc_generic.c crossover/crossover.c drc/drc.c drc/drc_generic.c drc/drc_math_generic.c multiband_drc/multiband_drc.c ) +set(mfcc_sources mfcc/mfcc.c mfcc/mfcc_setup.c mfcc/mfcc_common.c mfcc/mfcc_generic.c mfcc/mfcc_hifi4.c mfcc/mfcc_hifi3.c) +set(mux_sources mux/mux.c mux/mux_generic.c) + +foreach(audio_module ${sof_audio_modules}) + # first compile with no optimizations + sof_audio_add_module(sof_${audio_module} "" ${${audio_module}_sources}) + + # compile for each optimization + foreach(opt ${available_optimizations}) + sof_audio_add_module(sof_${audio_module}_${opt} "${${opt}_flags}" ${${audio_module}_sources}) + endforeach() +endforeach()