Skip to content

cmake/zephyr: src/audio/CMakeLists.txt unification part 2#9912

Merged
kv2019i merged 17 commits intothesofproject:mainfrom
kv2019i:202403-cmake-decentr-audio-part2
Mar 25, 2025
Merged

cmake/zephyr: src/audio/CMakeLists.txt unification part 2#9912
kv2019i merged 17 commits intothesofproject:mainfrom
kv2019i:202403-cmake-decentr-audio-part2

Conversation

@kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Mar 20, 2025

Follow-up to #9906

This now converts all the remaining "simple cases" in src/audio.

I will submit separate PRs for remaining cases with added logic to handle stubs and 3p library integration. Also module_adapter will be a separate PR.

Link: #8260

lyakh
lyakh approved these changes Mar 21, 2025
View reviewed changes
Copy link
Collaborator

@lyakh lyakh left a comment

Choose a reason for hiding this comment

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

Using return()s could reduce some patches a bit, but not too important

src/audio/CMakeLists.txt
kpb.c
)
endif()
if(CONFIG_COMP_MIXER)
Copy link
Collaborator

@lyakh lyakh Mar 21, 2025

Choose a reason for hiding this comment

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

(a general comment to an earlier discussion) I think optically I actually prefer TAB over "two spaces" indentation. And cmake shouldn't really go beyond 3 levels of indentation... So 8-space TABs shouldn't exceed maximum line length

Copy link
Collaborator Author

@kv2019i kv2019i Mar 21, 2025

Choose a reason for hiding this comment

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

@lyakh I'll redirect to https://github.com/orgs/thesofproject/discussions/9899 and note that even the "Mastering CMake" O'Reily book follows the 2-space indent ;)

src/audio/tdfb/CMakeLists.txt
add_local_sources(sof tdfb_ipc4.c)
if(CONFIG_COMP_TDFB STREQUAL "m")
add_subdirectory(llext ${PROJECT_BINARY_DIR}/tdfb_llext)
add_dependencies(app tdfb)
Copy link
Collaborator

@lyakh lyakh Mar 21, 2025

Choose a reason for hiding this comment

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

why not return() as in others?

Copy link
Collaborator Author

@kv2019i kv2019i Mar 21, 2025

Choose a reason for hiding this comment

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

@lyakh Ack, this might have been a return() case. I've used two approaches to convert src/audio/foo/ build rules:

  1. if-else if the non-llext code had a single or two statements, or I anyways needed to touch the existing non-llext code.

  2. use return() f there was more logic in the CMakeLists.txt for the module that I did not need to touch.

I think this might have been better as a (2) case.

@kv2019i kv2019i mentioned this pull request Mar 21, 2025
Merged
@kv2019i kv2019i added the DNM Do Not Merge tag label Mar 24, 2025
@kv2019i kv2019i mentioned this pull request Mar 24, 2025
Closed
kv2019i added 14 commits March 25, 2025 12:18
@kv2019i
cmake/zephyr: move auxiliary modules like math earlier in build rules
9dfc213 
Split the build directory listing into two. First introduce directories
that add auxiliary modules to the build. These directories provide
modules that may be used by other modules. Then a second list for all
other directories.

This split avoids dependency issues with llext modules that require
auxiliary modules to be introduced first.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/mixer/
5e92106 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/mixer instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/mixin_mixout/
d86eed9 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/mixin_mixout/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/tone.c
b77283c 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/copier
b81e313 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/copier/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/volume/
f8413d6 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/volume/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio IPC4 modules
8a82825 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio for base_fw
and chain_dma modules.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/pcm_converter
c6b6dd2 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/pcm_converter/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
audio: add section comments to CMakeLists.txt
4d57eb9 
Add inline comments to explain how the build rules are
organized and ordered in the file.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/aria
b20974a 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/aria/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/crossover
d12fe79 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/crossover/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/drc
fdfc176 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/drc/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/tdbf
dc24142 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/tdbf/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/up_down_mixer
f2b4d22 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/up_down_mixer/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
kv2019i added 3 commits March 25, 2025 12:21
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/mux
0be61fc 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/mux/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/multiband_drc
61727d1 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/multiband_drc/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
cmake/zephyr: unify cmake rules for src/audio/mfcc
47a7b81 
Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/mfcc/
instead.

Link: thesofproject#8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i kv2019i force-pushed the 202403-cmake-decentr-audio-part2 branch from b3e12a0 to 47a7b81 Compare March 25, 2025 10:31
@kv2019i
Copy link
Collaborator Author

kv2019i commented Mar 25, 2025

New version pushed:

  • split module directory lists into separate auxiliary and main modules (a crude fix to llext dependencies, will file a ticket to solve this better)
  • rebase on top of latest main (as main moves math to be built as a module, which triggers the dependency problem)

@kv2019i
Copy link
Collaborator Author

kv2019i commented Mar 25, 2025

Stub error are due to Zephyr upstream bug zephyrproject-rtos/zephyr#87475 . PTL alsabat fail is known and tracked in https://github.com/thesofproject/sof/issues?q=is%3Aissue+is%3Aopen+label%3A%22Known+PR+Failures%22+ . Proceeding with merge.

@kv2019i kv2019i merged commit 5d97545 into thesofproject:main Mar 25, 2025
44 of 49 checks passed
@kv2019i kv2019i removed the DNM Do Not Merge tag label Apr 1, 2025
@kv2019i kv2019i mentioned this pull request Apr 1, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lyakh lyakh lyakh approved these changes

@lgirdwood lgirdwood lgirdwood approved these changes

@iuliana-prodan iuliana-prodan Awaiting requested review from iuliana-prodan iuliana-prodan is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@abonislawski abonislawski Awaiting requested review from abonislawski abonislawski is a code owner

@singalsu singalsu Awaiting requested review from singalsu singalsu is a code owner

@fkwasowi fkwasowi Awaiting requested review from fkwasowi fkwasowi is a code owner

@plbossart plbossart Awaiting requested review from plbossart plbossart is a code owner

@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 is a code owner

@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kv2019i @lyakh @lgirdwood