refactor: reorganize l0 api include directories [1/n]

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
2025-12-19 16:24:18 +08:00 · 2024-12-20 09:13:06 +00:00
parent 36b938b100
commit 47f74b8a7b
49 changed files with 79 additions and 56 deletions
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -405,6 +405,7 @@ if(BUILD_WITH_L0)
                               ${IGC_OCL_ADAPTOR_DIR}
                               ${NEO__IGC_INCLUDE_DIR}
                               ${KHRONOS_HEADERS_DIR}
+                               ${CMAKE_CURRENT_SOURCE_DIR}/include
    )

    if(WIN32 OR NOT DISABLE_WDDM_LINUX)
@@ -548,12 +549,6 @@ if(BUILD_WITH_L0)

  endif()

-  if(UNIX)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/zet_intel_gpu_debug.h"
-            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/level_zero
-            PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-    )
-  endif()
 else()
  message(STATUS "Skipping level zero")
  set(BUILD_WITH_L0 FALSE PARENT_SCOPE)
--- a/level_zero/api/driver_experimental/public/ze_bindless_image_exp.h
+++ b/level_zero/api/driver_experimental/public/ze_bindless_image_exp.h
@@ -11,7 +11,7 @@
 #pragma once
 #endif

-#include "level_zero/include/ze_stypes.h"
+#include "level_zero/ze_stypes.h"
 #include <level_zero/ze_api.h>

 #ifndef ZE_BINDLESS_IMAGE_EXP_NAME
--- a/level_zero/api/driver_experimental/public/zex_api.h
+++ b/level_zero/api/driver_experimental/public/zex_api.h
@@ -12,7 +12,7 @@
 #endif

 // 'core' API headers
-#include "level_zero/include/ze_stypes.h"
+#include "level_zero/ze_stypes.h"
 #include <level_zero/ze_api.h>
 // 'sysman' API headers
 #include <level_zero/zes_api.h>
--- a/level_zero/api/driver_experimental/public/zex_cmdlist.cpp
+++ b/level_zero/api/driver_experimental/public/zex_cmdlist.cpp
@@ -8,7 +8,7 @@
 #include "level_zero/api/driver_experimental/public/zex_cmdlist.h"

 #include "level_zero/core/source/cmdlist/cmdlist.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 namespace L0 {
 ZE_APIEXPORT ze_result_t ZE_APICALL
--- a/level_zero/api/driver_experimental/public/zex_device.cpp
+++ b/level_zero/api/driver_experimental/public/zex_device.cpp
@@ -6,7 +6,7 @@
 */

 #include "level_zero/core/source/semaphore/external_semaphore_imp.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 ze_result_t ZE_APICALL
 zeIntelDeviceImportExternalSemaphoreExp(
--- a/level_zero/api/driver_experimental/public/zex_driver.cpp
+++ b/level_zero/api/driver_experimental/public/zex_driver.cpp
@@ -10,7 +10,7 @@
 #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 "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 #include "driver_version.h"

--- a/level_zero/api/driver_experimental/public/zex_module.cpp
+++ b/level_zero/api/driver_experimental/public/zex_module.cpp
@@ -8,7 +8,7 @@
 #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 "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 namespace L0 {

--- a/level_zero/core/source/device/device_imp.cpp
+++ b/level_zero/core/source/device/device_imp.cpp
@@ -56,10 +56,10 @@
 #include "level_zero/core/source/module/module_build_log.h"
 #include "level_zero/core/source/printf_handler/printf_handler.h"
 #include "level_zero/core/source/sampler/sampler.h"
-#include "level_zero/include/ze_intel_gpu.h"
 #include "level_zero/tools/source/debug/debug_session.h"
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/sysman/sysman.h"
+#include "level_zero/ze_intel_gpu.h"

 #include "encode_surface_state_args.h"

--- a/level_zero/core/source/driver/driver_handle_imp.h
+++ b/level_zero/core/source/driver/driver_handle_imp.h
@@ -14,7 +14,7 @@

 #include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/driver/driver_handle.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 #include <map>
 #include <mutex>
--- a/level_zero/core/source/driver/driver_handle_imp_helper.cpp
+++ b/level_zero/core/source/driver/driver_handle_imp_helper.cpp
@@ -7,7 +7,7 @@

 #include "level_zero/api/driver_experimental/public/zex_common.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 namespace L0 {
 const std::vector<std::pair<std::string, uint32_t>> DriverHandleImp::extensionsSupported = {
--- a/level_zero/core/source/driver/extension_function_address.cpp
+++ b/level_zero/core/source/driver/extension_function_address.cpp
@@ -11,8 +11,8 @@
 #include "level_zero/api/driver_experimental/public/zex_cmdlist.h"
 #include "level_zero/api/driver_experimental/public/zex_context.h"
 #include "level_zero/api/extensions/public/ze_exp_ext.h"
-#include "level_zero/include/ze_intel_gpu.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
+#include "level_zero/ze_intel_gpu.h"
+#include "level_zero/zet_intel_gpu_metric.h"

 #include <cstring>

--- a/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h
+++ b/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h
@@ -11,8 +11,8 @@
 #include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/helpers/heap_base_address_model.h"

-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/eu_thread.h"
+#include "level_zero/zet_intel_gpu_debug.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>

--- a/level_zero/core/source/semaphore/external_semaphore.h
+++ b/level_zero/core/source/semaphore/external_semaphore.h
@@ -11,7 +11,7 @@
 #include "shared/source/utilities/tag_allocator.h"

 #include "level_zero/core/source/helpers/api_handle_helper.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>

--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -96,6 +96,7 @@ if(NOT NEO_SKIP_AUB_TESTS AND DEFINED AUB_STREAM_PROJECT_NAME)
                             ${CIF_BASE_DIR}
                             ${NEO__GMM_INCLUDE_DIR}
                             ${WDK_DIR}
+                             ${NEO_SOURCE_DIR}/level_zero/include
  )

  create_project_source_tree(${TARGET_NAME})
--- a/level_zero/core/test/black_box_tests/CMakeLists.txt
+++ b/level_zero/core/test/black_box_tests/CMakeLists.txt
@@ -29,7 +29,11 @@ if(NOT DEFINED L0_BLACK_BOX_OCLOC_HEADER_DIR)
 endif()

 target_link_libraries(${L0_BLACK_BOX_TEST_SHARED_LIB} PUBLIC ocloc_lib)
-target_include_directories(${L0_BLACK_BOX_TEST_SHARED_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/common ${L0_BLACK_BOX_OCLOC_HEADER_DIR})
+target_include_directories(${L0_BLACK_BOX_TEST_SHARED_LIB} PUBLIC
+                           ${CMAKE_CURRENT_SOURCE_DIR}/common
+                           ${L0_BLACK_BOX_OCLOC_HEADER_DIR}
+                           ${NEO_SOURCE_DIR}/level_zero/include
+)

 set_target_properties(${L0_BLACK_BOX_TEST_SHARED_LIB} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})

--- a/level_zero/core/test/black_box_tests/zello_dp_support.cpp
+++ b/level_zero/core/test/black_box_tests/zello_dp_support.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 #include "zello_common.h"

--- a/level_zero/core/test/unit_tests/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/CMakeLists.txt
@@ -59,6 +59,7 @@ target_include_directories(${TARGET_NAME}
                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
                           ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX}
                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
+                           ${NEO_SOURCE_DIR}/level_zero/include
 )

 if(WIN32)
--- a/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp
+++ b/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp
@@ -13,7 +13,7 @@
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 namespace L0 {
 namespace ult {
--- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
+++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
@@ -41,7 +41,7 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 #include "driver_version.h"

--- a/level_zero/core/test/unit_tests/sources/semaphore/linux/test_semaphore_linux.cpp
+++ b/level_zero/core/test/unit_tests/sources/semaphore/linux/test_semaphore_linux.cpp
@@ -17,7 +17,7 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 using namespace NEO;
 #include "gtest/gtest.h"
--- a/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp
+++ b/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp
@@ -14,7 +14,7 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 using namespace NEO;
 #include "gtest/gtest.h"
--- a/level_zero/core/test/unit_tests/sources/semaphore/windows/test_semaphore_windows.cpp
+++ b/level_zero/core/test/unit_tests/sources/semaphore/windows/test_semaphore_windows.cpp
@@ -16,7 +16,7 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 using namespace NEO;
 #include "gtest/gtest.h"
--- a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp
@@ -19,7 +19,7 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/include/ze_intel_gpu.h"
+#include "level_zero/ze_intel_gpu.h"

 namespace L0 {
 namespace ult {
--- a/level_zero/include/CMakeLists.txt
+++ b/level_zero/include/CMakeLists.txt
@@ -4,13 +4,5 @@
 # SPDX-License-Identifier: MIT
 #

-target_sources(${L0_STATIC_LIB_NAME}
-               PRIVATE
-               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/ze_intel_gpu.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/zet_intel_gpu_debug.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/zet_intel_gpu_metric_export.h
-)
-
 add_subdirectories()

--- a/level_zero/include/level_zero/CMakeLists.txt
+++ b/level_zero/include/level_zero/CMakeLists.txt
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_intel_gpu.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_stypes.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_intel_gpu_debug.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_intel_gpu_metric_export.h
+)
+
+if(UNIX)
+  install(FILES
+          ${CMAKE_CURRENT_SOURCE_DIR}/zet_intel_gpu_debug.h
+          ${CMAKE_CURRENT_SOURCE_DIR}/ze_intel_gpu.h
+          ${CMAKE_CURRENT_SOURCE_DIR}/ze_stypes.h
+          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/level_zero
+          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+  )
+endif()
+
+add_subdirectories()
+
--- a/level_zero/include/level_zero/ze_intel_gpu.h
+++ b/level_zero/include/level_zero/ze_intel_gpu.h
@@ -8,9 +8,10 @@
 #ifndef _ZE_INTEL_GPU_H
 #define _ZE_INTEL_GPU_H

-#include "level_zero/include/ze_stypes.h"
 #include <level_zero/ze_api.h>

+#include "ze_stypes.h"
+
 #if defined(__cplusplus)
 #pragma once
 extern "C" {
--- a/level_zero/include/level_zero/ze_stypes.h
+++ b/level_zero/include/level_zero/ze_stypes.h
--- a/level_zero/include/level_zero/zet_intel_gpu_debug.h
+++ b/level_zero/include/level_zero/zet_intel_gpu_debug.h
--- a/level_zero/include/level_zero/zet_intel_gpu_metric.h
+++ b/level_zero/include/level_zero/zet_intel_gpu_metric.h
--- a/level_zero/include/level_zero/zet_intel_gpu_metric_export.h
+++ b/level_zero/include/level_zero/zet_intel_gpu_metric_export.h
--- a/level_zero/tools/source/debug/debug_session_imp.cpp
+++ b/level_zero/tools/source/debug/debug_session_imp.cpp
@@ -19,7 +19,7 @@

 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
+#include "level_zero/zet_intel_gpu_debug.h"

 namespace L0 {

--- a/level_zero/tools/source/debug/linux/debug_session.cpp
+++ b/level_zero/tools/source/debug/linux/debug_session.cpp
@@ -20,10 +20,10 @@

 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/linux/debug_session.h"
 #include "level_zero/tools/source/debug/linux/debug_session_factory.h"
 #include "level_zero/tools/source/debug/linux/drm_helper.h"
+#include "level_zero/zet_intel_gpu_debug.h"

 namespace L0 {
 DebugSessionLinuxAllocatorFn debugSessionLinuxFactory[DEBUG_SESSION_LINUX_TYPE_MAX] = {};
--- a/level_zero/tools/source/debug/linux/prelim/debug_session.cpp
+++ b/level_zero/tools/source/debug/linux/prelim/debug_session.cpp
@@ -24,9 +24,9 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/linux/debug_session_factory.h"
 #include "level_zero/tools/source/debug/linux/drm_helper.h"
+#include "level_zero/zet_intel_gpu_debug.h"
 #include <level_zero/ze_api.h>

 #include "common/StateSaveAreaHeader.h"
--- a/level_zero/tools/source/metrics/metric.h
+++ b/level_zero/tools/source/metrics/metric.h
@@ -7,8 +7,8 @@

 #pragma once
 #include "level_zero/core/source/event/event.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
 #include "level_zero/tools/source/metrics/os_interface_metric.h"
+#include "level_zero/zet_intel_gpu_metric.h"
 #include <level_zero/zet_api.h>

 #include "metrics_discovery_api.h"
--- a/level_zero/tools/source/metrics/metric_ip_sampling_source.cpp
+++ b/level_zero/tools/source/metrics/metric_ip_sampling_source.cpp
@@ -15,11 +15,11 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
-#include "level_zero/include/zet_intel_gpu_metric_export.h"
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/metrics/metric_ip_sampling_streamer.h"
 #include "level_zero/tools/source/metrics/os_interface_metric.h"
+#include "level_zero/zet_intel_gpu_metric.h"
+#include "level_zero/zet_intel_gpu_metric_export.h"
 #include <level_zero/zet_api.h>

 #include <cstring>
--- a/level_zero/tools/source/metrics/metric_oa_export_data.h
+++ b/level_zero/tools/source/metrics/metric_oa_export_data.h
@@ -7,7 +7,7 @@

 #pragma once

-#include "level_zero/include/zet_intel_gpu_metric_export.h"
+#include "level_zero/zet_intel_gpu_metric_export.h"
 #include <level_zero/zet_api.h>

 #include "metrics_discovery_api.h"
--- a/level_zero/tools/source/metrics/metric_oa_source.cpp
+++ b/level_zero/tools/source/metrics/metric_oa_source.cpp
@@ -11,13 +11,13 @@

 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/device/device_imp.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/metrics/metric_multidevice_programmable.h"
 #include "level_zero/tools/source/metrics/metric_multidevice_programmable.inl"
 #include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 #include "level_zero/tools/source/metrics/metric_oa_programmable_imp.h"
 #include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
+#include "level_zero/zet_intel_gpu_metric.h"

 namespace L0 {

--- a/level_zero/tools/test/black_box_tests/zello_metrics/CMakeLists.txt
+++ b/level_zero/tools/test/black_box_tests/zello_metrics/CMakeLists.txt
@@ -34,4 +34,4 @@ if(UNIX)
  target_link_libraries(${ZELLO_METRICS_TARGET} PUBLIC pthread)
 endif()
 set_target_properties(${ZELLO_METRICS_TARGET} PROPERTIES FOLDER ${L0_ZELLO_METRICS_PROJECT_FOLDER})
-
+target_include_directories(${ZELLO_METRICS_TARGET} PUBLIC ${NEO_SOURCE_DIR}/level_zero/include)
--- a/level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics_export.cpp
+++ b/level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics_export.cpp
@@ -5,9 +5,9 @@
 *
 */

-#include "level_zero/include/zet_intel_gpu_metric_export.h"
 #include "level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics.h"
 #include "level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics_util.h"
+#include "level_zero/zet_intel_gpu_metric_export.h"

 #include <map>

--- a/level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics_programmable_tests.cpp
+++ b/level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics_programmable_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

-#include "level_zero/include/zet_intel_gpu_metric.h"
 #include "level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics.h"
 #include "level_zero/tools/test/black_box_tests/zello_metrics/zello_metrics_util.h"
+#include "level_zero/zet_intel_gpu_metric.h"

 #include <algorithm>
 #include <atomic>
--- a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp
+++ b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp
@@ -18,10 +18,10 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/debug_session_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/debug_session_registers_access.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
+#include "level_zero/zet_intel_gpu_debug.h"

 #include "common/StateSaveAreaHeader.h"
 #include "encode_surface_state_args.h"
--- a/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp
+++ b/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp
@@ -32,13 +32,13 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/debug_handlers.h"
 #include "level_zero/tools/source/debug/linux/debug_session.h"
 #include "level_zero/tools/source/debug/linux/prelim/debug_session.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/debug_session_common.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/linux/prelim/debug_session_fixtures_linux.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
+#include "level_zero/zet_intel_gpu_debug.h"

 #include "common/StateSaveAreaHeader.h"

--- a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp
+++ b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp
@@ -29,7 +29,6 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/debug_handlers.h"
 #include "level_zero/tools/source/debug/debug_session.h"
 #include "level_zero/tools/source/debug/linux/debug_session.h"
@@ -37,6 +36,7 @@
 #include "level_zero/tools/test/unit_tests/sources/debug/debug_session_common.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/linux/xe/debug_session_fixtures_linux_xe.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
+#include "level_zero/zet_intel_gpu_debug.h"

 #include "common/StateSaveAreaHeader.h"

--- a/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp
+++ b/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp
@@ -16,10 +16,10 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/debug_handlers.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/debug_session_common.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
+#include "level_zero/zet_intel_gpu_debug.h"

 namespace L0 {
 namespace ult {
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_group.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_group.cpp
@@ -9,9 +9,9 @@

 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
+#include "level_zero/zet_intel_gpu_metric.h"

 #include "gtest/gtest.h"

--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp
@@ -11,12 +11,12 @@

 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
-#include "level_zero/include/zet_intel_gpu_metric_export.h"
 #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 #include "level_zero/tools/source/metrics/os_interface_metric.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_ip_sampling.h"
+#include "level_zero/zet_intel_gpu_metric.h"
+#include "level_zero/zet_intel_gpu_metric_export.h"
 #include <level_zero/zet_api.h>

 #include "metric_ip_sampling_fixture.h"
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp
@@ -10,9 +10,9 @@

 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/include/zet_intel_gpu_metric.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
+#include "level_zero/zet_intel_gpu_metric.h"
 #include <level_zero/zet_api.h>

 #include "gtest/gtest.h"
--- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_export.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_export.cpp
@@ -9,9 +9,9 @@

 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
-#include "level_zero/include/zet_intel_gpu_metric_export.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
+#include "level_zero/zet_intel_gpu_metric_export.h"

 #include "gtest/gtest.h"
 #include "metrics_discovery_api.h"
--- a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec
+++ b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec
@@ -124,6 +124,8 @@ fi

 %files -n intel-level-zero-gpu%{?name_suffix}-devel
 %{_includedir}/level_zero/zet_intel_gpu_debug.h
+%{_includedir}/level_zero/ze_intel_gpu.h
+%{_includedir}/level_zero/ze_stypes.h

 %doc