intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct check for interrupt sent in tile debug sessions

Browse Source 
Resolves: NEO-12222
Signed-off-by: Jemale Lockett <jemale.lockett@intel.com>
This commit is contained in:
Jemale Lockett
2024-11-19 23:20:10 +00:00
committed by Compute-Runtime-Automation
parent 87e645263a
commit ef8fefec28
4 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
level_zero/tools/source/debug/debug_session_imp.h
View File

@@ -52,6 +52,7 @@ struct DebugSessionImp : DebugSession {
DebugSession *attachTileDebugSession(Device *device) override;
void detachTileDebugSession(DebugSession *tileSession) override;
bool areAllTileDebugSessionDetached() override;
bool isInterruptSent() { return interruptSent; }
void setAttachMode(bool isRootAttach) override {
if (isRootAttach) {

5
level_zero/tools/source/debug/linux/prelim/debug_session.cpp
View File

@@ -971,7 +971,8 @@ uint64_t DebugSessionLinuxi915::getVmHandleFromClientAndlrcHandle(uint64_t clien
void DebugSessionLinuxi915::handleAttentionEvent(prelim_drm_i915_debug_event_eu_attention *attention) {
NEO::EngineClassInstance engineClassInstance = {attention->ci.engine_class, attention->ci.engine_instance};
auto tileIndex = DrmHelper::getEngineTileIndex(connectedDevice, engineClassInstance);
if (interruptSent && attention->base.seqno <= euControlInterruptSeqno[tileIndex]) {
auto tmpInterruptSent = tileSessionsEnabled ? tileSessions[tileIndex].first->isInterruptSent() : interruptSent.load();
if (tmpInterruptSent && attention->base.seqno <= euControlInterruptSeqno[tileIndex]) {
PRINT_DEBUGGER_INFO_LOG("Discarding EU ATTENTION event for interrupt request. Event seqno == %d <= %d == interrupt seqno\n",
(uint32_t)attention->base.seqno,
(uint32_t)euControlInterruptSeqno[tileIndex]);
@@ -986,7 +987,7 @@ void DebugSessionLinuxi915::handleAttentionEvent(prelim_drm_i915_debug_event_eu_
std::vector<EuThread::ThreadId> threadsWithAttention;
auto hwInfo = connectedDevice->getHwInfo();
auto &l0GfxCoreHelper = connectedDevice->getL0GfxCoreHelper();
if (interruptSent) {
if (tmpInterruptSent) {
std::unique_ptr<uint8_t[]> bitmask;
size_t bitmaskSize;
auto attReadResult = threadControl({}, tileIndex, ThreadControlCmd::stopped, bitmask, bitmaskSize);

2
level_zero/tools/test/unit_tests/sources/debug/linux/prelim/debug_session_fixtures_linux.h
View File

@@ -432,6 +432,7 @@ struct MockTileDebugSessionLinuxi915 : TileDebugSessionLinuxi915 {
using DebugSessionImp::checkTriggerEventsForAttention;
using DebugSessionImp::expectedAttentionEvents;
using DebugSessionImp::interruptImp;
using DebugSessionImp::interruptSent;
using DebugSessionImp::newlyStoppedThreads;
using DebugSessionImp::resumeImp;
using DebugSessionImp::sendInterrupts;
@@ -440,6 +441,7 @@ struct MockTileDebugSessionLinuxi915 : TileDebugSessionLinuxi915 {
using DebugSessionImp::triggerEvents;
using DebugSessionLinuxi915::detached;
using DebugSessionLinuxi915::ioctl;
using DebugSessionLinuxi915::pendingInterrupts;
using DebugSessionLinuxi915::pushApiEvent;
using TileDebugSessionLinuxi915::cleanRootSessionAfterDetach;
using TileDebugSessionLinuxi915::getAllMemoryHandles;

71
level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp
View File

@@ -8101,6 +8101,77 @@ TEST_F(DebugApiLinuxMultitileTest, givenApiThreadAndMultipleTilesWhenGettingDevi
EXPECT_EQ(1u, deviceIndex);
}
TEST_F(DebugApiLinuxMultitileTest, GivenMultitileDeviceAndInterruptSentForTileWhenHandlingAttentionEventThenEventIsNotProcessed) {
DebugManagerStateRestore restorer;
NEO::debugManager.flags.ExperimentalEnableTileAttach.set(1);
zet_debug_config_t config = {};
config.pid = 0x1234;
auto sessionMock = std::make_unique<MockDebugSessionLinuxi915>(config, deviceImp, 10);
ASSERT_NE(nullptr, sessionMock);
sessionMock->clientHandle = MockDebugSessionLinuxi915::mockClientHandle;
sessionMock->createTileSessionsIfEnabled();
EXPECT_TRUE(sessionMock->tileSessionsEnabled);
MockTileDebugSessionLinuxi915 *tileSessions[2];
tileSessions[0] = static_cast<MockTileDebugSessionLinuxi915 *>(sessionMock->tileSessions[0].first);
tileSessions[1] = static_cast<MockTileDebugSessionLinuxi915 *>(sessionMock->tileSessions[1].first);
uint8_t data[sizeof(prelim_drm_i915_debug_event_eu_attention) + 128];
std::unique_ptr<uint8_t[]> bitmask;
size_t bitmaskSize = 0;
auto &hwInfo = neoDevice->getHardwareInfo();
auto &l0GfxCoreHelper = neoDevice->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
std::vector<EuThread::ThreadId> threads{
{0, 0, 0, 0, 0},
{0, 0, 0, 0, 1},
{0, 0, 0, 0, 2},
{0, 0, 0, 0, 3},
{0, 0, 0, 0, 4},
{0, 0, 0, 0, 5},
{0, 0, 0, 0, 6}};
l0GfxCoreHelper.getAttentionBitmaskForSingleThreads(threads, hwInfo, bitmask, bitmaskSize);
ze_device_thread_t thread = {0, 0, 0, UINT32_MAX};
tileSessions[1]->pendingInterrupts.push_back(std::pair<ze_device_thread_t, bool>(thread, false));
sessionMock->interruptSent = false;
tileSessions[1]->interruptSent = true;
sessionMock->euControlInterruptSeqno[1] = 3;
sessionMock->expectedAttentionEvents = 1;
tileSessions[0]->expectedAttentionEvents = 1;
tileSessions[1]->expectedAttentionEvents = 1;
auto engineInfo = mockDrm->getEngineInfo();
auto engineInstance = engineInfo->getEngineInstance(1, hwInfo.capabilityTable.defaultEngineType);
prelim_drm_i915_debug_event_eu_attention attention = {};
attention.base.type = PRELIM_DRM_I915_DEBUG_EVENT_EU_ATTENTION;
attention.base.flags = PRELIM_DRM_I915_DEBUG_EVENT_STATE_CHANGE;
attention.base.seqno = 2;
attention.base.size = sizeof(prelim_drm_i915_debug_event_eu_attention) + std::min(uint32_t(128), static_cast<uint32_t>(bitmaskSize));
attention.client_handle = MockDebugSessionLinuxi915::mockClientHandle;
attention.flags = 0;
attention.ci.engine_class = engineInstance->engineClass;
attention.ci.engine_instance = engineInstance->engineInstance;
attention.bitmask_size = std::min(uint32_t(128), static_cast<uint32_t>(bitmaskSize));
memcpy(data, &attention, sizeof(prelim_drm_i915_debug_event_eu_attention));
memcpy(ptrOffset(data, offsetof(prelim_drm_i915_debug_event_eu_attention, bitmask)), bitmask.get(), std::min(size_t(128), bitmaskSize));
sessionMock->handleEvent(reinterpret_cast<prelim_drm_i915_debug_event *>(data));
EXPECT_EQ(0u, tileSessions[0]->newlyStoppedThreads.size());
EXPECT_EQ(0u, tileSessions[1]->newlyStoppedThreads.size());
EXPECT_EQ(1u, tileSessions[1]->pendingInterrupts.size());
EXPECT_FALSE(tileSessions[1]->pendingInterrupts[0].second);
EXPECT_FALSE(tileSessions[1]->triggerEvents);
EXPECT_EQ(1u, sessionMock->expectedAttentionEvents);
EXPECT_EQ(1u, tileSessions[0]->expectedAttentionEvents);
EXPECT_EQ(1u, tileSessions[1]->expectedAttentionEvents);
}
template <bool blockOnFence = false>
struct DebugApiLinuxMultiDeviceVmBindFixture : public DebugApiLinuxMultiDeviceFixture, public MockDebugSessionLinuxi915Helper {
void setUp() {