cmake/zephyr: start deduplication of src/audio/CMakeLists.txt #9906
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kv2019i
requested review from
abonislawski,
dbaluta,
iuliana-prodan,
lbetlej,
lgirdwood,
lyakh,
mmaka1,
plbossart and
singalsu
as code owners
lyakh
reviewed
Mar 19, 2025
Collaborator
lyakh
left a comment
lyakh
left a comment
There was a problem hiding this comment.
would be good to add a commit to convert src/math/CMakeLists.txt to the new macro
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. The audio directory is one of the more complex cmake files in the tree, so make the changes incrementally. This commit starts by adding including top/src/audio to Zephyr cmake, and moving over the first set of files. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Add sof_list_append_ifdef() macro and make it available for both Zephyr and XTOS builds. This is helpful when writing cmake rules for SOF modules. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
kv2019i
force-pushed
the
202403-cmake-decentr-audio-part1
branch
from
eb203fc to
df8b5e7
Compare
Collaborator
Author
|
V2 pushed:
|
Collaborator
Author
|
@lyakh Let's convert math in a separate PR once this is merged and makes the macro available to all. The old conventions weren't unifrom either, some build rules used helpers, some not. So having more verbose code now in math won't break the bank if we don't fix it immediately. |
Collaborator
Author
|
Getting a failure with SRC_LITE on MTL in Intel internal tests: |
kv2019i
force-pushed
the
202403-cmake-decentr-audio-part1
branch
from
df8b5e7 to
a50b287
Compare
lgirdwood
reviewed
Mar 19, 2025
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| add_local_sources(sof src_generic.c src_hifi2ep.c src_hifi3.c src_hifi4.c src_hifi5.c src_common.c src.c) | ||
| set(base_files src_generic.c src_hifi2ep.c src_hifi3.c src_hifi4.c src_hifi5.c src_common.c src.c) |
Member
There was a problem hiding this comment.
I know this is a copy of existing, but we should not need to build hifi2 for hifi 5 targets
Comment on lines
+13
to
+14
| is_zephyr(it_is) | ||
| if(it_is) ### Zephyr ### |
Member
There was a problem hiding this comment.
Would it not be simpler and more readable with
if(is_zephyr)
Collaborator
Author
There was a problem hiding this comment.
@lgirdwood there's a slight risk of broken telephone when I've been continueing Marc's work, but this would seem a standard cmake macro trick. possible more readable:
-is_zephyr(it_is)
-if(it_is) ### Zephyr ###
+is_zephyr(zephyr)
+if(zephyr) ### Zephyr ###
...?
Member
There was a problem hiding this comment.
ok, lest factor this improvement in as we go, not blocking this one though.
Collaborator
Author
|
V3 pushed:
|
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/buffers/ instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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/pipeline/ instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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>
The register to testbench needs the init function prototype into sof/audio/component.h. Add src_lite to the prototype list, so it can be enabled in testbench builds. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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/src/ instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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 dai and host component source files. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
The audio top-level CMakeLists.txt is a bit complex to follow as it has two separate set of build rules. One to build normal SOF firmware target, with rules in subfolders and another for the host-library build (not using subfolder CMakeLists.txt). The two sets are broken with a return() in the middle. Add inline commentary to the different sections making this easier to follow. Link: thesofproject#8606 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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/eq-iir and src/audio/eq-fir instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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/asrc instead Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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/dcblock instead Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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/selector instead Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
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
force-pushed
the
202403-cmake-decentr-audio-part1
branch
from
a50b287 to
df91fc1
Compare
Collaborator
Author
|
V4 pushed:
|
lgirdwood
approved these changes
Mar 19, 2025
lyakh
approved these changes
Mar 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First set of patches to convert audio cmake rules to common ones.
Link: #8260