Skip to content

platform: simplify setting CORE_COUNT and MAX_CORE_COUNT #10334

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
kv2019i merged 1 commit into from
Oct 30, 2025
Merged

platform: simplify setting CORE_COUNT and MAX_CORE_COUNT #10334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions src/arch/host/Kconfig
View file
Open in desktop

This file was deleted.

25 changes: 17 additions & 8 deletions src/platform/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,21 +332,30 @@ config MT8196

endchoice

config MAX_CORE_COUNT
#
# For non-Zephyr builds like testbench, cmocka and SOF ALSA plugin,
# set core count separately.
#
if !ZEPHYR_SOF_MODULE
Copy link
Contributor

@nashif nashif Oct 28, 2025

Choose a reason for hiding this comment

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

where is this defined? isnt this in Zephyr and when SOF is a module? It will go away AFAIK, so we need a better way to detect a zephyr build I guess.

Copy link
Collaborator Author

@kv2019i kv2019i Oct 28, 2025

Choose a reason for hiding this comment

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

@nashif Indeed, the two-way dependencies are even more complicated. We do use this ZEPHYR_SOF_MODULE already elsewhere, so we need a replacement anyways.

So in short, when we check out the work/sof/west.yml manifest, and build with

west build --board intel_adsp/ace30/ptl /work/sof/app

We should have some Kconfig enabled to identify this is a west build that includes Zephyr.

Copy link
Collaborator Author

@kv2019i kv2019i Oct 28, 2025

Choose a reason for hiding this comment

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

@nashif Ok, CONFIG_ZEPHYR_SOF_MODULES is still ok, it is set even with your zephyrproject-rtos/zephyr#97946 . IOW it is set by Zephyr build system based on the manifest content, and in normal SOF build, it looks like:

$ cat /home/kvehmane/work/build-ptl/zephyr_modules.txt 
"sof":"/home/kvehmane/work/sof":"/home/kvehmane/work/sof/zephyr"
"cmsis_6":"/home/kvehmane/work/modules/hal/cmsis_6":"${ZEPHYR_CMSIS_6_CMAKE_DIR}"
"hal_nxp":"/home/kvehmane/work/modules/hal/nxp":"${ZEPHYR_HAL_NXP_CMAKE_DIR}"
"xtensa":"/home/kvehmane/work/modules/hal/xtensa":"/home/kvehmane/pr/work/modules/hal/xtensa"
"mbedtls":"/home/kvehmane/work/modules/crypto/mbedtls":"${ZEPHYR_MBEDTLS_CMAKE_DIR}"
"mipi-sys-t":"/home/kvehmane/work/modules/debug/mipi-sys-t":"/home/kvehmane/work/modules/debug/mipi-sys-t"


config MP_MAX_NUM_CPUS
int
default 5 if LUNARLAKE || PANTHERLAKE
default 4 if TIGERLAKE || NOVALAKE
default 3 if METEORLAKE
default 3 if WILDCATLAKE
default 1
help
Maximum number of cores per configuration

endif # !ZEPHYR_SOF_MODULE

config MAX_CORE_COUNT
int
default MP_MAX_NUM_CPUS
help
Maximum number of cores per configuration

config CORE_COUNT
int "Number of cores"
default MP_MAX_NUM_CPUS if KERNEL_BIN_NAME = "zephyr"
default MAX_CORE_COUNT
range 1 MAX_CORE_COUNT
default MP_MAX_NUM_CPUS
range 1 MP_MAX_NUM_CPUS
help
Number of used cores
Lowering available core count could result in lower power consumption
Expand Down
Loading