From 0e76e9db66d475f6f3da9617ed5131fecc41d556 Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Tue, 16 Jun 2020 18:33:30 +0200 Subject: [PATCH] Unify Debugger::create methods and link to shared library - OCL and L0 can share this method Change-Id: Ice9488281a5c2a26ea09310319243880a6aa0682 Signed-off-by: Mateusz Hoppe --- level_zero/core/source/CMakeLists.txt | 1 - level_zero/core/source/debugger/debugger.cpp | 26 ------------------- opencl/source/dll/CMakeLists.txt | 1 - opencl/test/unit_test/libult/CMakeLists.txt | 1 - shared/source/debugger/CMakeLists.txt | 2 +- .../source/debugger}/debugger.cpp | 0 shared/test/unit_test/CMakeLists.txt | 1 - 7 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 level_zero/core/source/debugger/debugger.cpp rename {opencl/source/dll => shared/source/debugger}/debugger.cpp (100%) diff --git a/level_zero/core/source/CMakeLists.txt b/level_zero/core/source/CMakeLists.txt index 47c8b3d619..71d8f9e715 100644 --- a/level_zero/core/source/CMakeLists.txt +++ b/level_zero/core/source/CMakeLists.txt @@ -30,7 +30,6 @@ set(L0_RUNTIME_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX}/cmdqueue_extended.inl ${CMAKE_CURRENT_SOURCE_DIR}/debugger/debug_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debugger/debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device/device.h ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.h diff --git a/level_zero/core/source/debugger/debugger.cpp b/level_zero/core/source/debugger/debugger.cpp deleted file mode 100644 index 28473f2e2f..0000000000 --- a/level_zero/core/source/debugger/debugger.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/debugger/debugger.h" - -#include "shared/source/built_ins/sip.h" -#include "shared/source/built_ins/sip_kernel_type.h" -#include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/helpers/hw_info.h" -#include "shared/source/source_level_debugger/source_level_debugger.h" - -std::unique_ptr NEO::Debugger::create(HardwareInfo *hwInfo) { - std::unique_ptr sourceLevelDebugger; - if (hwInfo->capabilityTable.debuggerSupported) { - sourceLevelDebugger.reset(SourceLevelDebugger::create()); - } - if (sourceLevelDebugger) { - bool localMemorySipAvailable = (SipKernelType::DbgCsrLocal == SipKernel::getSipKernelType(hwInfo->platform.eRenderCoreFamily, true)); - sourceLevelDebugger->initialize(localMemorySipAvailable); - } - return sourceLevelDebugger; -} \ No newline at end of file diff --git a/opencl/source/dll/CMakeLists.txt b/opencl/source/dll/CMakeLists.txt index 44f82166bd..8b443eb2d5 100644 --- a/opencl/source/dll/CMakeLists.txt +++ b/opencl/source/dll/CMakeLists.txt @@ -16,7 +16,6 @@ set(RUNTIME_SRCS_DLL_BASE ${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_dll.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp ${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 9fbe2fc676..0ccab95e4c 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -26,7 +26,6 @@ set(IGDRCL_SRCS_LIB_ULT ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp - ${NEO_SOURCE_DIR}/opencl/source/dll/debugger.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/built_ins_helper.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp diff --git a/shared/source/debugger/CMakeLists.txt b/shared/source/debugger/CMakeLists.txt index 32545a7895..edeebed18e 100644 --- a/shared/source/debugger/CMakeLists.txt +++ b/shared/source/debugger/CMakeLists.txt @@ -6,8 +6,8 @@ set(NEO_CORE_DEBUGGER ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger.h - ) set_property(GLOBAL PROPERTY NEO_CORE_DEBUGGER ${NEO_CORE_DEBUGGER}) diff --git a/opencl/source/dll/debugger.cpp b/shared/source/debugger/debugger.cpp similarity index 100% rename from opencl/source/dll/debugger.cpp rename to shared/source/debugger/debugger.cpp diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index fa95109ed3..bde4ec8521 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -50,7 +50,6 @@ if(NOT SKIP_NEO_UNIT_TESTS AND NOT SKIP_UNIT_TESTS) ${CMAKE_CURRENT_SOURCE_DIR}/mocks/mock_dispatch_kernel_encoder_interface.h ${CORE_ENABLERS} ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp - ${NEO_SOURCE_DIR}/opencl/source/dll/debugger.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp