updates.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Author: lrgirdwo

src/audio/copier/copier.c

@@ -1053,9 +1053,11 @@ static uint64_t copier_get_processed_data(struct comp_dev *dev, uint32_t stream_
 			switch (dev->ipc_config.type) {
 			case  SOF_COMP_HOST:
 				source = dev->direction == SOF_IPC_STREAM_PLAYBACK;
-				/* only support host, not support ipcgtw/qemugtw case */
+				/* support host and qemugtw gateway cases */
 				if (!cd->ipc_gtw && !cd->qemu_gtw && source == input)
 					ret = cd->hd->total_data_processed;
+				else if (cd->qemu_gtw && source == input)
+					ret = input ? cd->input_total_data_processed : cd->output_total_data_processed;
 				break;
 			case  SOF_COMP_DAI:
 				source = dev->direction == SOF_IPC_STREAM_CAPTURE;

src/audio/copier/copier_qemugtw.c

@@ -159,6 +159,9 @@ int copier_qemugtw_process(struct comp_dev *dev)
 			qemugtw_generate_signal(qemugtw_data, buf, data_size);
 			buffer_stream_writeback(buf, data_size);
 			comp_update_buffer_produce(buf, data_size);
+			struct processing_module *mod = comp_mod(dev);
+			struct copier_data *cd = module_get_private_data(mod);
+			cd->input_total_data_processed += data_size;
 		}
 	} else { /* DSP -> GTW, consume and validate */
 		process_bytes = audio_stream_period_bytes(&buf->stream, dev->frames);
@@ -167,6 +170,9 @@ int copier_qemugtw_process(struct comp_dev *dev)
 			buffer_stream_invalidate(buf, data_size);
 			qemugtw_validate_signal(qemugtw_data, buf, data_size);
 			comp_update_buffer_consume(buf, data_size);
+			struct processing_module *mod = comp_mod(dev);
+			struct copier_data *cd = module_get_private_data(mod);
+			cd->output_total_data_processed += data_size;
 		}
 	}
 

zephyr/test/CMakeLists.txt

@@ -23,4 +23,6 @@ endif()
 if(CONFIG_SOF_BOOT_TEST_STANDALONE AND CONFIG_SOF_USERSPACE_LL)
   zephyr_library_sources(userspace/test_ll_task.c)
   zephyr_library_sources(userspace/test_ipc4_pipeline.c)
+  zephyr_library_sources(audio/test_copier.c)
+  zephyr_library_sources(audio/test_src.c)
 endif()

zephyr/test/userspace/test_ipc4_pipeline.c

@@ -259,29 +259,28 @@ static void *ipc4_pipeline_setup(void)
 	struct sof *sof = sof_get();
 	printk("DEBUG: Entering ipc4_pipeline_setup\n");
 
-	volatile void *refs[] = {
-		sys_comp_module_src_interface_init,
-		sys_comp_module_copier_interface_init,
-		sys_comp_module_volume_interface_init,
-		sys_comp_module_mixin_interface_init,
-		sys_comp_module_mixout_interface_init,
+	sys_comp_init(sof);
+
+	sys_comp_module_src_interface_init();
+	sys_comp_module_copier_interface_init();
+	sys_comp_module_volume_interface_init();
+	sys_comp_module_mixin_interface_init();
+	sys_comp_module_mixout_interface_init();
 #if defined(CONFIG_COMP_EQ_IIR)
-		sys_comp_module_eq_iir_interface_init,
+	sys_comp_module_eq_iir_interface_init();
 #endif
 #if defined(CONFIG_COMP_EQ_FIR)
-		sys_comp_module_eq_fir_interface_init,
+	sys_comp_module_eq_fir_interface_init();
 #endif
 #if defined(CONFIG_COMP_DRC)
-		sys_comp_module_drc_interface_init,
+	sys_comp_module_drc_interface_init();
 #endif
 #if defined(CONFIG_COMP_ARIA)
-		sys_comp_module_aria_interface_init,
+	sys_comp_module_aria_interface_init();
 #endif
 #if defined(CONFIG_COMP_MFCC)
-		sys_comp_module_mfcc_interface_init,
+	sys_comp_module_mfcc_interface_init();
 #endif
-	};
-	(void)refs;
 
 	/* SOF_BOOT_TEST_STANDALONE skips IPC init. We must allocate it manually for testing. */
 	if (!sof->ipc) {
@@ -477,6 +476,8 @@ struct test_pipeline_state {
 	struct comp_dev *sched_comp;
 	struct comp_buffer *source_buf; /* Mock source buffer for edge */
 	struct comp_buffer *sink_buf;   /* Mock sink buffer for edge */
+	uint64_t accumulated_bytes[MAX_PIPELINE_MODULES];
+	void *last_wptr[MAX_PIPELINE_MODULES];
 };
 
 /**
@@ -577,15 +578,33 @@ static void print_module_buffers(struct test_pipeline_state *p_state)
 {
 	for (uint32_t i = 0; i < p_state->num_modules; i++) {
 		struct comp_dev *mod = p_state->modules[i];
-		uint64_t bytes_copied = comp_get_total_data_processed(mod, 0, true);
+		uint64_t bytes_copied = 0;
 		uint32_t frames_copied = 0;
 		struct list_item *clist;
 		uint32_t frame_bytes = 0;
 
 		if (!list_is_empty(&mod->bsink_list)) {
 			struct comp_buffer *buf = list_first_item(&mod->bsink_list, struct comp_buffer, source_list);
 			frame_bytes = audio_stream_frame_bytes(&buf->stream);
+			
+			void *current_wptr = audio_stream_get_wptr(&buf->stream);
+			void *last_wptr = p_state->last_wptr[i];
+			uint32_t buffer_size = audio_stream_get_size(&buf->stream);
+			
+			if (last_wptr && current_wptr != last_wptr) {
+				uint32_t diff;
+				if (current_wptr >= last_wptr)
+					diff = (char *)current_wptr - (char *)last_wptr;
+				else
+					diff = buffer_size - ((char *)last_wptr - (char *)current_wptr);
+					
+				p_state->accumulated_bytes[i] += diff;
+			}
+			p_state->last_wptr[i] = current_wptr;
+			bytes_copied = p_state->accumulated_bytes[i];
 		} else if (!list_is_empty(&mod->bsource_list)) {
+			/* If it's a gateway that only has a source but no sink, query its internal counter */
+			bytes_copied = comp_get_total_data_processed(mod, 0, false);
 			struct comp_buffer *buf = list_first_item(&mod->bsource_list, struct comp_buffer, sink_list);
 			frame_bytes = audio_stream_frame_bytes(&buf->stream);
 		}
@@ -658,7 +677,8 @@ static int test_pipeline_build(struct test_pipeline_state *state,
 			};
 		};
 
-		zassert_not_null(drv, "Driver for module %zu not found", i);
+		zassert_not_null(drv, "Driver for module %zu (comp_id 0x%x) not found", 
+				 i, defs[i].comp_id);
 
 		struct comp_ipc_config cfg = {
 			.id = defs[i].comp_id,
@@ -1394,34 +1414,33 @@ static void multiple_pipelines_thread(void *p1, void *p2, void *p3)
 #endif
 
 #if defined(CONFIG_COMP_MFCC)
-	struct sof_mfcc_config mfcc_cfg;
-	struct ipc4_base_module_cfg mfcc_base;
-	memcpy(&mfcc_base, &mfcc_cfg, sizeof(mfcc_base));
-	memset(&mfcc_cfg, 0, sizeof(mfcc_cfg));
+	struct sof_mfcc_config mfcc_init;
+	memset(&mfcc_init, 0, sizeof(mfcc_init));
 
 	/* MFCC implicitly overlays the base configuration over its `size` + `reserved` fields */
-	mfcc_base = base_cfg;
-	mfcc_base.cpc = sizeof(struct sof_mfcc_config); /* cpc aliases to config->size */
-
-	mfcc_cfg.sample_frequency = 48000;
-	mfcc_cfg.channel = 0;
-	mfcc_cfg.frame_length = 400;
-	mfcc_cfg.frame_shift = 160;
-	mfcc_cfg.num_mel_bins = 23;
-	mfcc_cfg.num_ceps = 13;
-	mfcc_cfg.dct = MFCC_DCT_II;
-	mfcc_cfg.window = MFCC_BLACKMAN_WINDOW;
-	mfcc_cfg.blackman_coef = MFCC_BLACKMAN_A0;
-	mfcc_cfg.cepstral_lifter = 22 << 9;
-	mfcc_cfg.round_to_power_of_two = true;
-	mfcc_cfg.snip_edges = true;
+	memcpy(&mfcc_init, &base_cfg, sizeof(base_cfg));
+	/* We set cpc (aliasing config->size) so MFCC parses the entire incoming configuration payload */
+	mfcc_init.size = sizeof(struct sof_mfcc_config);
+
+	mfcc_init.sample_frequency = 48000;
+	mfcc_init.channel = 0;
+	mfcc_init.frame_length = 400;
+	mfcc_init.frame_shift = 160;
+	mfcc_init.num_mel_bins = 23;
+	mfcc_init.num_ceps = 13;
+	mfcc_init.dct = MFCC_DCT_II;
+	mfcc_init.window = MFCC_BLACKMAN_WINDOW;
+	mfcc_init.blackman_coef = MFCC_BLACKMAN_A0;
+	mfcc_init.cepstral_lifter = 22 << 9;
+	mfcc_init.round_to_power_of_two = true;
+	mfcc_init.snip_edges = true;
 
 	struct test_module_def p3_defs[] = {
 		{ .uuid = &COPIER_UUID, .comp_id = IPC4_COMP_ID(13, 0), .pipeline_id = 12,
 		  .init_data = &c_cfg, .init_data_size = sizeof(c_cfg), .is_pipeline_source = true, .is_sched_comp = true,
 		  .num_sinks = 1, .sinks = { { .sink_comp_id = IPC4_COMP_ID(14, 0) } } },
 		{ .uuid = &MFCC_UUID, .comp_id = IPC4_COMP_ID(14, 0), .pipeline_id = 12,
-		  .init_data = &mfcc_base, .init_data_size = sizeof(mfcc_base),
+		  .init_data = &mfcc_init, .init_data_size = sizeof(mfcc_init),
 		  .num_sinks = 1, .sinks = { { .sink_comp_id = IPC4_COMP_ID(15, 0) } } },
 		{ .uuid = &COPIER_UUID, .comp_id = IPC4_COMP_ID(15, 0), .pipeline_id = 12,
 		  .init_data = &c_out_cfg, .init_data_size = sizeof(c_out_cfg), .is_pipeline_sink = true }
@@ -1619,26 +1638,26 @@ static void all_modules_ll_pipeline_thread(void *p1, void *p2, void *p3)
 #endif
 
 #if defined(CONFIG_COMP_MFCC)
-	struct sof_mfcc_config mfcc_cfg;
-	struct ipc4_base_module_cfg mfcc_base;
-	memcpy(&mfcc_base, &mfcc_cfg, sizeof(mfcc_base));
-	memset(&mfcc_cfg, 0, sizeof(mfcc_cfg));
-
-	mfcc_base = base_cfg;
-	mfcc_base.cpc = sizeof(struct sof_mfcc_config);
-
-	mfcc_cfg.sample_frequency = 48000;
-	mfcc_cfg.channel = 0;
-	mfcc_cfg.frame_length = 400;
-	mfcc_cfg.frame_shift = 160;
-	mfcc_cfg.num_mel_bins = 23;
-	mfcc_cfg.num_ceps = 13;
-	mfcc_cfg.dct = MFCC_DCT_II;
-	mfcc_cfg.window = MFCC_BLACKMAN_WINDOW;
-	mfcc_cfg.blackman_coef = MFCC_BLACKMAN_A0;
-	mfcc_cfg.cepstral_lifter = 22 << 9;
-	mfcc_cfg.round_to_power_of_two = true;
-	mfcc_cfg.snip_edges = true;
+	struct sof_mfcc_config mfcc_init;
+	memset(&mfcc_init, 0, sizeof(mfcc_init));
+
+	/* MFCC implicitly overlays the base configuration over its `size` + `reserved` fields */
+	memcpy(&mfcc_init, &base_cfg, sizeof(base_cfg));
+	/* We set cpc (aliasing config->size) so MFCC parses the entire incoming configuration payload */
+	mfcc_init.size = sizeof(struct sof_mfcc_config);
+
+	mfcc_init.sample_frequency = 48000;
+	mfcc_init.channel = 0;
+	mfcc_init.frame_length = 400;
+	mfcc_init.frame_shift = 160;
+	mfcc_init.num_mel_bins = 23;
+	mfcc_init.num_ceps = 13;
+	mfcc_init.dct = MFCC_DCT_II;
+	mfcc_init.window = MFCC_BLACKMAN_WINDOW;
+	mfcc_init.blackman_coef = MFCC_BLACKMAN_A0;
+	mfcc_init.cepstral_lifter = 22 << 9;
+	mfcc_init.round_to_power_of_two = true;
+	mfcc_init.snip_edges = true;
 #endif
 
 	struct test_module_info modules_to_test[] = {
@@ -1655,7 +1674,7 @@ static void all_modules_ll_pipeline_thread(void *p1, void *p2, void *p3)
 		{ &ARIA_UUID, &aria_cfg, sizeof(aria_cfg), "ARIA" },
 #endif
 #if defined(CONFIG_COMP_MFCC)
-		{ &MFCC_UUID, &mfcc_cfg, sizeof(mfcc_cfg), "MFCC" },
+		{ &MFCC_UUID, &mfcc_init, sizeof(mfcc_init), "MFCC" },
 #endif
 // Skip testing Volume standalone since test struct isn't fully defined yet 
 	};

zephyr/test/userspace/test_ll_task.c

@@ -10,9 +10,11 @@
 #include <sof/boot_test.h>
 #include <sof/lib/mailbox.h>
 #include <sof/lib/uuid.h>
-#include <sof/schedule/schedule.h>
 #include <sof/schedule/ll_schedule.h>
 #include <sof/schedule/ll_schedule_domain.h>
+#include <sof/audio/component.h>
+#include <sof/audio/component_ext.h>
+#include <sof/schedule/ll_schedule_domain.h>
 #include <sof/audio/pipeline.h>
 #include <rtos/task.h>
 #include <rtos/userspace_helper.h>
@@ -46,7 +48,7 @@ static enum task_state task_callback(void *arg)
 	return SOF_TASK_STATE_RESCHEDULE;
 }
 
-static void __attribute__((unused)) ll_task_test(void)
+static void ll_task_test(void)
 {
 	struct task *task;
 	int priority = 0;
@@ -88,11 +90,7 @@ static void __attribute__((unused)) ll_task_test(void)
 
 ZTEST(userspace_ll, ll_task_test)
 {
-#ifndef CONFIG_QEMU_TARGET
 	ll_task_test();
-#else
-	ztest_test_skip();
-#endif
 }
 
 static void pipeline_check(void)
@@ -129,6 +127,22 @@ ZTEST(userspace_ll, pipeline_check)
 	pipeline_check();
 }
 
-ZTEST_SUITE(userspace_ll, NULL, NULL, NULL, NULL, NULL);
+static struct dma_info dummy_dma_info = {
+	.dma_array = NULL,
+	.num_dmas = 0,
+};
+
+static void *userspace_ll_setup(void)
+{
+	struct sof *sof = sof_get();
+
+	k_mem_domain_add_partition(zephyr_ll_mem_domain(), &userspace_ll_part);
+	sof->dma_info = &dummy_dma_info;
+	sof->platform_timer_domain = zephyr_domain_init(19200000);
+	scheduler_init_ll(sof->platform_timer_domain);
+	return NULL;
+}
+
+ZTEST_SUITE(userspace_ll, NULL, userspace_ll_setup, NULL, NULL, NULL);