Unify Debugger::create methods and link to shared library

- OCL and L0 can share this method

Change-Id: Ice9488281a5c2a26ea09310319243880a6aa0682
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-06-16 18:33:30 +02:00
committed by sys_ocldev
parent fea3c94772
commit 0e76e9db66
7 changed files with 1 additions and 31 deletions

View File

@ -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

View File

@ -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> NEO::Debugger::create(HardwareInfo *hwInfo) {
std::unique_ptr<SourceLevelDebugger> 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;
}

View File

@ -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

View File

@ -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

View File

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

View File

@ -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