refactor l0 api: cleanup cmake files

Related-To: NEO-7507
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2023-03-16 14:18:00 +00:00 committed by Compute-Runtime-Automation
parent 65c73a690f
commit 2a60522e6e
10 changed files with 66 additions and 99 deletions

View File

@ -346,7 +346,7 @@ if(BUILD_WITH_L0)
${COMPUTE_RUNTIME_DEFINITIONS}
)
add_subdirectory_unique(api)
hide_subdir(api)
add_subdirectory_unique(source)
set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib")
@ -363,17 +363,13 @@ if(BUILD_WITH_L0)
add_library(${LIB_NAME} OBJECT
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/api "${NEO_BUILD_DIR}/${LIB_NAME}/api")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental${BRANCH_DIR_SUFFIX}source "${NEO_BUILD_DIR}/${LIB_NAME}/experimental${BRANCH_DIR_SUFFIX}source")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental/source/tracing "${NEO_BUILD_DIR}/${LIB_NAME}/experimental/tracing")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/source")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sysman/source "${NEO_BUILD_DIR}/${LIB_NAME}sysman/source")
append_sources_from_properties(L0_API_SOURCES L0_API)
target_sources(${LIB_NAME} PRIVATE ${L0_API_SOURCES})
if(${MOCKABLE})
get_property(COMPUTE_RUNTIME_DEFINITIONS
TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}

View File

@ -1,28 +1,7 @@
#
# Copyright (C) 2020-2022 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
add_subdirectory(core)
add_subdirectory(driver_experimental/public)
add_subdirectory(driver_experimental${BRANCH_DIR_SUFFIX})
add_subdirectory(driver_experimental/tracing)
add_subdirectory(tools)
add_subdirectory(sysman)
add_subdirectory(extensions${BRANCH_DIR_SUFFIX})
add_subdirectory(extensions/public)
set(L0_API "")
append_sources_from_properties(L0_API
L0_SRCS_API
L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API
L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API
L0_EXPERIMENTAL_TRACING_API
L0_SYSMAN_API
L0_TOOLS_API
L0_EXTENSIONS_SRCS_API
L0_PUBLIC_EXTENSIONS_SRCS_API
)
set_property(GLOBAL PROPERTY L0_API ${L0_API})
add_subdirectories()

View File

@ -1,25 +1,25 @@
#
# Copyright (C) 2020-2022 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_SRCS_API
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_context_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_copy_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_core_all_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_device_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_driver_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_event_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_fence_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_image_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_memory_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_module_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler_api_entrypoints.h
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_context_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_copy_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_core_all_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_device_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_driver_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_event_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_fence_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_image_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_memory_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_module_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler_api_entrypoints.h
)
set_property(GLOBAL PROPERTY L0_SRCS_API ${L0_SRCS_API})

View File

@ -1,10 +1,7 @@
#
# Copyright (C) 2020-2022 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API
)
set_property(GLOBAL PROPERTY L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API ${L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API})
add_subdirectories()

View File

@ -1,21 +1,20 @@
#
# Copyright (C) 2020-2022 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/zex_api.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_common.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_module.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_module.h
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/zex_api.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_common.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.h
${CMAKE_CURRENT_SOURCE_DIR}/zex_module.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zex_module.h
)
set_property(GLOBAL PROPERTY L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API ${L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API})

View File

@ -1,12 +1,11 @@
#
# Copyright (C) 2020-2022 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_EXPERIMENTAL_TRACING_API
${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.h
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.h
)
set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_TRACING_API ${L0_EXPERIMENTAL_TRACING_API})

View File

@ -1,10 +1,7 @@
#
# Copyright (C) 2020-2021 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_EXTENSIONS_SRCS_API
)
set_property(GLOBAL PROPERTY L0_EXTENSIONS_SRCS_API ${L0_EXTENSIONS_SRCS_API})
add_subdirectories()

View File

@ -1,12 +1,12 @@
#
# Copyright (C) 2020-2021 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_PUBLIC_EXTENSIONS_SRCS_API
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ze_exp_ext.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zet_exp_ext.cpp
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ze_exp_ext.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zet_exp_ext.cpp
)
set_property(GLOBAL PROPERTY L0_PUBLIC_EXTENSIONS_SRCS_API ${L0_PUBLIC_EXTENSIONS_SRCS_API})

View File

@ -4,10 +4,10 @@
# SPDX-License-Identifier: MIT
#
set(L0_SYSMAN_API
${CMAKE_CURRENT_SOURCE_DIR}/ze_sysman_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_all_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zes_handles_struct.h
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/ze_sysman_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_all_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zes_handles_struct.h
)
set_property(GLOBAL PROPERTY L0_SYSMAN_API ${L0_SYSMAN_API})

View File

@ -1,14 +1,14 @@
#
# Copyright (C) 2020-2022 Intel Corporation
# Copyright (C) 2020-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(L0_TOOLS_API
${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zet_debug_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zet_metric_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zet_module_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zet_tools_all_api_entrypoints.h
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zet_debug_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zet_metric_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zet_module_api_entrypoints.h
${CMAKE_CURRENT_SOURCE_DIR}/zet_tools_all_api_entrypoints.h
)
set_property(GLOBAL PROPERTY L0_TOOLS_API ${L0_TOOLS_API})