[stable-v2.15] audio: arbiter, kbp, mfcc, microwakeword: Backport wov-upstream plus add SDW single wov-topologies

.github/workflows/testbench.yml

@@ -47,6 +47,19 @@ jobs:
         with:
           path: sof
 
+      # MFCC with PCAN needs the TFLM microfrontend sources next to sof/,
+      # use the revision pinned in the west submanifest.
+      - name: Checkout TFLM microfrontend
+        run: |
+          rev=$(awk '/name: tflite-micro/ {f=1} f && /revision:/ {print $2; exit}' \
+                sof/submanifests/tflm.yml)
+          git init tflite-micro
+          cd tflite-micro
+          git remote add origin https://github.com/tensorflow/tflite-micro
+          git sparse-checkout set tensorflow/lite/experimental/microfrontend/lib
+          git fetch --depth 1 --filter=blob:none origin "$rev"
+          git checkout FETCH_HEAD
+
       # note: libasound-dev needed for testbench build which still
       #       requires system ALSA headers to be present
       - name: apt get

README.md

@@ -29,6 +29,14 @@ The script will guide you through the process of installing system dependencies,
 
 See [unit testing documentation](https://thesofproject.github.io/latest/developer_guides/unit_tests.html)
 
+### Wake-on-Voice (WoV) Multi-Slot Hardware Verification
+
+For automated hardware testing of the 4-channel native 16 kHz DMIC Wake-on-Voice pipeline with multi-slot microWakeWord (MWW) on Intel Panther Lake (PTL), see the comprehensive runbook:
+* **Documentation & Reproduction Guide**: [Wake-on-Voice (WoV) S0 / D0i3 Multi-Slot Testing & Verification](tools/topology/topology2/README.md#wake-on-voice-wov-s0--d0i3-multi-slot-testing--verification)
+* **Required Kernel Branch**: `wov-ipc4-d0i3` on [`lgirdwood/linux`](https://github.com/lgirdwood/linux/tree/wov-ipc4-d0i3) (`SNDRV_PCM_INFO_NO_PERIOD_WAKEUP` + `SOF_IPC4_NOTIFY_PHRASE_DETECTED`)
+* **Required Firmware Branch**: `wcl-uaol-wov-002` on [`lgirdwood/sof`](https://github.com/lgirdwood/sof/tree/wcl-uaol-wov-002)
+* **Verified Results**: 20 / 20 consecutive passes in S0 mode with synthetic fake-wake detection (`CONFIG_COMP_MWW_FAKE_WAKE_MS=5000`), zero xruns, and zero kernel IPC/ASoC errors.
+
 ## Deployment
 
 TODO: Add additional notes about how to deploy this on a live system

app/boards/intel_adsp_ace30_ptl.conf

@@ -5,19 +5,37 @@ 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
+CONFIG_COMP_DRC=y
+CONFIG_COMP_TDFB=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_MUX=y
+CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=n
+CONFIG_COMP_STFT_PROCESS=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
+# WOV Arbiter, KPB, Mixin/Mixout and Sample Detector
+CONFIG_COMP_MIXIN_MIXOUT=y
+CONFIG_COMP_WOV_ARBITER=y
+CONFIG_COMP_KPB=y
+CONFIG_KPB_MAX_BUFF_TIME=2000
+CONFIG_COMP_ECNS=y
+CONFIG_ECNS_TEST_SIGNAL=y
+CONFIG_SOF_STAGING=y
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=n
 
 # SOF / infrastructure
 CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
+CONFIG_IDC_TIMEOUT_US=100000
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
 CONFIG_SOF_TELEMETRY=y
@@ -27,11 +45,7 @@ CONFIG_COLD_STORE_EXECUTE_DRAM=y
 
 # SOF / loadable modules
 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 +57,10 @@ 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
+# sof_init (POST_KERNEL) starts the core 0 IDC p4wq thread, needs it created first
+CONFIG_P4WQ_INIT_STAGE_EARLY=y
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70
@@ -73,13 +85,5 @@ 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
+CONFIG_SYS_HEAP_RUNTIME_STATS=y
+CONFIG_SOF_ZEPHYR_HEAP_SIZE=0x80000

app/boards/intel_adsp_ace30_wcl.conf

@@ -5,16 +5,37 @@ 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
+CONFIG_COMP_DRC=y
+CONFIG_COMP_TDFB=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_MUX=y
+CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # 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
+# Google hotword needs the proprietary hotword_dsp_api.h and an ACE30 library build
+CONFIG_COMP_GOOGLE_HOTWORD_DETECT=n
+CONFIG_COMP_MIXIN_MIXOUT=y
+CONFIG_COMP_WOV_ARBITER=y
+CONFIG_COMP_KPB=y
+CONFIG_COMP_ECNS=y
+CONFIG_ECNS_TEST_SIGNAL=y
+CONFIG_SOF_STAGING=y
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+# Post-ECNS KPB is mono 16-bit: 2000 ms needs 64000 B, well within the DSP heap
+CONFIG_KPB_MAX_BUFF_TIME=2000
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=n
+CONFIG_COMP_STFT_PROCESS=n
 
 # SOF / infrastructure
 CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
@@ -27,11 +48,7 @@ CONFIG_COLD_STORE_EXECUTE_DRAM=y
 
 # SOF / loadable modules
 CONFIG_INTEL_MODULES=y
-CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_AUTH_SUPPORT=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
@@ -42,12 +59,12 @@ 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_HEAP_MEM_POOL_SIZE=32768
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=32768
+CONFIG_SYS_HEAP_RUNTIME_STATS=y
+CONFIG_SOF_ZEPHYR_HEAP_SIZE=0x80000
+# sof_init (POST_KERNEL) starts the core 0 IDC p4wq thread, needs it created first
+CONFIG_P4WQ_INIT_STAGE_EARLY=y
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70
@@ -58,6 +75,7 @@ CONFIG_DMA_INTEL_ADSP_GPDMA=n
 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=16
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 
 # Zephyr / power settings

app/boards/intel_adsp_ace40_nvl.conf

@@ -5,33 +5,50 @@ 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
+CONFIG_COMP_DRC=y
+CONFIG_COMP_TDFB=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_MUX=y
+CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=n
+CONFIG_COMP_STFT_PROCESS=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
+# WOV Arbiter, KPB, Mixin/Mixout and Sample Detector
+CONFIG_COMP_MIXIN_MIXOUT=y
+CONFIG_COMP_WOV_ARBITER=y
+CONFIG_COMP_KPB=y
+CONFIG_KPB_MAX_BUFF_TIME=2000
+CONFIG_COMP_ECNS=y
+CONFIG_ECNS_TEST_SIGNAL=y
+CONFIG_SOF_STAGING=y
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_COMP_MWW_HIFI_NNLIB=n
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=n
 
 # SOF / infrastructure
+CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
+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
 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
 CONFIG_SOF_LOG_LEVEL_INF=y
 
 # Zephyr / OS features
@@ -40,21 +57,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
+# sof_init (POST_KERNEL) starts the core 0 IDC p4wq thread, needs it created first
+CONFIG_P4WQ_INIT_STAGE_EARLY=y
 
 # 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=50
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 
 # Zephyr / power settings
@@ -65,9 +84,13 @@ 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
 
 # Zephyr / debug: temporary, until fixed
 CONFIG_GDBSTUB=n
+
+CONFIG_SYS_HEAP_RUNTIME_STATS=y
+CONFIG_SOF_ZEPHYR_HEAP_SIZE=0x80000

app/boards/intel_adsp_cavs25.conf

@@ -8,9 +8,24 @@ CONFIG_IPC_MAJOR_4=y
 CONFIG_COMP_ARIA=y
 CONFIG_COMP_CROSSOVER=y
 CONFIG_COMP_DRC=y
+CONFIG_COMP_MIXIN_MIXOUT=y
+CONFIG_COMP_WOV_ARBITER=y
+CONFIG_COMP_KPB=y
+CONFIG_KPB_MAX_BUFF_TIME=2000
+CONFIG_COMP_ECNS=y
+CONFIG_ECNS_KPB_MONO_AVG_ALL=y
+CONFIG_SOF_STAGING=y
 CONFIG_COMP_MFCC=y
+CONFIG_COMP_MFCC_PCAN=y
+CONFIG_COMP_MWW=y
+CONFIG_COMP_MWW_DEBUG_TRACE=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=n
 CONFIG_COMP_MULTIBAND_DRC=y
 CONFIG_COMP_VOLUME_WINDOWS_FADE=y
+CONFIG_SAMPLES=y
+CONFIG_SAMPLE_KEYPHRASE=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_PCM_CONVERTER_FORMAT_S16LE=y
 CONFIG_PCM_CONVERTER_FORMAT_S24LE=y
@@ -19,6 +34,7 @@ CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # SOF / infrastructure
 CONFIG_AMS=y
+CONFIG_IDC_TIMEOUT_US=100000
 CONFIG_LP_MEMORY_BANKS=1
 CONFIG_HP_MEMORY_BANKS=30
 
@@ -28,6 +44,8 @@ CONFIG_LIBRARY_MANAGER=n
 
 # SOF / logging
 CONFIG_SOF_LOG_LEVEL_INF=y
+CONFIG_LOG_BUFFER_SIZE=32768
+CONFIG_MTRACE_LOG_CACHE_BUF_SIZE=32768
 
 # Zephyr / OS features
 # note: CONFIG_DEBUG_COREDUMP is enabled for all Intel targets in
@@ -36,6 +54,7 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
 CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
 CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=65536
 
 # Zephyr / device drivers
 CONFIG_DAI_INIT_PRIORITY=70

app/boards/intel_adsp_cavs25_tgph.conf

@@ -9,6 +9,7 @@ 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
@@ -18,6 +19,7 @@ CONFIG_PCM_CONVERTER_FORMAT_S32LE=y
 CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
 
 # SOF / infrastructure
+CONFIG_IDC_TIMEOUT_US=100000
 CONFIG_LP_MEMORY_BANKS=1
 CONFIG_HP_MEMORY_BANKS=30