From 798501c8c313aa94857e93b3e9e8e0d74f4c11ab Mon Sep 17 00:00:00 2001 From: Jaime Arteaga Date: Thu, 14 Apr 2022 20:21:46 +0000 Subject: [PATCH] Clean up driver experimental headers (2) Signed-off-by: Jaime Arteaga --- level_zero/api/CMakeLists.txt | 8 ++++--- .../api/driver_experimental/CMakeLists.txt | 10 ++++++++ .../public}/CMakeLists.txt | 6 +++-- .../public}/zex_api.h | 1 + .../public}/zex_driver.cpp | 3 +-- .../public}/zex_driver.h | 2 +- .../driver_experimental/public/zex_memory.cpp | 9 +++++++ .../driver_experimental/public/zex_memory.h | 24 +++++++++++++++++++ .../public}/zex_module.cpp | 3 +-- .../public}/zex_module.h | 2 +- .../tracing/CMakeLists.txt | 2 +- .../tracing/zet_tracing.cpp | 2 +- .../get_extension_function_lookup_map.cpp | 2 +- 13 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 level_zero/api/driver_experimental/CMakeLists.txt rename level_zero/api/{experimental => driver_experimental/public}/CMakeLists.txt (57%) rename level_zero/api/{experimental => driver_experimental/public}/zex_api.h (93%) rename level_zero/api/{experimental => driver_experimental/public}/zex_driver.cpp (93%) rename level_zero/api/{experimental => driver_experimental/public}/zex_driver.h (94%) create mode 100644 level_zero/api/driver_experimental/public/zex_memory.cpp create mode 100644 level_zero/api/driver_experimental/public/zex_memory.h rename level_zero/api/{experimental => driver_experimental/public}/zex_module.cpp (86%) rename level_zero/api/{experimental => driver_experimental/public}/zex_module.h (87%) rename level_zero/api/{experimental => driver_experimental}/tracing/CMakeLists.txt (82%) rename level_zero/api/{experimental => driver_experimental}/tracing/zet_tracing.cpp (96%) diff --git a/level_zero/api/CMakeLists.txt b/level_zero/api/CMakeLists.txt index 47a0650127..79f19aad2d 100644 --- a/level_zero/api/CMakeLists.txt +++ b/level_zero/api/CMakeLists.txt @@ -5,8 +5,9 @@ # add_subdirectory(core) -add_subdirectory(experimental${BRANCH_DIR_SUFFIX}) -add_subdirectory(experimental/tracing) +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}) @@ -15,7 +16,8 @@ add_subdirectory(extensions/public) set(L0_API "") append_sources_from_properties(L0_API L0_SRCS_API - L0_EXPERIMENTAL_API + L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API + L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API L0_EXPERIMENTAL_TRACING_API L0_SYSMAN_API L0_TOOLS_API diff --git a/level_zero/api/driver_experimental/CMakeLists.txt b/level_zero/api/driver_experimental/CMakeLists.txt new file mode 100644 index 0000000000..e61611bce8 --- /dev/null +++ b/level_zero/api/driver_experimental/CMakeLists.txt @@ -0,0 +1,10 @@ +# +# Copyright (C) 2020-2022 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}) diff --git a/level_zero/api/experimental/CMakeLists.txt b/level_zero/api/driver_experimental/public/CMakeLists.txt similarity index 57% rename from level_zero/api/experimental/CMakeLists.txt rename to level_zero/api/driver_experimental/public/CMakeLists.txt index 891341d87e..a2e43bee4b 100644 --- a/level_zero/api/experimental/CMakeLists.txt +++ b/level_zero/api/driver_experimental/public/CMakeLists.txt @@ -4,13 +4,15 @@ # SPDX-License-Identifier: MIT # -set(L0_EXPERIMENTAL_API +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_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_EXPERIMENTAL_API ${L0_EXPERIMENTAL_API}) +set_property(GLOBAL PROPERTY L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API ${L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API}) \ No newline at end of file diff --git a/level_zero/api/experimental/zex_api.h b/level_zero/api/driver_experimental/public/zex_api.h similarity index 93% rename from level_zero/api/experimental/zex_api.h rename to level_zero/api/driver_experimental/public/zex_api.h index bc7b97e683..839e3465c3 100644 --- a/level_zero/api/experimental/zex_api.h +++ b/level_zero/api/driver_experimental/public/zex_api.h @@ -16,6 +16,7 @@ // driver experimental API headers #include "zex_driver.h" +#include "zex_memory.h" #include "zex_module.h" #endif // _ZEX_API_H \ No newline at end of file diff --git a/level_zero/api/experimental/zex_driver.cpp b/level_zero/api/driver_experimental/public/zex_driver.cpp similarity index 93% rename from level_zero/api/experimental/zex_driver.cpp rename to level_zero/api/driver_experimental/public/zex_driver.cpp index 1cc1aedffc..e10b5c3132 100644 --- a/level_zero/api/experimental/zex_driver.cpp +++ b/level_zero/api/driver_experimental/public/zex_driver.cpp @@ -5,11 +5,10 @@ * */ +#include "level_zero/api/driver_experimental/public/zex_api.h" #include "level_zero/core/source/driver/driver.h" #include "level_zero/core/source/driver/driver_handle.h" -#include "zex_api.h" - ZE_APIEXPORT ze_result_t ZE_APICALL zexDriverImportExternalPointer( ze_driver_handle_t hDriver, diff --git a/level_zero/api/experimental/zex_driver.h b/level_zero/api/driver_experimental/public/zex_driver.h similarity index 94% rename from level_zero/api/experimental/zex_driver.h rename to level_zero/api/driver_experimental/public/zex_driver.h index 9d44c26c84..c88c01ed8a 100644 --- a/level_zero/api/experimental/zex_driver.h +++ b/level_zero/api/driver_experimental/public/zex_driver.h @@ -15,7 +15,7 @@ extern "C" { #endif -#include "zex_api.h" +#include "level_zero/api/driver_experimental/public/zex_api.h" ZE_APIEXPORT ze_result_t ZE_APICALL zexDriverImportExternalPointer( diff --git a/level_zero/api/driver_experimental/public/zex_memory.cpp b/level_zero/api/driver_experimental/public/zex_memory.cpp new file mode 100644 index 0000000000..8dd983d83d --- /dev/null +++ b/level_zero/api/driver_experimental/public/zex_memory.cpp @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2020-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "level_zero/api/driver_experimental/public/zex_api.h" +#include "level_zero/core/source/context/context.h" diff --git a/level_zero/api/driver_experimental/public/zex_memory.h b/level_zero/api/driver_experimental/public/zex_memory.h new file mode 100644 index 0000000000..c7245c7a4f --- /dev/null +++ b/level_zero/api/driver_experimental/public/zex_memory.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2020-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#ifndef _ZEX_MEMORY_H +#define _ZEX_MEMORY_H +#if defined(__cplusplus) +#pragma once +#endif + +#if defined(__cplusplus) +extern "C" { +#endif + +#include "level_zero/api/driver_experimental/public/zex_api.h" + +#if defined(__cplusplus) +} // extern "C" +#endif + +#endif // _ZEX_MEMORY_H diff --git a/level_zero/api/experimental/zex_module.cpp b/level_zero/api/driver_experimental/public/zex_module.cpp similarity index 86% rename from level_zero/api/experimental/zex_module.cpp rename to level_zero/api/driver_experimental/public/zex_module.cpp index 10b7ecf9d3..e6c45f44ee 100644 --- a/level_zero/api/experimental/zex_module.cpp +++ b/level_zero/api/driver_experimental/public/zex_module.cpp @@ -5,11 +5,10 @@ * */ +#include "level_zero/api/driver_experimental/public/zex_api.h" #include "level_zero/core/source/kernel/kernel.h" #include "level_zero/core/source/module/module.h" -#include "zex_api.h" - ZE_DLLEXPORT ze_result_t ZE_APICALL zexKernelGetBaseAddress( ze_kernel_handle_t hKernel, diff --git a/level_zero/api/experimental/zex_module.h b/level_zero/api/driver_experimental/public/zex_module.h similarity index 87% rename from level_zero/api/experimental/zex_module.h rename to level_zero/api/driver_experimental/public/zex_module.h index 172f6dad11..cb097d8003 100644 --- a/level_zero/api/experimental/zex_module.h +++ b/level_zero/api/driver_experimental/public/zex_module.h @@ -15,7 +15,7 @@ extern "C" { #endif -#include "zex_api.h" +#include "level_zero/api/driver_experimental/public/zex_api.h" ZE_DLLEXPORT ze_result_t ZE_APICALL zexKernelGetBaseAddress( diff --git a/level_zero/api/experimental/tracing/CMakeLists.txt b/level_zero/api/driver_experimental/tracing/CMakeLists.txt similarity index 82% rename from level_zero/api/experimental/tracing/CMakeLists.txt rename to level_zero/api/driver_experimental/tracing/CMakeLists.txt index cfdb7adf03..9491a09355 100644 --- a/level_zero/api/experimental/tracing/CMakeLists.txt +++ b/level_zero/api/driver_experimental/tracing/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2022 Intel Corporation # # SPDX-License-Identifier: MIT # diff --git a/level_zero/api/experimental/tracing/zet_tracing.cpp b/level_zero/api/driver_experimental/tracing/zet_tracing.cpp similarity index 96% rename from level_zero/api/experimental/tracing/zet_tracing.cpp rename to level_zero/api/driver_experimental/tracing/zet_tracing.cpp index bd94079021..3a463971e6 100644 --- a/level_zero/api/experimental/tracing/zet_tracing.cpp +++ b/level_zero/api/driver_experimental/tracing/zet_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/level_zero/core/source/get_extension_function_lookup_map.cpp b/level_zero/core/source/get_extension_function_lookup_map.cpp index b0845d30ef..5c738e9478 100644 --- a/level_zero/core/source/get_extension_function_lookup_map.cpp +++ b/level_zero/core/source/get_extension_function_lookup_map.cpp @@ -7,7 +7,7 @@ #include "level_zero/core/source/get_extension_function_lookup_map.h" -#include "level_zero/api/experimental/zex_api.h" +#include "level_zero/api/driver_experimental/public/zex_api.h" namespace L0 { std::unordered_map getExtensionFunctionsLookupMap() {