dax: Fixing compilation errors and better adaptation to LLEXT (contains Zephyr Dec03 update) #10413

checkupup · 2025-12-03T05:47:50Z

5.1, 7.1 input channels support for DAX.
Fixed compilation errors on XTOS
Remove memmove and sprintf usage in DAX code for better adaptation to LLEXT

sofci · 2025-12-03T05:48:08Z

Can one of the admins verify this patch?

reply test this please to run this test once

lyakh · 2025-12-03T07:40:06Z

src/audio/module_adapter/module/dolby/dax.c

 	uint32_t offset = 0;

-	for (uint32_t i = 0; i < param_sz && offset < MAX_PARAMS_STR_BUFFER_SIZE; i++)
-		offset += sprintf(params_str + offset, "%d,", param_val[i]);


other libc functions are exported from https://github.com/zephyrproject-rtos/zephyr/blob/main/subsys/llext/llext_export.c#L10-L17 - have you tried adding sprintf() and memmove() there?

Not yet. Oh thanks it seems like a better solution.

@lyakh This change works, then I will commit a PR to Zephyr and revert the modifications in SOF. Very thanks.

diff --git a/subsys/llext/llext_export.c b/subsys/llext/llext_export.c index fe2c417795b..c1835819fc3 100644 --- a/subsys/llext/llext_export.c +++ b/subsys/llext/llext_export.c @@ -5,6 +5,8 @@ */ #include <string.h> +#include <stdlib.h> +#include <stdio.h> #include <zephyr/llext/symbol.h> EXPORT_SYMBOL(strcpy); @@ -15,6 +17,9 @@ EXPORT_SYMBOL(strncmp); EXPORT_SYMBOL(memcmp); EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memset); +EXPORT_SYMBOL(memmove); +EXPORT_SYMBOL(strtoul); +EXPORT_SYMBOL(sprintf); /* These symbols are used if CCAC is given the flag -Os */ #ifdef __CCAC__

See Zephyr PR: zephyrproject-rtos/zephyr#100442

See Zephyr PR: zephyrproject-rtos/zephyr#100442

@checkupup as far as I understand this SOF PR does not actually formally depend on that Zephyr PR, right? Obviously you need it for your module to work, but from the SOF PoV nothing will break in the repository if this PR is merged before we update our Zephyr hash to include your Zephyr PR?

This is indeed a potential problem, let's adopt the modifications from both SOF and Zephyr.

Also approved zephyrproject-rtos/zephyr#100442.

@checkupup if we assume Zephyr PR will merge as-is, do we need any changes here ? I dont mind merging into SOF if its not a formal dependency.

@lgirdwood No, if Zephyr PR is merged, the SOF commit 8a0e63e is no longer needed. However if the SOF commit is merged, the Zephyr PR is still needed. Both of them serve the LLEXT implementation of DAX module.

@lgirdwood No, if Zephyr PR is merged, the SOF commit 8a0e63e is no longer needed. However if the SOF commit is merged, the Zephyr PR is still needed. Both of them serve the LLEXT implementation of DAX module.

@checkupup thanks, just checked and Zephyr PR is now merged. Can you drop the stdlib commit and add a west update to align with the new Zephyr commit we depend on. Thanks !

@lgirdwood I will add the new Zephyr commit to west.yml. However, regardless of whether the stdlib commit is summitted or not, the modification of west.yml is necessary, so I tend to keep this commit to improve robustness to dependencies.

lgirdwood

Just one question.

lgirdwood · 2025-12-04T14:24:57Z

src/audio/module_adapter/module/dolby/dax.c

 	uint32_t offset = 0;

-	for (uint32_t i = 0; i < param_sz && offset < MAX_PARAMS_STR_BUFFER_SIZE; i++)
-		offset += sprintf(params_str + offset, "%d,", param_val[i]);


Also approved zephyrproject-rtos/zephyr#100442.

@checkupup if we assume Zephyr PR will merge as-is, do we need any changes here ? I dont mind merging into SOF if its not a formal dependency.

lgirdwood

Just one question.

tools/topology/topology2/include/pipelines/cavs/mixout-gain-dax-dai-copier-playback.conf

checkupup · 2025-12-09T01:33:59Z

if we assume Zephyr PR will merge as-is, do we need any changes here ? I dont mind merging into SOF if its not a formal dependency.

@lgirdwood We don't need stdlib change if Zephyr PR merges as-is. But I believe minimizing dependencies is always a good thing when we compiling with CONFIG_COMP_DOLBY_AUDIO_PROCESSING_MOCK and working well with --gc-sections flag.

lgirdwood · 2025-12-09T15:21:29Z

rerun CI - due to lab power off

lgirdwood · 2025-12-09T15:21:37Z

SOFCI TEST

softwarecki · 2025-12-11T09:58:54Z

Please use tags in the PR title next time, for example dax: . When I first saw this PR, my initial thought was that it fixes something in llext.

lgirdwood · 2025-12-11T11:27:45Z

@checkupup looks like we have a conflict and the west patch could be dropped if it has your dependency.

Add 5.1, 7.1 input channels for DAX. Signed-off-by: Jun Lai <jun.lai@dolby.com>

sof_top_dir is unavailable for non-zephyr build. Signed-off-by: Jun Lai <jun.lai@dolby.com>

We remove memmove and sprintf for two reasons: 1) Both of them are not available on XTOS when using certain xtensa toolchains. 2) Them are not marked as EXPORT_SYMBOL by Zephyr when compiling as LLEXT module. Signed-off-by: Jun Lai <jun.lai@dolby.com>

checkupup · 2025-12-12T02:05:45Z

Hi, @lgirdwood , I have resolved the conflict, but we still needs the west patch:

No, if Zephyr PR is merged, the SOF commit 8a0e63e is no longer needed. However if the SOF commit is merged, the Zephyr PR is still needed. Both of them serve the LLEXT implementation of DAX module.

I have kept the SOF commit due to:

But I believe minimizing dependencies is always a good thing.

lgirdwood · 2025-12-12T16:35:06Z

looks like CI got stuck - will rerun.

lgirdwood · 2025-12-12T16:35:13Z

SOFCI TEST

west.yml

checkupup requested review from dbaluta, jsarha, jxstelter, kv2019i, lbetlej, lgirdwood, mmaka1, plbossart and ranj063 as code owners December 3, 2025 05:47

lyakh reviewed Dec 3, 2025

View reviewed changes

checkupup force-pushed the dax_fixes branch 2 times, most recently from 5220336 to 8a0e63e Compare December 4, 2025 08:33

lgirdwood reviewed Dec 4, 2025

View reviewed changes

lgirdwood approved these changes Dec 8, 2025

View reviewed changes

kv2019i approved these changes Dec 8, 2025

View reviewed changes

tools/topology/topology2/include/pipelines/cavs/mixout-gain-dax-dai-copier-playback.conf Outdated Show resolved Hide resolved

checkupup force-pushed the dax_fixes branch from 8a0e63e to 5649df7 Compare December 10, 2025 08:41

softwarecki changed the title ~~Fixing compilation errors and better adaptation to LLEXT~~ dax: Fixing compilation errors and better adaptation to LLEXT Dec 11, 2025

checkupup added 3 commits December 12, 2025 09:20

audio: dax: add multichannel support

84f4d5a

Add 5.1, 7.1 input channels for DAX. Signed-off-by: Jun Lai <jun.lai@dolby.com>

audio: dax: fix compilation errors on XTOS

abd969b

sof_top_dir is unavailable for non-zephyr build. Signed-off-by: Jun Lai <jun.lai@dolby.com>

checkupup force-pushed the dax_fixes branch from 5649df7 to e202d78 Compare December 12, 2025 01:58

kv2019i changed the title ~~dax: Fixing compilation errors and better adaptation to LLEXT~~ dax: Fixing compilation errors and better adaptation to LLEXT (contains Zephyr Dec03 update) Dec 12, 2025

kv2019i reviewed Dec 12, 2025

View reviewed changes

west.yml Show resolved Hide resolved

kv2019i mentioned this pull request Dec 15, 2025

west.yml: update zephyr to 7c67dea76a9 #10444

Merged

kv2019i merged commit 631fc30 into thesofproject:main Dec 15, 2025
37 of 43 checks passed

checkupup deleted the dax_fixes branch December 23, 2025 01:53

dax: Fixing compilation errors and better adaptation to LLEXT (contains Zephyr Dec03 update) #10413

dax: Fixing compilation errors and better adaptation to LLEXT (contains Zephyr Dec03 update) #10413

Uh oh!

Conversation

checkupup commented Dec 3, 2025

Uh oh!

sofci commented Dec 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lgirdwood left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lgirdwood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

checkupup commented Dec 9, 2025

Uh oh!

lgirdwood commented Dec 9, 2025

Uh oh!

lgirdwood commented Dec 9, 2025

Uh oh!

softwarecki commented Dec 11, 2025

Uh oh!

lgirdwood commented Dec 11, 2025

Uh oh!

checkupup commented Dec 12, 2025

Uh oh!

lgirdwood commented Dec 12, 2025

Uh oh!

lgirdwood commented Dec 12, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants