WIP: Userspace LL ztest

.gitignore

@@ -64,3 +64,6 @@ build*/
 cscope.*
 ncscope.*
 
+# VSCode project metadata
+.vscode/launch.json
+.vscode/settings.json

app/boards/intel_adsp/Kconfig.defconfig

@@ -151,7 +151,7 @@ config POWER_DOMAIN
 # ----------------------------------------
 
 config LOG_BACKEND_ADSP_MTRACE
-	default y
+	default y if LOG
 
 config LOG_FUNC_NAME_PREFIX_ERR
 	default y

app/boards/intel_adsp_ace30_ptl.conf

@@ -64,6 +64,7 @@ CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
 
 # Zephyr / logging
 CONFIG_LOG_BACKEND_ADSP=n
+CONFIG_LOG_BACKEND_ADSP_MTRACE=y
 CONFIG_LOG_FLUSH_SLEEP_US=5000
 CONFIG_WINSTREAM_CONSOLE=n
 

app/boards/intel_adsp_ace30_ptl_sim.conf

@@ -2,6 +2,15 @@ CONFIG_PANTHERLAKE=y
 CONFIG_IPC_MAJOR_4=y
 
 # turn off SOF drivers
+CONFIG_CORE_COUNT=5
+
+CONFIG_ZTEST=y
+CONFIG_SOF_BOOT_TEST_STANDALONE=y
+CONFIG_TEST_USERSPACE=y
+CONFIG_MM_DRV=y
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_SOF_USERSPACE_LL=y
+
 CONFIG_COMP_SRC=y
 
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
@@ -12,7 +21,7 @@ CONFIG_PM=n
 # enable Zephyr drivers
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_DMIC_HW_IOCLK=19200000
-CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
+CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
 CONFIG_DAI_INTEL_SSP=n
 CONFIG_DMA_INTEL_ADSP_GPDMA=n
@@ -24,16 +33,16 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"
 
 CONFIG_FORMAT_CONVERT_HIFI3=n
-CONFIG_LOG=n
+CONFIG_LOG=y
 CONFIG_LOG_MODE_DEFERRED=n
 CONFIG_LOG_FUNC_NAME_PREFIX_INF=n
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=19200000
 
 CONFIG_LOG_BACKEND_ADSP_MTRACE=n
-CONFIG_SOF_LOG_LEVEL_INF=n
-CONFIG_SOF_LOG_LEVEL_OFF=y
-CONFIG_ZEPHYR_LOG=n
+CONFIG_SOF_LOG_LEVEL_INF=y
+CONFIG_SOF_LOG_LEVEL_OFF=n
+CONFIG_ZEPHYR_LOG=y
 
 CONFIG_INTEL_ADSP_IPC=y
 
@@ -45,3 +54,32 @@ CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
 CONFIG_COMP_KPB=n
 
 CONFIG_USERSPACE=y
+CONFIG_MAX_THREAD_BYTES=4
+
+CONFIG_COMP_UP_DOWN_MIXER=y
+CONFIG_COMP_MODULE_ADAPTER=y
+CONFIG_PASSTHROUGH_CODEC=y
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_CROSSOVER=y
+CONFIG_COMP_DCBLOCK=y
+CONFIG_COMP_IIR=y
+CONFIG_COMP_DRC=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_LEVEL_MULTIPLIER=y
+CONFIG_COMP_RTNR=y
+CONFIG_COMP_RTNR_STUB=y
+CONFIG_COMP_SMART_AMP=y
+CONFIG_COMP_TDFB=y
+CONFIG_COMP_STFT_PROCESS=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
+CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
+CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING=y
+CONFIG_GOOGLE_CTC_AUDIO_PROCESSING_MOCK=y
+CONFIG_COMP_IGO_NR=y
+CONFIG_COMP_IGO_NR_STUB=y
+CONFIG_COMP_NXP_EAP=y
+CONFIG_COMP_NXP_EAP_STUB=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_SOUND_DOSE=y

app/boards/intel_adsp_ace30_wcl_sim.conf

@@ -12,7 +12,7 @@ CONFIG_PM=n
 # enable Zephyr drivers
 CONFIG_DAI_INIT_PRIORITY=70
 CONFIG_DAI_DMIC_HW_IOCLK=19200000
-CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
+CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
 CONFIG_DAI_INTEL_SSP=n
 CONFIG_DMA_INTEL_ADSP_GPDMA=n

app/boards/native_sim.conf

@@ -0,0 +1,6 @@
+CONFIG_ZEPHYR_POSIX=y
+CONFIG_SYS_HEAP_BIG_ONLY=y
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_ZEPHYR_LOG=y
+CONFIG_ZTEST=y
+CONFIG_SOF_BOOT_TEST_STANDALONE=y

app/boards/qemu_xtensa_dc233c_mmu.conf

@@ -1,10 +1,40 @@
 # SPDX-License-Identifier: BSD-3-Clause
 CONFIG_IPC_MAJOR_4=y
 CONFIG_USERSPACE=y
-CONFIG_ZTEST=y
+#CONFIG_ZTEST=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_MM_DRV=y
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_SOF_USERSPACE_LL=y
+#CONFIG_SOF_BOOT_TEST_STANDALONE=y
 
 # Ensure the kernel can exit QEMU on shutdown/panic
-CONFIG_REBOOT=y
+#CONFIG_REBOOT=y
+#CONFIG_ZTEST_STACK_SIZE=4096
+CONFIG_COMP_UP_DOWN_MIXER=y
+CONFIG_COMP_MODULE_ADAPTER=y
+CONFIG_PASSTHROUGH_CODEC=y
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_CROSSOVER=y
+CONFIG_COMP_DCBLOCK=y
+CONFIG_COMP_IIR=y
+CONFIG_COMP_DRC=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_LEVEL_MULTIPLIER=y
+CONFIG_COMP_RTNR=y
+CONFIG_COMP_RTNR_STUB=y
+CONFIG_COMP_SMART_AMP=y
+CONFIG_COMP_TDFB=y
+CONFIG_COMP_STFT_PROCESS=y
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
+CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
+CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING=y
+CONFIG_GOOGLE_CTC_AUDIO_PROCESSING_MOCK=y
+CONFIG_COMP_IGO_NR=y
+CONFIG_COMP_IGO_NR_STUB=y
+CONFIG_COMP_NXP_EAP=y
+CONFIG_COMP_NXP_EAP_STUB=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_SOUND_DOSE=y

app/overlays/ptl/ll_userspace_overlay.conf

@@ -0,0 +1,22 @@
+CONFIG_SOF_USERSPACE_LL=y
+
+# temporary (but for now mandatory) settings
+CONFIG_SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE=16384
+
+# make the drivers work in user-space
+CONFIG_SOF_USERSPACE_INTERFACE_DMA=y
+CONFIG_DAI_USERSPACE=y
+
+# disable features that don't work in user-space (at least yet)
+CONFIG_COLD_STORE_EXECUTE_DEBUG=n
+CONFIG_CROSS_CORE_STREAM=n
+CONFIG_INTEL_ADSP_MIC_PRIVACY=n
+CONFIG_XRUN_NOTIFICATIONS_ENABLE=n
+CONFIG_SOF_BOOT_TEST_ALLOWED=n
+CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=n
+CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=n
+
+# disable llext (hits privilege issues in user-space now)
+CONFIG_LLEXT_STORAGE_WRITABLE=n
+CONFIG_LLEXT_EXPERIMENTAL=n
+CONFIG_MODULES=n

app/prj.conf

@@ -49,3 +49,4 @@ CONFIG_SCHED_CPU_MASK=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=15000
 CONFIG_DAI=y
 CONFIG_HEAP_MEM_POOL_SIZE=2048
+CONFIG_SPIN_VALIDATE=n

app/src/main.c

@@ -57,7 +57,7 @@ static int sof_app_main(void)
 	return 0;
 }
 
-#if CONFIG_SOF_BOOT_TEST && defined(QEMU_BOOT_TESTS)
+#if defined(QEMU_BOOT_TESTS)
 /* cleanly exit qemu so CI can continue and check test results */
 static inline void qemu_xtensa_exit(int status)
 {
@@ -73,14 +73,28 @@ static inline void qemu_xtensa_exit(int status)
 }
 #endif
 
+#ifdef CONFIG_REBOOT
+void sys_arch_reboot(int type)
+{
+#if defined(QEMU_BOOT_TESTS)
+	qemu_xtensa_exit(type);
+#endif
+	while (1) {
+		k_cpu_idle();
+	}
+}
+#endif
+
 #if CONFIG_ZTEST
 void test_main(void)
 {
 	sof_app_main();
-#if CONFIG_SOF_BOOT_TEST && defined(QEMU_BOOT_TESTS)
+#if CONFIG_SOF_BOOT_TEST
 	sof_run_boot_tests();
+#if defined(QEMU_BOOT_TESTS)
 	qemu_xtensa_exit(0);
 #endif
+#endif
 }
 #else
 int main(void)

app/ztest_overlay.conf

@@ -0,0 +1,8 @@
+CONFIG_ZTEST=y
+CONFIG_SOF_BOOT_TEST_STANDALONE=y
+CONFIG_LOG_BACKEND_ADSP_MTRACE=y
+CONFIG_ZTEST_STACK_SIZE=4096
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_ISR_STACK_SIZE=4096
+CONFIG_LOG_MODE_IMMEDIATE=y
+CONFIG_MAX_THREAD_BYTES=4

posix/include/rtos/alloc.h

@@ -97,29 +97,6 @@ static inline void *rballoc(uint32_t flags, size_t bytes)
 	return rballoc_align(flags, bytes, PLATFORM_DCACHE_ALIGN);
 }
 
-/**
- * Changes size of the memory block allocated.
- * @param ptr Address of the block to resize.
- * @param flags Flags, see SOF_MEM_FLAG_...
- * @param bytes New size in bytes.
- * @param old_bytes Old size in bytes.
- * @param alignment Alignment in bytes.
- * @return Pointer to the resized memory of NULL if failed.
- */
-void *rbrealloc_align(void *ptr, uint32_t flags, size_t bytes,
-		      size_t old_bytes, uint32_t alignment);
-
-/**
- * Similar to rballoc_align(), returns resized buffer aligned to
- * PLATFORM_DCACHE_ALIGN.
- */
-static inline void *rbrealloc(void *ptr, uint32_t flags,
-			      size_t bytes, size_t old_bytes)
-{
-	return rbrealloc_align(ptr, flags, bytes, old_bytes,
-			       PLATFORM_DCACHE_ALIGN);
-}
-
 /**
  * Frees the memory block.
  * @param ptr Pointer to the memory block.
@@ -141,6 +118,7 @@ void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
 		     size_t alignment);
 void sof_heap_free(struct k_heap *heap, void *addr);
 struct k_heap *sof_sys_heap_get(void);
+struct k_heap *sof_sys_user_heap_get(void);
 
 /**
  * Calculates length of the null-terminated string.

posix/include/rtos/mutex.h

@@ -62,4 +62,25 @@ static inline int sys_mutex_unlock(struct sys_mutex *mutex)
 	return 0;
 }
 
+/* provide a no-op implementation for zephyr/sys/sem.h */
+
+struct sys_sem {
+};
+
+static inline int sys_sem_init(struct sys_sem *sem, unsigned int initial_count,
+			       unsigned int limit)
+{
+	return 0;
+}
+
+static inline int sys_sem_give(struct sys_sem *sem)
+{
+	return 0;
+}
+
+static inline int sys_sem_take(struct sys_sem *sem, k_timeout_t timeout)
+{
+	return 0;
+}
+
 #endif

posix/include/sof/lib/dma.h

@@ -35,6 +35,7 @@
 
 struct comp_buffer;
 struct comp_dev;
+struct k_heap;
 
 /** \addtogroup sof_dma_drivers DMA Drivers
  *  DMA Drivers API specification.
@@ -511,13 +512,14 @@ static inline void dma_sg_init(struct dma_sg_elem_array *ea)
 	ea->elems = NULL;
 }
 
-int dma_sg_alloc(struct dma_sg_elem_array *ea,
+int dma_sg_alloc(struct k_heap *heap,
+		 struct dma_sg_elem_array *ea,
 		 uint32_t flags,
 		 uint32_t direction,
 		 uint32_t buffer_count, uint32_t buffer_bytes,
 		 uintptr_t dma_buffer_addr, uintptr_t external_addr);
 
-void dma_sg_free(struct dma_sg_elem_array *ea);
+void dma_sg_free(struct k_heap *heap, struct dma_sg_elem_array *ea);
 
 /**
  * \brief Get the total size of SG buffer