From f70882c684f8e7466b71ba6d9eaf88852e1b8067 Mon Sep 17 00:00:00 2001 From: davidoli Date: Wed, 8 Jul 2020 13:10:11 -0700 Subject: [PATCH] Move tracing files to experimental directories Remove need for zetInit call for tracing Change-Id: Icbb75d8f52e2f9107e5308fd0c99415ea1e227f6 Signed-off-by: davidoli --- level_zero/CMakeLists.txt | 7 ++-- level_zero/api/CMakeLists.txt | 2 ++ .../api/experimental/tracing/CMakeLists.txt | 11 ++++++ .../tracing}/zet_tracing.cpp | 2 +- level_zero/api/tools/CMakeLists.txt | 1 - level_zero/core/source/device/device_imp.h | 1 - .../core/source/driver/driver_handle_imp.h | 1 - level_zero/experimental/source/CMakeLists.txt | 2 ++ .../source/tracing/CMakeLists.txt | 8 ++--- .../source/tracing/tracing.h | 0 .../source/tracing/tracing_barrier_imp.cpp | 2 +- .../source/tracing/tracing_barrier_imp.h | 0 .../source/tracing/tracing_cl_interop_imp.cpp | 2 +- .../source/tracing/tracing_cl_interop_imp.h | 0 .../source/tracing/tracing_cmdlist_imp.cpp | 2 +- .../source/tracing/tracing_cmdlist_imp.h | 0 .../source/tracing/tracing_cmdqueue_imp.cpp | 2 +- .../source/tracing/tracing_cmdqueue_imp.h | 0 .../source/tracing/tracing_copy_imp.cpp | 2 +- .../source/tracing/tracing_copy_imp.h | 0 .../source/tracing/tracing_device_imp.cpp | 2 +- .../source/tracing/tracing_device_imp.h | 0 .../source/tracing/tracing_driver_imp.cpp | 2 +- .../source/tracing/tracing_driver_imp.h | 0 .../source/tracing/tracing_event_imp.cpp | 2 +- .../source/tracing/tracing_event_imp.h | 0 .../source/tracing/tracing_fence_imp.cpp | 3 +- .../source/tracing/tracing_fence_imp.h | 0 .../source/tracing/tracing_global_imp.cpp | 2 +- .../source/tracing/tracing_global_imp.h | 0 .../source/tracing/tracing_image_imp.cpp | 2 +- .../source/tracing/tracing_image_imp.h | 0 .../source/tracing/tracing_imp.cpp | 13 ++----- .../source/tracing/tracing_imp.h | 34 +++++++++---------- .../source/tracing/tracing_memory_imp.cpp | 2 +- .../source/tracing/tracing_memory_imp.h | 0 .../source/tracing/tracing_module_imp.cpp | 2 +- .../source/tracing/tracing_module_imp.h | 0 .../source/tracing/tracing_residency_imp.cpp | 2 +- .../source/tracing/tracing_residency_imp.h | 0 .../source/tracing/tracing_sampler_imp.cpp | 2 +- .../source/tracing/tracing_sampler_imp.h | 0 level_zero/tools/source/CMakeLists.txt | 1 - level_zero/tools/source/tools_init_imp.cpp | 3 -- 44 files changed, 58 insertions(+), 59 deletions(-) create mode 100644 level_zero/api/experimental/tracing/CMakeLists.txt rename level_zero/api/{tools => experimental/tracing}/zet_tracing.cpp (94%) rename level_zero/{tools => experimental}/source/tracing/CMakeLists.txt (90%) rename level_zero/{tools => experimental}/source/tracing/tracing.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_barrier_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_barrier_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_cl_interop_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_cl_interop_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_cmdlist_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_cmdlist_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_cmdqueue_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_cmdqueue_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_copy_imp.cpp (99%) rename level_zero/{tools => experimental}/source/tracing/tracing_copy_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_device_imp.cpp (99%) rename level_zero/{tools => experimental}/source/tracing/tracing_device_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_driver_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_driver_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_event_imp.cpp (99%) rename level_zero/{tools => experimental}/source/tracing/tracing_event_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_fence_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_fence_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_global_imp.cpp (93%) rename level_zero/{tools => experimental}/source/tracing/tracing_global_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_image_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_image_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_imp.cpp (96%) rename level_zero/{tools => experimental}/source/tracing/tracing_imp.h (88%) rename level_zero/{tools => experimental}/source/tracing/tracing_memory_imp.cpp (99%) rename level_zero/{tools => experimental}/source/tracing/tracing_memory_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_module_imp.cpp (99%) rename level_zero/{tools => experimental}/source/tracing/tracing_module_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_residency_imp.cpp (98%) rename level_zero/{tools => experimental}/source/tracing/tracing_residency_imp.h (100%) rename level_zero/{tools => experimental}/source/tracing/tracing_sampler_imp.cpp (97%) rename level_zero/{tools => experimental}/source/tracing/tracing_sampler_imp.h (100%) diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt index 2bef909b6b..11b88f1e9a 100644 --- a/level_zero/CMakeLists.txt +++ b/level_zero/CMakeLists.txt @@ -23,6 +23,7 @@ if(BUILD_WITH_L0) file(GLOB LEVEL_ZERO_SOURCE_HEADERS "${LEVEL_ZERO_ROOT_tmp}/include/core/*" "${LEVEL_ZERO_ROOT_tmp}/include/tools/*" + "${LEVEL_ZERO_ROOT_tmp}/include/experimental/*" ) file(MAKE_DIRECTORY ${CUSTOM_L0_INCLUDE_PATH}) file(COPY ${LEVEL_ZERO_SOURCE_HEADERS} DESTINATION ${CUSTOM_L0_INCLUDE_PATH}) @@ -170,6 +171,7 @@ if(BUILD_WITH_L0) include_directories(ddi${BRANCH_DIR_SUFFIX}) include_directories(tools/source) include_directories(experimental${BRANCH_DIR_SUFFIX}/source) + include_directories(experimental/source/tracing) # Create our shared library/DLL add_library(${TARGET_NAME_L0} @@ -313,8 +315,9 @@ function(generate_l0_lib LIB_NAME MOCKABLE) ) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source") - add_subdirectory(experimental${BRANCH_DIR_SUFFIX}/source "${NEO_BUILD_DIR}/${LIB_NAME}/experimental${BRANCH_DIR_SUFFIX}/source") - add_subdirectory(tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/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") append_sources_from_properties(L0_RUNTIME_SOURCES L0_API diff --git a/level_zero/api/CMakeLists.txt b/level_zero/api/CMakeLists.txt index ddc8b9d180..3e6ba747c8 100644 --- a/level_zero/api/CMakeLists.txt +++ b/level_zero/api/CMakeLists.txt @@ -6,11 +6,13 @@ add_subdirectory(core) add_subdirectory(experimental${BRANCH_DIR_SUFFIX}/) +add_subdirectory(experimental/tracing) add_subdirectory(tools) set(L0_API "") append_sources_from_properties(L0_API L0_SRCS_API L0_EXPERIMENTAL_API + L0_EXPERIMENTAL_TRACING_API L0_TOOLS_API) set_property(GLOBAL PROPERTY L0_API ${L0_API}) diff --git a/level_zero/api/experimental/tracing/CMakeLists.txt b/level_zero/api/experimental/tracing/CMakeLists.txt new file mode 100644 index 0000000000..5e68794066 --- /dev/null +++ b/level_zero/api/experimental/tracing/CMakeLists.txt @@ -0,0 +1,11 @@ +# +# Copyright (C) 2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(L0_EXPERIMENTAL_TRACING_API + ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp +) + +set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_TRACING_API ${L0_EXPERIMENTAL_TRACING_API}) diff --git a/level_zero/api/tools/zet_tracing.cpp b/level_zero/api/experimental/tracing/zet_tracing.cpp similarity index 94% rename from level_zero/api/tools/zet_tracing.cpp rename to level_zero/api/experimental/tracing/zet_tracing.cpp index 7f7a3514c5..1b8c710ed3 100644 --- a/level_zero/api/tools/zet_tracing.cpp +++ b/level_zero/api/experimental/tracing/zet_tracing.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing.h" +#include "level_zero/experimental/source/tracing/tracing.h" #include extern "C" { diff --git a/level_zero/api/tools/CMakeLists.txt b/level_zero/api/tools/CMakeLists.txt index 819665dcb7..6b37d23d34 100644 --- a/level_zero/api/tools/CMakeLists.txt +++ b/level_zero/api/tools/CMakeLists.txt @@ -8,7 +8,6 @@ set(L0_TOOLS_API ${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zet_metric.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zet_sysman.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zet_driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zet_module.cpp ) diff --git a/level_zero/core/source/device/device_imp.h b/level_zero/core/source/device/device_imp.h index 5ba8b8f762..c0d612cff1 100644 --- a/level_zero/core/source/device/device_imp.h +++ b/level_zero/core/source/device/device_imp.h @@ -12,7 +12,6 @@ #include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/tools/source/metrics/metric.h" -#include "level_zero/tools/source/tracing/tracing.h" namespace L0 { struct SysmanDevice; diff --git a/level_zero/core/source/driver/driver_handle_imp.h b/level_zero/core/source/driver/driver_handle_imp.h index 63c710973b..8a6dbda882 100644 --- a/level_zero/core/source/driver/driver_handle_imp.h +++ b/level_zero/core/source/driver/driver_handle_imp.h @@ -11,7 +11,6 @@ #include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/core/source/get_extension_function_lookup_map.h" -#include "level_zero/tools/source/tracing/tracing.h" namespace L0 { diff --git a/level_zero/experimental/source/CMakeLists.txt b/level_zero/experimental/source/CMakeLists.txt index 83bd8ff652..3f12405775 100644 --- a/level_zero/experimental/source/CMakeLists.txt +++ b/level_zero/experimental/source/CMakeLists.txt @@ -4,6 +4,8 @@ # SPDX-License-Identifier: MIT # +add_subdirectory(tracing) + set(L0_EXPERIMENTAL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/experimental.cpp ) diff --git a/level_zero/tools/source/tracing/CMakeLists.txt b/level_zero/experimental/source/tracing/CMakeLists.txt similarity index 90% rename from level_zero/tools/source/tracing/CMakeLists.txt rename to level_zero/experimental/source/tracing/CMakeLists.txt index c423c99678..da9cd86081 100644 --- a/level_zero/tools/source/tracing/CMakeLists.txt +++ b/level_zero/experimental/source/tracing/CMakeLists.txt @@ -4,9 +4,7 @@ # SPDX-License-Identifier: MIT # -# DO NOT EDIT: Generated from "scripts/templates/CMakeLists.cpp.mako" - -set(L0_SRCS_TOOLS_TRACING +set(L0_SRCS_EXPERIMENTAL_TRACING ${CMAKE_CURRENT_SOURCE_DIR}/tracing.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_imp.cpp @@ -44,9 +42,9 @@ set(L0_SRCS_TOOLS_TRACING target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_TRACING} + ${L0_SRCS_EXPERIMENTAL_TRACING} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) # Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_TRACING ${L0_SRCS_TOOLS_TRACING}) +set_property(GLOBAL PROPERTY L0_SRCS_EXPERIMENTAL_TRACING ${L0_SRCS_EXPERIMENTAL_TRACING}) diff --git a/level_zero/tools/source/tracing/tracing.h b/level_zero/experimental/source/tracing/tracing.h similarity index 100% rename from level_zero/tools/source/tracing/tracing.h rename to level_zero/experimental/source/tracing/tracing.h diff --git a/level_zero/tools/source/tracing/tracing_barrier_imp.cpp b/level_zero/experimental/source/tracing/tracing_barrier_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_barrier_imp.cpp rename to level_zero/experimental/source/tracing/tracing_barrier_imp.cpp index 4354aaea97..9f878e175e 100644 --- a/level_zero/tools/source/tracing/tracing_barrier_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_barrier_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeCommandListAppendBarrier_Tracing(ze_command_list_handle_t hCommandList, diff --git a/level_zero/tools/source/tracing/tracing_barrier_imp.h b/level_zero/experimental/source/tracing/tracing_barrier_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_barrier_imp.h rename to level_zero/experimental/source/tracing/tracing_barrier_imp.h diff --git a/level_zero/tools/source/tracing/tracing_cl_interop_imp.cpp b/level_zero/experimental/source/tracing/tracing_cl_interop_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_cl_interop_imp.cpp rename to level_zero/experimental/source/tracing/tracing_cl_interop_imp.cpp index 6fc39fe6aa..a99dfa39c1 100644 --- a/level_zero/tools/source/tracing/tracing_cl_interop_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_cl_interop_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeDeviceRegisterCLMemory_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_cl_interop_imp.h b/level_zero/experimental/source/tracing/tracing_cl_interop_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_cl_interop_imp.h rename to level_zero/experimental/source/tracing/tracing_cl_interop_imp.h diff --git a/level_zero/tools/source/tracing/tracing_cmdlist_imp.cpp b/level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_cmdlist_imp.cpp rename to level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp index 3165ab8875..5ebd8f30df 100644 --- a/level_zero/tools/source/tracing/tracing_cmdlist_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeCommandListCreate_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_cmdlist_imp.h b/level_zero/experimental/source/tracing/tracing_cmdlist_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_cmdlist_imp.h rename to level_zero/experimental/source/tracing/tracing_cmdlist_imp.h diff --git a/level_zero/tools/source/tracing/tracing_cmdqueue_imp.cpp b/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_cmdqueue_imp.cpp rename to level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp index bd825e5f16..dac508c1f4 100644 --- a/level_zero/tools/source/tracing/tracing_cmdqueue_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeCommandQueueCreate_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_cmdqueue_imp.h b/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_cmdqueue_imp.h rename to level_zero/experimental/source/tracing/tracing_cmdqueue_imp.h diff --git a/level_zero/tools/source/tracing/tracing_copy_imp.cpp b/level_zero/experimental/source/tracing/tracing_copy_imp.cpp similarity index 99% rename from level_zero/tools/source/tracing/tracing_copy_imp.cpp rename to level_zero/experimental/source/tracing/tracing_copy_imp.cpp index 2929e56767..f615ad3c50 100644 --- a/level_zero/tools/source/tracing/tracing_copy_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_copy_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeCommandListAppendMemoryCopy_Tracing(ze_command_list_handle_t hCommandList, diff --git a/level_zero/tools/source/tracing/tracing_copy_imp.h b/level_zero/experimental/source/tracing/tracing_copy_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_copy_imp.h rename to level_zero/experimental/source/tracing/tracing_copy_imp.h diff --git a/level_zero/tools/source/tracing/tracing_device_imp.cpp b/level_zero/experimental/source/tracing/tracing_device_imp.cpp similarity index 99% rename from level_zero/tools/source/tracing/tracing_device_imp.cpp rename to level_zero/experimental/source/tracing/tracing_device_imp.cpp index 7ba68af90a..e913caac58 100644 --- a/level_zero/tools/source/tracing/tracing_device_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_device_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeDeviceGet_Tracing(ze_driver_handle_t hDriver, diff --git a/level_zero/tools/source/tracing/tracing_device_imp.h b/level_zero/experimental/source/tracing/tracing_device_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_device_imp.h rename to level_zero/experimental/source/tracing/tracing_device_imp.h diff --git a/level_zero/tools/source/tracing/tracing_driver_imp.cpp b/level_zero/experimental/source/tracing/tracing_driver_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_driver_imp.cpp rename to level_zero/experimental/source/tracing/tracing_driver_imp.cpp index b70556826b..ea148d5fd0 100644 --- a/level_zero/tools/source/tracing/tracing_driver_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_driver_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeDriverGet_Tracing(uint32_t *pCount, diff --git a/level_zero/tools/source/tracing/tracing_driver_imp.h b/level_zero/experimental/source/tracing/tracing_driver_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_driver_imp.h rename to level_zero/experimental/source/tracing/tracing_driver_imp.h diff --git a/level_zero/tools/source/tracing/tracing_event_imp.cpp b/level_zero/experimental/source/tracing/tracing_event_imp.cpp similarity index 99% rename from level_zero/tools/source/tracing/tracing_event_imp.cpp rename to level_zero/experimental/source/tracing/tracing_event_imp.cpp index c77558ff05..6e1314f460 100644 --- a/level_zero/tools/source/tracing/tracing_event_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_event_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeEventPoolCreate_Tracing(ze_driver_handle_t hDriver, diff --git a/level_zero/tools/source/tracing/tracing_event_imp.h b/level_zero/experimental/source/tracing/tracing_event_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_event_imp.h rename to level_zero/experimental/source/tracing/tracing_event_imp.h diff --git a/level_zero/tools/source/tracing/tracing_fence_imp.cpp b/level_zero/experimental/source/tracing/tracing_fence_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_fence_imp.cpp rename to level_zero/experimental/source/tracing/tracing_fence_imp.cpp index 07547aa543..dd3932571f 100644 --- a/level_zero/tools/source/tracing/tracing_fence_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_fence_imp.cpp @@ -5,7 +5,8 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" + __zedllexport ze_result_t __zecall zeFenceCreate_Tracing(ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, diff --git a/level_zero/tools/source/tracing/tracing_fence_imp.h b/level_zero/experimental/source/tracing/tracing_fence_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_fence_imp.h rename to level_zero/experimental/source/tracing/tracing_fence_imp.h diff --git a/level_zero/tools/source/tracing/tracing_global_imp.cpp b/level_zero/experimental/source/tracing/tracing_global_imp.cpp similarity index 93% rename from level_zero/tools/source/tracing/tracing_global_imp.cpp rename to level_zero/experimental/source/tracing/tracing_global_imp.cpp index 9c7caf5490..57258c1b76 100644 --- a/level_zero/tools/source/tracing/tracing_global_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_global_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeInit_Tracing(ze_init_flag_t flags) { diff --git a/level_zero/tools/source/tracing/tracing_global_imp.h b/level_zero/experimental/source/tracing/tracing_global_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_global_imp.h rename to level_zero/experimental/source/tracing/tracing_global_imp.h diff --git a/level_zero/tools/source/tracing/tracing_image_imp.cpp b/level_zero/experimental/source/tracing/tracing_image_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_image_imp.cpp rename to level_zero/experimental/source/tracing/tracing_image_imp.cpp index cd5acadbb6..abb8c836d0 100644 --- a/level_zero/tools/source/tracing/tracing_image_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_image_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeImageGetProperties_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_image_imp.h b/level_zero/experimental/source/tracing/tracing_image_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_image_imp.h rename to level_zero/experimental/source/tracing/tracing_image_imp.h diff --git a/level_zero/tools/source/tracing/tracing_imp.cpp b/level_zero/experimental/source/tracing/tracing_imp.cpp similarity index 96% rename from level_zero/tools/source/tracing/tracing_imp.cpp rename to level_zero/experimental/source/tracing/tracing_imp.cpp index d66d4d3fda..ef12d7f50b 100644 --- a/level_zero/tools/source/tracing/tracing_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_imp.cpp @@ -5,14 +5,13 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" #include "shared/source/helpers/debug_helpers.h" namespace L0 { thread_local ze_bool_t tracingInProgress = 0; -bool tracingIsEnabled = false; struct APITracerContextImp GLOBAL_APITracerContextImp; struct APITracerContextImp *PGLOBAL_APITracerContextImp = &GLOBAL_APITracerContextImp; @@ -132,15 +131,7 @@ thread_local ThreadPrivateTracerData myThreadPrivateTracerData; // static thread_local bool myThreadPrivateTracerDataIsInitialized = false; -void APITracerContextImp::apiTracingEnable(ze_init_flag_t flag) { - if (driver_ddiTable.enableTracing) { - tracingIsEnabled = true; - } -} - -void APITracerContextImp::enableTracing() { tracingIsEnabled = true; } -void APITracerContextImp::disableTracing() { tracingIsEnabled = false; } -bool APITracerContextImp::isTracingEnabled() { return tracingIsEnabled; } +bool APITracerContextImp::isTracingEnabled() { return driver_ddiTable.enableTracing; } // // Walk the list of per-thread private data structures, testing diff --git a/level_zero/tools/source/tracing/tracing_imp.h b/level_zero/experimental/source/tracing/tracing_imp.h similarity index 88% rename from level_zero/tools/source/tracing/tracing_imp.h rename to level_zero/experimental/source/tracing/tracing_imp.h index 1b96b31111..fe9154528e 100644 --- a/level_zero/tools/source/tracing/tracing_imp.h +++ b/level_zero/experimental/source/tracing/tracing_imp.h @@ -7,22 +7,22 @@ #pragma once -#include "level_zero/tools/source/tracing/tracing.h" -#include "level_zero/tools/source/tracing/tracing_barrier_imp.h" -#include "level_zero/tools/source/tracing/tracing_cl_interop_imp.h" -#include "level_zero/tools/source/tracing/tracing_cmdlist_imp.h" -#include "level_zero/tools/source/tracing/tracing_cmdqueue_imp.h" -#include "level_zero/tools/source/tracing/tracing_copy_imp.h" -#include "level_zero/tools/source/tracing/tracing_device_imp.h" -#include "level_zero/tools/source/tracing/tracing_driver_imp.h" -#include "level_zero/tools/source/tracing/tracing_event_imp.h" -#include "level_zero/tools/source/tracing/tracing_fence_imp.h" -#include "level_zero/tools/source/tracing/tracing_global_imp.h" -#include "level_zero/tools/source/tracing/tracing_image_imp.h" -#include "level_zero/tools/source/tracing/tracing_memory_imp.h" -#include "level_zero/tools/source/tracing/tracing_module_imp.h" -#include "level_zero/tools/source/tracing/tracing_residency_imp.h" -#include "level_zero/tools/source/tracing/tracing_sampler_imp.h" +#include "level_zero/experimental/source/tracing/tracing.h" +#include "level_zero/experimental/source/tracing/tracing_barrier_imp.h" +#include "level_zero/experimental/source/tracing/tracing_cl_interop_imp.h" +#include "level_zero/experimental/source/tracing/tracing_cmdlist_imp.h" +#include "level_zero/experimental/source/tracing/tracing_cmdqueue_imp.h" +#include "level_zero/experimental/source/tracing/tracing_copy_imp.h" +#include "level_zero/experimental/source/tracing/tracing_device_imp.h" +#include "level_zero/experimental/source/tracing/tracing_driver_imp.h" +#include "level_zero/experimental/source/tracing/tracing_event_imp.h" +#include "level_zero/experimental/source/tracing/tracing_fence_imp.h" +#include "level_zero/experimental/source/tracing/tracing_global_imp.h" +#include "level_zero/experimental/source/tracing/tracing_image_imp.h" +#include "level_zero/experimental/source/tracing/tracing_memory_imp.h" +#include "level_zero/experimental/source/tracing/tracing_module_imp.h" +#include "level_zero/experimental/source/tracing/tracing_residency_imp.h" +#include "level_zero/experimental/source/tracing/tracing_sampler_imp.h" #include #include @@ -108,8 +108,6 @@ struct APITracerContextImp : APITracerContext { ze_result_t enableTracingImp(struct APITracerImp *newTracer, ze_bool_t enable); ze_result_t finalizeDisableImpTracingWait(struct APITracerImp *oldTracer); - void enableTracing(); - void disableTracing(); bool isTracingEnabled(); private: diff --git a/level_zero/tools/source/tracing/tracing_memory_imp.cpp b/level_zero/experimental/source/tracing/tracing_memory_imp.cpp similarity index 99% rename from level_zero/tools/source/tracing/tracing_memory_imp.cpp rename to level_zero/experimental/source/tracing/tracing_memory_imp.cpp index e6bc8a6020..046a1f6b65 100644 --- a/level_zero/tools/source/tracing/tracing_memory_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_memory_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeDriverAllocSharedMem_Tracing(ze_driver_handle_t hDriver, diff --git a/level_zero/tools/source/tracing/tracing_memory_imp.h b/level_zero/experimental/source/tracing/tracing_memory_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_memory_imp.h rename to level_zero/experimental/source/tracing/tracing_memory_imp.h diff --git a/level_zero/tools/source/tracing/tracing_module_imp.cpp b/level_zero/experimental/source/tracing/tracing_module_imp.cpp similarity index 99% rename from level_zero/tools/source/tracing/tracing_module_imp.cpp rename to level_zero/experimental/source/tracing/tracing_module_imp.cpp index 82bb9c0959..31af4227b2 100644 --- a/level_zero/tools/source/tracing/tracing_module_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_module_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeModuleCreate_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_module_imp.h b/level_zero/experimental/source/tracing/tracing_module_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_module_imp.h rename to level_zero/experimental/source/tracing/tracing_module_imp.h diff --git a/level_zero/tools/source/tracing/tracing_residency_imp.cpp b/level_zero/experimental/source/tracing/tracing_residency_imp.cpp similarity index 98% rename from level_zero/tools/source/tracing/tracing_residency_imp.cpp rename to level_zero/experimental/source/tracing/tracing_residency_imp.cpp index 97571cca06..f89d588249 100644 --- a/level_zero/tools/source/tracing/tracing_residency_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_residency_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeDeviceMakeMemoryResident_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_residency_imp.h b/level_zero/experimental/source/tracing/tracing_residency_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_residency_imp.h rename to level_zero/experimental/source/tracing/tracing_residency_imp.h diff --git a/level_zero/tools/source/tracing/tracing_sampler_imp.cpp b/level_zero/experimental/source/tracing/tracing_sampler_imp.cpp similarity index 97% rename from level_zero/tools/source/tracing/tracing_sampler_imp.cpp rename to level_zero/experimental/source/tracing/tracing_sampler_imp.cpp index 0874bffe0a..8940cdc07f 100644 --- a/level_zero/tools/source/tracing/tracing_sampler_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_sampler_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/tools/source/tracing/tracing_imp.h" +#include "level_zero/experimental/source/tracing/tracing_imp.h" __zedllexport ze_result_t __zecall zeSamplerCreate_Tracing(ze_device_handle_t hDevice, diff --git a/level_zero/tools/source/tracing/tracing_sampler_imp.h b/level_zero/experimental/source/tracing/tracing_sampler_imp.h similarity index 100% rename from level_zero/tools/source/tracing/tracing_sampler_imp.h rename to level_zero/experimental/source/tracing/tracing_sampler_imp.h diff --git a/level_zero/tools/source/CMakeLists.txt b/level_zero/tools/source/CMakeLists.txt index fb3aa8e293..3bf26f068a 100644 --- a/level_zero/tools/source/CMakeLists.txt +++ b/level_zero/tools/source/CMakeLists.txt @@ -4,7 +4,6 @@ # SPDX-License-Identifier: MIT # -add_subdirectory(tracing) add_subdirectory(metrics) add_subdirectory(sysman) add_subdirectory(pin) diff --git a/level_zero/tools/source/tools_init_imp.cpp b/level_zero/tools/source/tools_init_imp.cpp index aedd8e1d9e..0c35de7586 100644 --- a/level_zero/tools/source/tools_init_imp.cpp +++ b/level_zero/tools/source/tools_init_imp.cpp @@ -11,8 +11,6 @@ #include "level_zero/tools/source/pin/pin.h" #include "level_zero/tools/source/sysman/sysman.h" #include "level_zero/tools/source/tools_init.h" -#include "level_zero/tools/source/tracing/tracing.h" -#include "level_zero/tools/source/tracing/tracing_imp.h" #include #include @@ -29,7 +27,6 @@ static void enableTools(ze_result_t &result, ze_init_flag_t flag, bool *ptoolsAr if (result != ZE_RESULT_SUCCESS) { return; } - APITracerContextImp::apiTracingEnable(flag); *ptoolsAreEnabled = true; }