Skip to content

cmake/zephyr: decentralize src/schedule/#9896

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
Mar 17, 2025
Merged

cmake/zephyr: decentralize src/schedule/ #9896

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
52 changes: 47 additions & 5 deletions src/schedule/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,59 @@
# SPDX-License-Identifier: BSD-3-Clause

if(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL)
add_local_sources(sof dma_multi_chan_domain.c)
set(base_files
schedule.c
)

if(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
list(APPEND base_files dma_multi_chan_domain.c)
endif()

if(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
list(APPEND base_files dma_single_chan_domain.c)
endif()

if(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL)
add_local_sources(sof dma_single_chan_domain.c)
is_zephyr(it_is)
if(it_is) ### Zephyr ###

zephyr_library_sources(
${base_files}
zephyr_domain.c
)

if (CONFIG_SOC_ACP_6_0)
# Zephyr DMA domain should only be used with zephyr_ll
if (CONFIG_DMA_DOMAIN)
zephyr_library_sources(
zephyr_ll.c
zephyr_dma_domain.c
)
else()
zephyr_library_sources(
ll_schedule.c
)
endif()
else()
zephyr_library_sources(
zephyr_ll.c
)
endif()

zephyr_library_sources_ifdef(CONFIG_ZEPHYR_DP_SCHEDULER
${SOF_SRC_PATH}/schedule/zephyr_dp_schedule.c
)

zephyr_library_sources_ifdef(CONFIG_ZEPHYR_TWB_SCHEDULER
${SOF_SRC_PATH}/schedule/zephyr_twb_schedule.c
)

else() ### Not Zephyr ###

add_local_sources(sof
${base_files}
edf_schedule.c
ll_schedule.c
schedule.c
task.c
timer_domain.c
)

endif()
52 changes: 1 addition & 51 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -203,6 +203,7 @@ add_subdirectory(../src/init/ init_unused_install/)
add_subdirectory(../src/ipc/ ipc_unused_install/)
add_subdirectory(../src/debug/telemetry/ telemetry_unused_install/)
add_subdirectory(../src/debug/debug_stream/ debug_stream_unused_install/)
add_subdirectory(../src/schedule/ schedule_unused_install/)

if(CONFIG_COMP_TESTER STREQUAL "m")
add_subdirectory(${SOF_DEBUG_PATH}/tester/llext
Expand DownExpand Up@@ -235,11 +236,6 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25)
lib/dma.c
)

# SOF core infrastructure - runs on top of Zephyr
zephyr_library_sources(
${SOF_SRC_PATH}/schedule/zephyr_ll.c
)

set(PLATFORM "tigerlake")
zephyr_include_directories(${SOF_PLATFORM_PATH}/intel/cavs/include)
endif()
Expand DownExpand Up@@ -271,14 +267,6 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
${SOF_SRC_PATH}/schedule/zephyr_ll.c
)

zephyr_library_sources_ifdef(CONFIG_ZEPHYR_DP_SCHEDULER
${SOF_SRC_PATH}/schedule/zephyr_dp_schedule.c
)

zephyr_library_sources_ifdef(CONFIG_ZEPHYR_TWB_SCHEDULER
${SOF_SRC_PATH}/schedule/zephyr_twb_schedule.c
)

# Sources for virtual heap management
zephyr_library_sources(
lib/regions_mm.c
Expand DownExpand Up@@ -321,8 +309,6 @@ if (CONFIG_SOC_MIMX8QM6_ADSP OR CONFIG_SOC_MIMX8QX6_ADSP)
lib/dma.c
)

zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)

set(PLATFORM "imx8")
endif()

Expand All@@ -342,8 +328,6 @@ if (CONFIG_SOC_MIMX8ML8_ADSP)
lib/dma.c
)

zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)

set(PLATFORM "imx8m")
endif()

Expand All@@ -363,8 +347,6 @@ if (CONFIG_SOC_MIMX8UD7_ADSP)
lib/dma.c
)

zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)

set(PLATFORM "imx8ulp")
endif()

Expand All@@ -381,10 +363,6 @@ if (CONFIG_SOC_MIMX9352_A55)
${SOF_DRIVERS_PATH}/imx/ipc.c
)

zephyr_library_sources(
${SOF_SRC_PATH}/schedule/zephyr_ll.c
)

set(PLATFORM "imx93_a55")
endif()

Expand All@@ -400,10 +378,6 @@ if (CONFIG_SOC_MIMX9596_M7)
${SOF_DRIVERS_PATH}/imx/ipc.c
)

zephyr_library_sources(
${SOF_SRC_PATH}/schedule/zephyr_ll.c
)

# SOF-specific linker script additions
zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/platform/imx95/linker/data-sections.ld)

Expand DownExpand Up@@ -444,17 +418,6 @@ if (CONFIG_SOC_ACP_6_0)
${SOF_SRC_PATH}/drivers/interrupt.c
)

# Zephyr DMA domain should only be used with zephyr_ll
if (CONFIG_DMA_DOMAIN)
zephyr_library_sources(
${SOF_SRC_PATH}/schedule/zephyr_ll.c
)
else()
zephyr_library_sources(
${SOF_SRC_PATH}/schedule/ll_schedule.c
)
endif()

zephyr_include_directories(${SOF_PLATFORM_PATH}/amd/rembrandt/include)
zephyr_include_directories(${SOF_PLATFORM_PATH}/amd/common/include)
zephyr_include_directories(${SOF_PLATFORM_PATH}/amd/rembrandt/include/arch)
Expand All@@ -468,7 +431,6 @@ if (CONFIG_SOC_FAMILY_MTK)
zephyr_library_sources(
${SOF_PLATFORM_PATH}/mtk/platform.c
${SOF_PLATFORM_PATH}/mtk/dai.c
${SOF_SRC_PATH}/schedule/zephyr_ll.c
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
${SOF_SRC_PATH}/drivers/mediatek/afe/afe-memif.c
${SOF_SRC_PATH}/drivers/mediatek/afe/afe-dai.c
Expand All@@ -478,7 +440,6 @@ endif()

# Building for native_posix-based whole-OS host emulator
zephyr_library_sources_ifdef(CONFIG_ZEPHYR_POSIX
${SOF_SRC_PATH}/schedule/zephyr_ll.c
${SOF_PLATFORM_PATH}/posix/dma.c
${SOF_PLATFORM_PATH}/posix/dai.c
${SOF_PLATFORM_PATH}/posix/ipc.c
Expand DownExpand Up@@ -530,8 +491,6 @@ zephyr_library_sources(

# SOF core infrastructure - runs on top of Zephyr
${SOF_SRC_PATH}/arch/xtensa/drivers/cache_attr.c
${SOF_SRC_PATH}/schedule/zephyr_domain.c
${SOF_SRC_PATH}/schedule/schedule.c

${SOF_SRC_PATH}/idc/zephyr_idc.c

Expand DownExpand Up@@ -612,15 +571,6 @@ add_subdirectory(../src/module module_unused_install/)
if(CONFIG_PIPELINE_2_0)
zephyr_library_sources(${SOF_AUDIO_PATH}/buffers/ring_buffer.c)
endif()
if(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
zephyr_library_sources(${SOF_SRC_PATH}/schedule/dma_single_chan_domain.c)
endif()
if(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL AND NOT(CONFIG_DMA_DOMAIN))
zephyr_library_sources(${SOF_SRC_PATH}/schedule/dma_multi_chan_domain.c)
endif()
if (CONFIG_DMA_DOMAIN)
zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_dma_domain.c)
endif()

if(CONFIG_COMP_BLOB)
zephyr_library_sources(
Expand Down