fix and re-enable Zephyr builds for apl with xcc #4852

lyakh · 2021-10-07T08:26:32Z

This should fix #4645, but additional Zephyr fixes are needed to fix the run-time too

lgirdwood · 2021-10-07T14:15:46Z

src/include/sof/audio/src/src_config.h

Can we make this Kconfig defaults for each platform ?

@lgirdwood in principle we can, sure. But just a couple of day ago I had to remind myself that select statements in Kconfig aren't recursive. I was trying to reconfigure the kernel, changed an option, its directly selected dependencies got switched, but not the next level up. So, maybe it would be good to limit the use of select at least where it's easy to avoid?

Please add a comment explaining that this is for memory usage reasons (and not for avoiding a bug or some other reason)

I find this more readable because it's closer to plain English:

if defined __XCC__ && ! (CONFIG_ZEPHYR_SOF_MODULE && CONFIG_APOLLOLAKE)

as in: "do not do this for Zephyr on APL"

Don't ask me about Kconfig but there seems to be some good documentation at https://docs.zephyrproject.org/latest/guides/build/kconfig/tips.html#alternatives-to-select

@marc-hb ack, agree, updated

marc-hb

https://sof-ci.01.org/sofpr/PR4852/build10649/build/apl_zph.txt build successful with XCC

kv2019i

Looks good. If @singalsu can check the algo-version check. If there's a cleaner way, let'd do that, but if not, let's go with this.

kv2019i · 2021-10-11T07:34:08Z

src/include/sof/audio/src/src_config.h

@singalsu Can you review this? Is there a cleaner way to do this?

There's no point in leaving out the the optimizations, the intrinsics code is ball park of 10x speed with same configuration. Instead Zephyr build should choose the tiny coefficients set from kconfig (CONFIG_COMP_SRC_TINY) but keep optimizations. @lyakh Do you have ideas how to accomplish it?

@singalsu it's easy to enable CONFIG_COMP_SRC_TINY for Zephyr on APL, but then it would be used for both gcc and xcc. Don't think we can check for compiler in Kconfig. Or we can do something like

#if defined __XCC__ +#if CONFIG_APOLLOLAKE && CONFIG_ZEPHYR_SOF_MODULE +#define SRC_SHORT 1 +#endif

What's preferred?

We can probably override the CONFIG_COMP_SRC_TINY default value in xtensa-build-zephyr.sh. We have the platform and compiler information there. For similar examples search for "config" in https://github.com/thesofproject/sof/blob/main/scripts/xtensa-build-all.sh

@marc-hb I'd rather not do that. It should work without using the script too.

There are many other ways to ran out of memory (or worse) with Kconfig but fair enough: so much better when the defaults work.

but then it would be used for both gcc and xcc

How much of a problem would this be?

@marc-hb 0, it was my mistake: with gcc the SRC_SHORT option is already used

singalsu

There's another way

Building SOF with Zephyr for Apollolake with XCC fails because of insufficient RAM. Reduce the heap size to fix the problem. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

lyakh · 2021-10-12T08:30:10Z

as discussed with @singalsu I've moved src configuration to a Zephyr PR zephyrproject-rtos/zephyr#39351

singalsu

Looks good to me, thanks!

kv2019i · 2021-10-13T08:40:44Z

https://sof-ci.01.org/sofpr/PR4852/build10688/build/apl_zph_error.txt still failing. Some iteration on zephyrproject-rtos/zephyr#39351 needed. Once it is merged, we can merge this.

Zephyr XCC builds for Apollolake can be re-enabled now after the RAM footprint has been reduced. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

lgirdwood · 2021-10-13T13:25:15Z

@wszypelt @kkarask looks like CI is blocked ?

wszypelt · 2021-10-13T13:54:11Z

@lgirdwood yes, there were some problems, but it's working fine now

marc-hb · 2021-10-13T18:12:26Z

Still failing in https://sof-ci.01.org/sofpr/PR4852/build10697/build/

/srv/home/jenkins/xcc/install/tools/RG-2017.8-linux/XtensaTools/bin/xt-ld:
address 0x9e084178 of zephyr/zephyr_prebuilt.elf section `.bss' is not within region `ucram'

This was with Zephyr commit 2f359aeacfab and SOF commit:

bc0b7e8bc 9823983a0 d50bef36e (HEAD, sof/pull/4852/merge)
Merge d50bef36eb80a03029edbcf008526dcff0f91f23 into 9823983a0ff037e5d9c8c1ee91ec806fa7ac87d2

EDIT: Zephyr commit 2f359aeacfab was 2 commits short of @lyakh's CONFIG_COMP_SRC_TINY=y change zephyrproject-rtos/zephyr#39351 so no surprise it still fails.

marc-hb · 2021-10-13T20:40:37Z

SOFCI TEST

marc-hb · 2021-10-14T06:33:27Z

Successful XCC + APL build at https://sof-ci.01.org/sofpr/PR4852/build10705/build/apl_zph.txt with newer Zephyr a8c4abdcf055

kv2019i · 2021-10-14T08:34:52Z

@lgirdwood This is now ready!

lyakh requested review from dbaluta, lbetlej, lgirdwood, marc-hb, mmaka1 and plbossart as code owners October 7, 2021 08:26

lgirdwood reviewed Oct 7, 2021

View reviewed changes

lyakh force-pushed the z-apl-xcc branch from 8296ef2 to e7a8835 Compare October 8, 2021 06:17

marc-hb approved these changes Oct 8, 2021

View reviewed changes

marc-hb requested review from andyross and kv2019i October 8, 2021 18:40

lyakh mentioned this pull request Oct 11, 2021

zephyr: reimplement cached heap zone on single Zephyr sys_heap #4857

Merged

kv2019i approved these changes Oct 11, 2021

View reviewed changes

lyakh requested a review from singalsu October 11, 2021 08:39

singalsu requested changes Oct 11, 2021

View reviewed changes

zephyr: further reduce the size of heap on APL with XCC

45e3a77

Building SOF with Zephyr for Apollolake with XCC fails because of insufficient RAM. Reduce the heap size to fix the problem. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

lyakh force-pushed the z-apl-xcc branch from e7a8835 to 350ec77 Compare October 12, 2021 08:27

singalsu approved these changes Oct 12, 2021

View reviewed changes

lyakh mentioned this pull request Oct 12, 2021

boards: xtensa: intel_adsp_cavs15: force COMP_SRC_TINY zephyrproject-rtos/zephyr#39351

Merged

lyakh force-pushed the z-apl-xcc branch from 350ec77 to 0bb3dc2 Compare October 13, 2021 10:14

zephyr: apl: re-enable building with XCC

d50bef3

Zephyr XCC builds for Apollolake can be re-enabled now after the RAM footprint has been reduced. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

lyakh force-pushed the z-apl-xcc branch from 0bb3dc2 to d50bef3 Compare October 13, 2021 10:51

lgirdwood approved these changes Oct 13, 2021

View reviewed changes

lgirdwood merged commit 6ce3237 into thesofproject:main Oct 14, 2021

lyakh deleted the z-apl-xcc branch October 14, 2021 14:36

ghost mentioned this pull request Oct 15, 2021

[BUG] APL_UP2_NOCODEC_ZEPHYR with XCC failed to playback or capture #4880

Closed

fix and re-enable Zephyr builds for apl with xcc #4852

fix and re-enable Zephyr builds for apl with xcc #4852

Uh oh!

Conversation

lyakh commented Oct 7, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marc-hb Oct 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marc-hb left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

singalsu Oct 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

marc-hb Oct 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

singalsu left a comment

Choose a reason for hiding this comment

Uh oh!

lyakh commented Oct 12, 2021

Uh oh!

singalsu left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i commented Oct 13, 2021

Uh oh!

lgirdwood commented Oct 13, 2021

Uh oh!

wszypelt commented Oct 13, 2021

Uh oh!

marc-hb commented Oct 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marc-hb commented Oct 13, 2021

Uh oh!

marc-hb commented Oct 14, 2021

Uh oh!

kv2019i commented Oct 14, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

marc-hb Oct 7, 2021 •

edited

Loading

singalsu Oct 11, 2021 •

edited

Loading

marc-hb Oct 12, 2021 •

edited

Loading

marc-hb commented Oct 13, 2021 •

edited

Loading