intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Reorganize xe debugger includes

Browse Source 
Related-to: NEO-11365

Signed-off-by: Brandon Yates <brandon.yates@intel.com>
This commit is contained in:
Brandon Yates
2024-07-01 21:36:39 +00:00
committed by Compute-Runtime-Automation
parent e7c2087e53
commit a432bdecc1
9 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -581,9 +581,8 @@ if(UNIX)
endif()
message(STATUS "Xe EU Debug support: ${NEO_ENABLE_XE_EU_DEBUG_SUPPORT}")
get_filename_component(THIRD_PARTY_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}" ABSOLUTE)
include_directories(BEFORE ${THIRD_PARTY_DIR})
get_filename_component(XE_DEBUG_INCLUDE_DIR "${NEO_SOURCE_DIR}/shared/source/debugger/linux${BRANCH_DIR_SUFFIX}" ABSOLUTE)
include_directories(BEFORE ${XE_DEBUG_INCLUDE_DIR})
endif()
include(cmake${BRANCH_DIR_SUFFIX}/find_drm.cmake)

8
level_zero/tools/source/debug/linux/xe/debug_session.cpp
View File

@@ -42,7 +42,7 @@ DebugSessionLinuxXe::~DebugSessionLinuxXe() {
DebugSession *DebugSessionLinuxXe::createLinuxSession(const zet_debug_config_t &config, Device *device, ze_result_t &result, bool isRootAttach) {
struct drm_xe_eudebug_connect open = {
drm_xe_eudebug_connect open = {
.extensions = 0,
.pid = config.pid,
.flags = 0,
@@ -638,7 +638,7 @@ void DebugSessionLinuxXe::handleAttentionEvent(drm_xe_eudebug_event_eu_attention
int DebugSessionLinuxXe::threadControlInterruptAll() {
int euControlRetVal = -1;
struct drm_xe_eudebug_eu_control euControl = {};
drm_xe_eudebug_eu_control euControl = {};
euControl.client_handle = clientHandle;
euControl.cmd = DRM_XE_EUDEBUG_EU_CONTROL_CMD_INTERRUPT_ALL;
euControl.bitmask_size = 0;
@@ -671,7 +671,7 @@ int DebugSessionLinuxXe::threadControlStopped(std::unique_ptr<uint8_t[]> &bitmas
int euControlRetVal = -1;
auto hwInfo = connectedDevice->getHwInfo();
auto &l0GfxCoreHelper = connectedDevice->getL0GfxCoreHelper();
struct drm_xe_eudebug_eu_control euControl = {};
drm_xe_eudebug_eu_control euControl = {};
euControl.client_handle = clientHandle;
euControl.cmd = DRM_XE_EUDEBUG_EU_CONTROL_CMD_STOPPED;
@@ -714,7 +714,7 @@ int DebugSessionLinuxXe::threadControlResume(const std::vector<EuThread::ThreadI
int euControlRetVal = -1;
auto hwInfo = connectedDevice->getHwInfo();
auto &l0GfxCoreHelper = connectedDevice->getL0GfxCoreHelper();
struct drm_xe_eudebug_eu_control euControl = {};
drm_xe_eudebug_eu_control euControl = {};
euControl.client_handle = clientHandle;
euControl.bitmask_size = 0;
euControl.bitmask_ptr = 0;

3
level_zero/tools/source/debug/linux/xe/debug_session.h
View File

@@ -14,8 +14,7 @@
#include "level_zero/tools/source/debug/linux/debug_session.h"
#include "level_zero/tools/source/debug/linux/debug_session_factory.h"
#include "uapi-eudebug/drm/xe_drm.h"
#include "uapi-eudebug/drm/xe_drm_tmp.h"
#include "debug_xe_includes.h"
namespace L0 {

3
level_zero/tools/test/unit_tests/sources/debug/linux/xe/debug_session_fixtures_linux_xe.h
View File

@@ -24,8 +24,7 @@
#include "level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.h"
#include "common/StateSaveAreaHeader.h"
#include "uapi-eudebug/drm/xe_drm.h"
#include "uapi-eudebug/drm/xe_drm_tmp.h"
#include "debug_xe_includes.h"
#include <atomic>
#include <queue>

3
level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp
View File

@@ -37,8 +37,7 @@
#include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
#include "common/StateSaveAreaHeader.h"
#include "uapi-eudebug/drm/xe_drm.h"
#include "uapi-eudebug/drm/xe_drm_tmp.h"
#include "debug_xe_includes.h"
#include <fcntl.h>
#include <fstream>

11
shared/source/debugger/linux/debug_xe_includes.h Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "third_party/uapi-eudebug/drm/xe_drm.h"
#include "third_party/uapi-eudebug/drm/xe_drm_tmp.h"

3
shared/source/os_interface/linux/xe/ioctl_helper_xe_debugger.cpp
View File

@@ -8,8 +8,7 @@
#include "shared/source/os_interface/linux/drm_neo.h"
#include "shared/source/os_interface/linux/xe/ioctl_helper_xe.h"
#include "uapi-eudebug/drm/xe_drm.h"
#include "uapi-eudebug/drm/xe_drm_tmp.h"
#include "debug_xe_includes.h"
#include <fstream>
#include <sstream>

3
shared/test/common/mocks/linux/debug_mock_drm_xe.h
View File

@@ -23,8 +23,7 @@
#include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
#include "shared/test/common/test_macros/test.h"
#include "uapi-eudebug/drm/xe_drm.h"
#include "uapi-eudebug/drm/xe_drm_tmp.h"
#include "debug_xe_includes.h"
using namespace NEO;

3
shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_debugger_tests.cpp
View File

@@ -24,8 +24,7 @@
#include "shared/test/common/test_macros/hw_test.h"
#include "shared/test/common/test_macros/test.h"
#include "uapi-eudebug/drm/xe_drm.h"
#include "uapi-eudebug/drm/xe_drm_tmp.h"
#include "debug_xe_includes.h"
using namespace NEO;