audio: microwakeword: add mww component

CMakeLists.txt

@@ -2,6 +2,7 @@
 
 cmake_minimum_required(VERSION 3.13)
 
+
 if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 	message(FATAL_ERROR
 		" In-source builds are not supported.\n"
@@ -58,7 +59,10 @@ set(CMAKE_ASM_FLAGS -DASSEMBLY)
 # that may be exported / installed
 add_library(sof_public_headers INTERFACE)
 
-target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/include)
+target_include_directories(sof_public_headers INTERFACE
+	${PROJECT_SOURCE_DIR}/src/include
+	${PROJECT_SOURCE_DIR}/../tflite-micro
+)
 
 # interface library that is used only as container for sof binary options
 # other targets can use it to build with the same options

app/boards/intel_adsp/Kconfig.defconfig

@@ -87,6 +87,9 @@ config L3_HEAP
 config ZEPHYR_DP_SCHEDULER
 	default y
 
+config DP_TO_DP_BIND
+	default y
+
 config ZEPHYR_NATIVE_DRIVERS
 	default y
 

app/boards/intel_adsp_ace30_ptl.conf

@@ -5,33 +5,45 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"
 CONFIG_IPC_MAJOR_4=y
 
 # SOF / audio pipeline and module settings
-CONFIG_COMP_TESTER=m
+CONFIG_COMP_TESTER=n
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
-
-# SOF / audio modules / mocks
-# This mock is part of official sof-bin releases because the CI that
-# tests it can't use extra CONFIGs. See #9410, #8722 and #9386
-CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
-CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
-CONFIG_COMP_STFT_PROCESS=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=n
+CONFIG_COMP_STFT_PROCESS=n
+CONFIG_SOF_STAGING=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=n
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MFCC_DEBUG_TRACE=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_PCAN=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_COMP_MWW_MODEL_FROM_CONTROL=n
+CONFIG_AMS=y
+CONFIG_STACK_SIZE_EDF=32768
+# Standard hda-generic components, built statically.
+CONFIG_COMP_DRC=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # SOF / infrastructure
 CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
+# Match cavs25 static-mww build: 15 ms default IDC timeout is too tight
+# for CREATE_PIPELINE forwarded to a secondary core while the DP scheduler
+# and TFLM tensor-arena setup are in flight.
+CONFIG_IDC_TIMEOUT_US=100000
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
 CONFIG_SOF_TELEMETRY=y
 CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
 CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
 CONFIG_COLD_STORE_EXECUTE_DRAM=y
 
-# SOF / loadable modules
+# SOF / loadable modules -- disabled for cavs25-style static build.
 CONFIG_INTEL_MODULES=y
-CONFIG_LIBRARY_AUTH_SUPPORT=y
-CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
-CONFIG_LIBRARY_BUILD_LIB=y
-CONFIG_LIBRARY_DEFAULT_MODULAR=y
+CONFIG_LIBRARY_MANAGER=n
 
 # SOF / logging
 CONFIG_SOF_LOG_LEVEL_INF=y
@@ -43,12 +55,8 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
 CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
 CONFIG_COUNTER=y
-CONFIG_HEAP_MEM_POOL_SIZE=8192
-CONFIG_LLEXT=y
-CONFIG_LLEXT_STORAGE_WRITABLE=y
-CONFIG_LLEXT_EXPERIMENTAL=y
-CONFIG_LLEXT_EDK=n
-CONFIG_MODULES=y
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=32768
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70
@@ -74,14 +82,3 @@ CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
 CONFIG_LOG_BACKEND_ADSP=n
 CONFIG_LOG_FLUSH_SLEEP_US=5000
 CONFIG_WINSTREAM_CONSOLE=n
-
-# Userspace options
-CONFIG_USERSPACE=y
-CONFIG_DYNAMIC_THREAD=y
-CONFIG_DYNAMIC_THREAD_ALLOC=y
-CONFIG_DYNAMIC_THREAD_PREFER_ALLOC=y
-CONFIG_SOF_STACK_SIZE=8192
-CONFIG_SOF_USERSPACE_PROXY=y
-CONFIG_MAX_THREAD_BYTES=3
-
-CONFIG_MAX_DOMAIN_PARTITIONS=32

app/boards/intel_adsp_ace40_nvl.conf

@@ -5,30 +5,45 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="nvl"
 CONFIG_IPC_MAJOR_4=y
 
 # SOF / audio pipeline and module settings
-CONFIG_COMP_SRC=y
-CONFIG_COMP_ARIA=y
-CONFIG_COMP_DRC=y
+CONFIG_COMP_TESTER=n
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
-CONFIG_COMP_TESTER=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
-
-# SOF / audio modules / mocks
-# This mock is part of official sof-bin releases because the CI that
-# tests it can't use extra CONFIGs. See #9410, #8722 and #9386
-CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
-CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=n
+CONFIG_COMP_STFT_PROCESS=n
+CONFIG_SOF_STAGING=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=n
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MFCC_DEBUG_TRACE=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_PCAN=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_COMP_MWW_MODEL_FROM_CONTROL=n
+CONFIG_AMS=y
+CONFIG_STACK_SIZE_EDF=32768
+# Standard hda-generic components, built statically.
+CONFIG_COMP_DRC=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # SOF / infrastructure
+CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
+# Match cavs25 static-mww build: 15 ms default IDC timeout is too tight
+# for CREATE_PIPELINE forwarded to a secondary core while the DP scheduler
+# and TFLM tensor-arena setup are in flight.
+CONFIG_IDC_TIMEOUT_US=100000
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
+CONFIG_SOF_TELEMETRY=y
+CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
+CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
 CONFIG_COLD_STORE_EXECUTE_DRAM=y
 
-# SOF / loadable modules
+# SOF / loadable modules -- disabled for cavs25-style static build.
 CONFIG_INTEL_MODULES=y
-CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
-CONFIG_LIBRARY_BUILD_LIB=y
-CONFIG_LIBRARY_DEFAULT_MODULAR=y
+CONFIG_LIBRARY_MANAGER=n
 
 # SOF / logging
 CONFIG_TRACE=n
@@ -40,22 +55,23 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 # choices have to be selected per board.
 CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
 CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
-CONFIG_HEAP_MEM_POOL_SIZE=8192
-CONFIG_LLEXT=y
-CONFIG_LLEXT_STORAGE_WRITABLE=y
-CONFIG_LLEXT_EXPERIMENTAL=y
-CONFIG_LLEXT_EDK=n
-CONFIG_MODULES=y
+CONFIG_COUNTER=y
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=32768
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_DMIC_HW_IOCLK=38400000
 CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
 CONFIG_DMA_INTEL_ADSP_GPDMA=n
+CONFIG_DMA_DW_LLI_POOL_SIZE=50
+CONFIG_MEMORY_WIN_2_SIZE=12288
 CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
 CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=3
+CONFIG_XTENSA_MMU_NUM_L2_TABLES=128
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
+CONFIG_UAOL=n
 
 # Zephyr / power settings
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
@@ -65,6 +81,7 @@ CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
 
 # Zephyr / logging
 CONFIG_LOG_BACKEND_ADSP=n
+CONFIG_LOG_FLUSH_SLEEP_US=5000
 CONFIG_WINSTREAM_CONSOLE=n
 CONFIG_LOG_RUNTIME_FILTERING=y
 CONFIG_LOG_RUNTIME_DEFAULT_LEVEL=1

app/boards/intel_adsp_ace40_nvls.conf

@@ -5,30 +5,45 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="nvl"
 CONFIG_IPC_MAJOR_4=y
 
 # SOF / audio pipeline and module settings
-CONFIG_COMP_SRC=y
-CONFIG_COMP_ARIA=y
-CONFIG_COMP_DRC=y
+CONFIG_COMP_TESTER=n
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
-CONFIG_COMP_TESTER=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
-
-# SOF / audio modules / mocks
-# This mock is part of official sof-bin releases because the CI that
-# tests it can't use extra CONFIGs. See #9410, #8722 and #9386
-CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
-CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=n
+CONFIG_COMP_STFT_PROCESS=n
+CONFIG_SOF_STAGING=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=n
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MFCC_DEBUG_TRACE=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_PCAN=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_COMP_MWW_MODEL_FROM_CONTROL=n
+CONFIG_AMS=y
+CONFIG_STACK_SIZE_EDF=32768
+# Standard hda-generic components, built statically.
+CONFIG_COMP_DRC=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # SOF / infrastructure
+CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
+# Match cavs25 static-mww build: 15 ms default IDC timeout is too tight
+# for CREATE_PIPELINE forwarded to a secondary core while the DP scheduler
+# and TFLM tensor-arena setup are in flight.
+CONFIG_IDC_TIMEOUT_US=100000
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
+CONFIG_SOF_TELEMETRY=y
+CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
+CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
 CONFIG_COLD_STORE_EXECUTE_DRAM=y
 
-# SOF / loadable modules
+# SOF / loadable modules -- disabled for cavs25-style static build.
 CONFIG_INTEL_MODULES=y
-CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
-CONFIG_LIBRARY_BUILD_LIB=y
-CONFIG_LIBRARY_DEFAULT_MODULAR=y
+CONFIG_LIBRARY_MANAGER=n
 
 # SOF / logging
 CONFIG_TRACE=n
@@ -40,22 +55,23 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 # choices have to be selected per board.
 CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
 CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
-CONFIG_HEAP_MEM_POOL_SIZE=8192
-CONFIG_LLEXT=y
-CONFIG_LLEXT_STORAGE_WRITABLE=y
-CONFIG_LLEXT_EXPERIMENTAL=y
-CONFIG_LLEXT_EDK=n
-CONFIG_MODULES=y
+CONFIG_COUNTER=y
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=32768
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_DMIC_HW_IOCLK=38400000
 CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
 CONFIG_DMA_INTEL_ADSP_GPDMA=n
+CONFIG_DMA_DW_LLI_POOL_SIZE=50
+CONFIG_MEMORY_WIN_2_SIZE=12288
 CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
 CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=3
+CONFIG_XTENSA_MMU_NUM_L2_TABLES=128
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
+CONFIG_UAOL=n
 
 # Zephyr / power settings
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
@@ -65,6 +81,7 @@ CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
 
 # Zephyr / logging
 CONFIG_LOG_BACKEND_ADSP=n
+CONFIG_LOG_FLUSH_SLEEP_US=5000
 CONFIG_WINSTREAM_CONSOLE=n
 CONFIG_LOG_RUNTIME_FILTERING=y
 CONFIG_LOG_RUNTIME_DEFAULT_LEVEL=1

app/boards/intel_adsp_cavs25.conf

@@ -9,16 +9,26 @@ CONFIG_COMP_ARIA=y
 CONFIG_COMP_CROSSOVER=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
 CONFIG_COMP_MULTIBAND_DRC=y
 CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
+CONFIG_SOF_STAGING=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_PCAN=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_STACK_SIZE_EDF=32768
 CONFIG_PCM_CONVERTER_FORMAT_S16LE=y
 CONFIG_PCM_CONVERTER_FORMAT_S24LE=y
 CONFIG_PCM_CONVERTER_FORMAT_S32LE=y
 CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # SOF / infrastructure
 CONFIG_AMS=y
+CONFIG_IDC_TIMEOUT_US=100000
+CONFIG_P4WQ_INIT_STAGE_EARLY=y
 CONFIG_LP_MEMORY_BANKS=1
 CONFIG_HP_MEMORY_BANKS=30
 
@@ -35,7 +45,8 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 # choices have to be selected per board.
 CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
 CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
-CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=32768
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70

src/arch/host/configs/library_defconfig

@@ -11,6 +11,7 @@ CONFIG_COMP_IIR=y
 CONFIG_COMP_IGO_NR=y
 CONFIG_COMP_LEVEL_MULTIPLIER=y
 CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
 CONFIG_COMP_MODULE_ADAPTER=y
 CONFIG_COMP_MULTIBAND_DRC=y
 CONFIG_COMP_MUX=y

src/audio/CMakeLists.txt

@@ -56,6 +56,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_MFCC)
 		add_subdirectory(mfcc)
 	endif()
+	if(CONFIG_COMP_MWW)
+		add_subdirectory(microwakeword)
+	endif()
 	if(CONFIG_COMP_MIXER)
 		add_subdirectory(mixer)
 	endif()

src/audio/Kconfig

@@ -148,6 +148,7 @@ rsource "eq_iir/Kconfig"
 rsource "google/Kconfig"
 rsource "igo_nr/Kconfig"
 rsource "mfcc/Kconfig"
+rsource "microwakeword/Kconfig"
 rsource "mixer/Kconfig"
 rsource "mixin_mixout/Kconfig"
 rsource "module_adapter/Kconfig"