Clean up driver experimental headers (2)

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>

level_zero/api/CMakeLists.txt

@@ -5,8 +5,9 @@
 #
 
 add_subdirectory(core)
-add_subdirectory(experimental${BRANCH_DIR_SUFFIX})
+add_subdirectory(driver_experimental/public)
-add_subdirectory(experimental/tracing)
+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

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})

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})

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

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,

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(

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"

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

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,

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(

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
 #

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
  *

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<std::string, void *> getExtensionFunctionsLookupMap() {