From 97d9d35ab7047691afdf340a91aac8c0de7c49e2 Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Fri, 6 Mar 2020 10:11:44 +0100 Subject: [PATCH] Move SourceLevelDebugger to shared Change-Id: I8c8e1c69414833908519ceea8fc30362222f01c9 Signed-off-by: Mateusz Hoppe --- opencl/source/CMakeLists.txt | 1 - opencl/source/device/cl_device.cpp | 2 +- opencl/source/device/device_caps.cpp | 2 +- opencl/source/dll/debugger.cpp | 3 +-- opencl/source/dll/source_level_debugger.cpp | 2 +- opencl/source/platform/platform.cpp | 2 +- opencl/source/program/build.cpp | 2 +- opencl/source/program/compile.cpp | 2 +- opencl/source/program/link.cpp | 2 +- .../unit_test/command_queue/enqueue_debug_kernel_tests.cpp | 2 +- .../execution_environment/execution_environment_tests.cpp | 2 +- opencl/test/unit_test/libult/CMakeLists.txt | 4 ++++ opencl/test/unit_test/libult/source_level_debugger.cpp | 2 +- opencl/test/unit_test/mocks/mock_source_level_debugger.h | 2 +- .../source_level_debugger_csr_tests.cpp | 3 ++- .../source_level_debugger_device_tests.cpp | 2 +- .../source_level_debugger/source_level_debugger_tests.cpp | 2 +- shared/source/CMakeLists.txt | 2 ++ shared/source/device/device.cpp | 2 +- .../source/source_level_debugger/CMakeLists.txt | 5 ++--- .../source/source_level_debugger/source_level_debugger.cpp | 2 +- .../source/source_level_debugger/source_level_debugger.h | 0 22 files changed, 26 insertions(+), 22 deletions(-) rename {opencl => shared}/source/source_level_debugger/CMakeLists.txt (51%) rename {opencl => shared}/source/source_level_debugger/source_level_debugger.cpp (99%) rename {opencl => shared}/source/source_level_debugger/source_level_debugger.h (100%) diff --git a/opencl/source/CMakeLists.txt b/opencl/source/CMakeLists.txt index 1c9d03bc24..519e08ee45 100644 --- a/opencl/source/CMakeLists.txt +++ b/opencl/source/CMakeLists.txt @@ -66,7 +66,6 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC ${NEO__IGC_INCLUDE_DIR} ${THIRD_PARTY_DIR} ${NEO__GMM_INCLUDE_DIR} - ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} ) target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC diff --git a/opencl/source/device/cl_device.cpp b/opencl/source/device/cl_device.cpp index 8457b569b9..18b6ce319e 100644 --- a/opencl/source/device/cl_device.cpp +++ b/opencl/source/device/cl_device.cpp @@ -12,10 +12,10 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/program/sync_buffer_handler.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/platform/platform.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" namespace NEO { diff --git a/opencl/source/device/device_caps.cpp b/opencl/source/device/device_caps.cpp index 21a2a0deef..7a523036b8 100644 --- a/opencl/source/device/device_caps.cpp +++ b/opencl/source/device/device_caps.cpp @@ -12,11 +12,11 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/device/driver_info.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "CL/cl_ext_intel.h" #include "driver_version.h" diff --git a/opencl/source/dll/debugger.cpp b/opencl/source/dll/debugger.cpp index 51129a9483..831b1a3c8d 100644 --- a/opencl/source/dll/debugger.cpp +++ b/opencl/source/dll/debugger.cpp @@ -10,8 +10,7 @@ #include "shared/source/built_ins/sip.h" #include "shared/source/built_ins/sip_kernel_type.h" #include "shared/source/helpers/hw_info.h" - -#include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" namespace NEO { std::unique_ptr Debugger::create(HardwareInfo *hwInfo) { diff --git a/opencl/source/dll/source_level_debugger.cpp b/opencl/source/dll/source_level_debugger.cpp index c5bac442ad..4775d3f4cb 100644 --- a/opencl/source/dll/source_level_debugger.cpp +++ b/opencl/source/dll/source_level_debugger.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" using namespace std; diff --git a/opencl/source/platform/platform.cpp b/opencl/source/platform/platform.cpp index 08bb639402..f214e4ad19 100644 --- a/opencl/source/platform/platform.cpp +++ b/opencl/source/platform/platform.cpp @@ -20,6 +20,7 @@ #include "shared/source/helpers/string.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/api/api.h" #include "opencl/source/device/cl_device.h" @@ -29,7 +30,6 @@ #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "CL/cl_ext.h" #include "gmm_client_context.h" diff --git a/opencl/source/program/build.cpp b/opencl/source/program/build.cpp index f989c3f967..7620c09397 100644 --- a/opencl/source/program/build.cpp +++ b/opencl/source/program/build.cpp @@ -9,6 +9,7 @@ #include "shared/source/device/device.h" #include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/source/utilities/time_measure_wrapper.h" #include "opencl/source/device/cl_device.h" @@ -17,7 +18,6 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/utilities/logger.h" #include "compiler_options.h" diff --git a/opencl/source/program/compile.cpp b/opencl/source/program/compile.cpp index c52f5e6030..d598166065 100644 --- a/opencl/source/program/compile.cpp +++ b/opencl/source/program/compile.cpp @@ -11,11 +11,11 @@ #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/platform/platform.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "compiler_options.h" #include "program.h" diff --git a/opencl/source/program/link.cpp b/opencl/source/program/link.cpp index 750401b338..35931d7005 100644 --- a/opencl/source/program/link.cpp +++ b/opencl/source/program/link.cpp @@ -11,6 +11,7 @@ #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/source/utilities/stackvec.h" #include "opencl/source/device/cl_device.h" @@ -18,7 +19,6 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "compiler_options.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index 092768a6a7..4ca23ef483 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/os_interface/os_context.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/program/program.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/kernel_filename_helper.h" diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index e99726a027..bc474938e5 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -14,13 +14,13 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/utilities/destructor_counted.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index c7fa371a4e..df1928ea70 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -124,6 +124,10 @@ else() target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX}) endif() +target_include_directories(igdrcl_libult PRIVATE + ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} +) + target_include_directories(igdrcl_libult_env PRIVATE $ ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX} diff --git a/opencl/test/unit_test/libult/source_level_debugger.cpp b/opencl/test/unit_test/libult/source_level_debugger.cpp index e24669aa11..f0c33d29e0 100644 --- a/opencl/test/unit_test/libult/source_level_debugger.cpp +++ b/opencl/test/unit_test/libult/source_level_debugger.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/libult/source_level_debugger_library.h" diff --git a/opencl/test/unit_test/mocks/mock_source_level_debugger.h b/opencl/test/unit_test/mocks/mock_source_level_debugger.h index f983c942d6..d9ee662e56 100644 --- a/opencl/test/unit_test/mocks/mock_source_level_debugger.h +++ b/opencl/test/unit_test/mocks/mock_source_level_debugger.h @@ -7,7 +7,7 @@ #pragma once -#include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp index 3d77ae3fbf..3d91da7841 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/source/source_level_debugger/source_level_debugger.h" + #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp index 90e54bdebc..9cfc6e333b 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp index 3f097f604d..e4e9ae2201 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp @@ -7,11 +7,11 @@ #include "shared/source/device/device.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/kernel_info.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt index 12524af298..da1f6a25a3 100644 --- a/shared/source/CMakeLists.txt +++ b/shared/source/CMakeLists.txt @@ -36,6 +36,7 @@ function(generate_core_lib LIB_NAME MOCKABLE) ${IGC_OCL_ADAPTOR_DIR} ${NEO__IGC_INCLUDE_DIR} ${KHRONOS_HEADERS_DIR} + ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} ) if(WIN32) @@ -89,6 +90,7 @@ append_sources_from_properties(CORE_SOURCES NEO_CORE_SRCS_BUILT_INS NEO_CORE_SRCS_BUILT_IN_KERNELS NEO_CORE_SRCS_BUILT_INS_OPS + NEO_CORE_SRCS_SOURCE_LEVEL_DEBUGGER NEO_CORE_UTILITIES NEO_UNIFIED_MEMORY ) diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp index f884f65d2a..9fc75834ab 100644 --- a/shared/source/device/device.cpp +++ b/shared/source/device/device.cpp @@ -17,9 +17,9 @@ #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/os_time.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/device/driver_info.h" -#include "opencl/source/source_level_debugger/source_level_debugger.h" namespace NEO { diff --git a/opencl/source/source_level_debugger/CMakeLists.txt b/shared/source/source_level_debugger/CMakeLists.txt similarity index 51% rename from opencl/source/source_level_debugger/CMakeLists.txt rename to shared/source/source_level_debugger/CMakeLists.txt index 132a3100d7..3a82b38bce 100644 --- a/opencl/source/source_level_debugger/CMakeLists.txt +++ b/shared/source/source_level_debugger/CMakeLists.txt @@ -4,11 +4,10 @@ # SPDX-License-Identifier: MIT # -set(RUNTIME_SRCS_SOURCE_LEVEL_DEBUGGER +set(NEO_CORE_SRCS_SOURCE_LEVEL_DEBUGGER ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.h ) -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SOURCE_LEVEL_DEBUGGER}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_SOURCE_LEVEL_DEBUGGER ${RUNTIME_SRCS_SOURCE_LEVEL_DEBUGGER}) +set_property(GLOBAL PROPERTY NEO_CORE_SRCS_SOURCE_LEVEL_DEBUGGER ${NEO_CORE_SRCS_SOURCE_LEVEL_DEBUGGER}) diff --git a/opencl/source/source_level_debugger/source_level_debugger.cpp b/shared/source/source_level_debugger/source_level_debugger.cpp similarity index 99% rename from opencl/source/source_level_debugger/source_level_debugger.cpp rename to shared/source/source_level_debugger/source_level_debugger.cpp index 21ced9c098..5945cc9948 100644 --- a/opencl/source/source_level_debugger/source_level_debugger.cpp +++ b/shared/source/source_level_debugger/source_level_debugger.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/source/debugger/debugger.h" #include "shared/source/helpers/debug_helpers.h" diff --git a/opencl/source/source_level_debugger/source_level_debugger.h b/shared/source/source_level_debugger/source_level_debugger.h similarity index 100% rename from opencl/source/source_level_debugger/source_level_debugger.h rename to shared/source/source_level_debugger/source_level_debugger.h