Skip to content

Fix compile errors when building SOF, from Zephyr, as a sample application #7533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbaluta merged 2 commits into from
Apr 28, 2023
Merged

Fix compile errors when building SOF, from Zephyr, as a sample application #7533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ed25a
ASRC: Update parameter type to match the header
iuliana-prodan Apr 28, 2023
9a30e55
hal: Update parameter type to match xtensa/hal.h
iuliana-prodan Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/arch/xtensa/hal/atomics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include <stdint.h>
#include <xtensa/hal.h>

int _xt_atomic_compare_exchange_4(int32_t *address, int32_t test_value, int32_t set_value);
int _xt_atomic_compare_exchange_4(int *address, int32_t test_value, int32_t set_value);

int _xt_atomic_compare_exchange_4(int32_t *address, int32_t test_value, int32_t set_value)
int _xt_atomic_compare_exchange_4(int *address, int32_t test_value, int32_t set_value)

@lyakh lyakh Apr 28, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting, I don't see this file being built with Zephyr? And I don't see this function called anywhere. How are you building?

@paulstelian97 paulstelian97 Apr 28, 2023 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The NXP config has select ATOMIC_OPERATIONS_BUILTIN.

The Intel config has select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" (note: probably should extend to also cover xt-clang?)

Files are in zephyr/soc/xtensa/{intel,nxp}_adsp/*/Kconfig.series

@iuliana-prodan iuliana-prodan Apr 28, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting, I don't see this file being built with Zephyr? And I don't see this function called anywhere. How are you building?

Directly from zephyr folder:
nxa06898@lsv15040:~/data/zephyrproject/zephyr$ west build -p always -b nxp_adsp_imx8m ../modules/audio/sof/ -- -DTOOLCHAIN=/opt/zephyr-sdk-0.15.2/xtensa-nxp_imx8m_adsp_zephyr-elf/bin/xtensa-nxp_imx8m_adsp_zephyr-elf -DINIT_CONFIG=imx8m_defconfig

@lyakh lyakh May 2, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only see atomics.c being built in src/arch/xtensa/hal/CMakeLists.txt and AFAIK that file isn't used in Zephyr builds, so I'm confused...

@lyakh lyakh May 2, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting, I don't see this file being built with Zephyr? And I don't see this function called anywhere. How are you building?

Directly from zephyr folder: nxa06898@lsv15040:~/data/zephyrproject/zephyr$ west build -p always -b nxp_adsp_imx8m ../modules/audio/sof/ -- -DTOOLCHAIN=/opt/zephyr-sdk-0.15.2/xtensa-nxp_imx8m_adsp_zephyr-elf/bin/xtensa-nxp_imx8m_adsp_zephyr-elf -DINIT_CONFIG=imx8m_defconfig

@iuliana-prodan this looks wrong to me. You should build modules/audio/sof/app, not modules/audio/sof

@paulstelian97 paulstelian97 May 2, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, so it can use the correct CMakeFiles.txt and related files. Yeah makes sense, she was using the CMakeFiles.txt for Xtos within the Zephyr build.

The fix still felt sketchy.

@iuliana-prodan iuliana-prodan May 2, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lyakh you're right! Compiling modules/audio/sof/app is fine, no warnings/errors thrown.
But, these fixes seems reasonable to me, since we need to have the same parameters in header and source.

{
return xthal_compare_and_set(address, test_value, set_value);
}
4 changes: 2 additions & 2 deletions src/audio/asrc/asrc_farrow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ enum asrc_error_code asrc_get_required_size(struct comp_dev *dev,
enum asrc_error_code asrc_initialise(struct comp_dev *dev,
struct asrc_farrow *src_obj,
int num_channels,
int fs_prim,
int fs_sec,
int32_t fs_prim,
int32_t fs_sec,
enum asrc_io_format input_format,
enum asrc_io_format output_format,
enum asrc_buffer_mode buffer_mode,
Expand Down