intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-25 13:33:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add debug flag to check Device State on failed Wddm submission

Browse Source 
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2023-11-29 15:15:54 +00:00
committed by Compute-Runtime-Automation
parent aac8686095
commit 5772b17924
5 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/source/debug_settings/debug_variables_base.inl
View File

@@ -251,6 +251,7 @@ DECLARE_DEBUG_VARIABLE(int64_t, OverrideEventSynchronizeTimeout, -1, "-1: defaul
DECLARE_DEBUG_VARIABLE(int32_t, ForceTlbFlush, -1, "-1: default, 0: Tlb flush disabled, 1: Tlb Flush enabled")
DECLARE_DEBUG_VARIABLE(int32_t, DebugSetMemoryDiagnosticsDelay, -1, "-1: default, >=0: delay time in minutes necessary for completion of Memory diagnostics")
DECLARE_DEBUG_VARIABLE(int32_t, EnableDeviceStateVerification, -1, "-1: default, 0: disable, 1: enable check of device state before submit on Windows")
DECLARE_DEBUG_VARIABLE(int32_t, EnableDeviceStateVerificationAfterFailedSubmission, -1, "-1: default, 0: disable, 1: enable check of device state after failed submit on Windows")
DECLARE_DEBUG_VARIABLE(int32_t, EnableDynamicPostSyncAllocLayout, -1, "-1: default, 0: Keep Timestamp size layout, 1: Use write immediate layout (qword) and switch dynamically to TS for profiling")
DECLARE_DEBUG_VARIABLE(int32_t, PrintTimestampPacketUsage, -1, "-1: default, 0: Disabled, 1: Print when TSP is allocated, initialized, returned to pool, etc.")
DECLARE_DEBUG_VARIABLE(int32_t, SynchronizeEventBeforeReset, -1, "-1: default, 0: Disabled, 1: Synchronize Event completion on host before calling reset. 2: Synchronize + print extra logs.")

2
shared/source/os_interface/windows/wddm/wddm.cpp
View File

@@ -1029,6 +1029,8 @@ bool Wddm::submit(uint64_t commandBuffer, size_t size, void *commandHeader, Wddm
if (status) {
submitArguments.monitorFence->lastSubmittedFence = submitArguments.monitorFence->currentFenceValue;
submitArguments.monitorFence->currentFenceValue++;
} else if (DebugManager.flags.EnableDeviceStateVerificationAfterFailedSubmission.get() == 1) {
getDeviceState();
}
return status;

2
shared/source/os_interface/windows/wddm/wddm.h
View File

@@ -216,7 +216,7 @@ class Wddm : public DriverModel {
}
bool getDeviceExecutionState(D3DKMT_DEVICESTATE_TYPE stateType, void *privateData);
bool getDeviceState();
MOCKABLE_VIRTUAL bool getDeviceState();
protected:
bool translateTopologyInfo(TopologyMapping &mapping);

1
shared/test/common/test_files/igdrcl.config
View File

@@ -563,4 +563,5 @@ ForceThreadGroupDispatchSizeAlgorithm = -1
EnableImplicitConvertionToCounterBasedEvents = -1
SetAmountOfInternalHeapsToPreallocate = -1
DoNotUseProductConfigForValidationWa = 0
EnableDeviceStateVerificationAfterFailedSubmission = -1
# Please don't edit below this line

84
shared/test/unit_test/os_interface/windows/wddm_tests.cpp
View File

@@ -551,6 +551,90 @@ TEST_F(WddmTests, givenCheckDeviceStateSetToFalseWhenCallGetDeviceStateAndForceE
EXPECT_EQ(std::string(""), output);
}
TEST_F(WddmTests, givenDebugFlagSetWhenFailedOnSubmissionThenCheckDeviceState) {
DebugManagerStateRestore restorer;
constexpr uint32_t submitId = 0;
constexpr uint32_t deviceStateId = 1;
std::vector<uint32_t> operations;
class MyMockWddm : public WddmMock {
public:
MyMockWddm(RootDeviceEnvironment &rootDeviceEnvironment, std::vector<uint32_t> &operations, uint32_t deviceStateId)
: WddmMock(rootDeviceEnvironment), operations(operations), deviceStateId(deviceStateId) {
}
bool getDeviceState() override {
operations.push_back(deviceStateId);
return true;
}
std::vector<uint32_t> &operations;
const uint32_t deviceStateId;
};
class MyWddmMockInterface20 : public WddmMockInterface20 {
public:
MyWddmMockInterface20(Wddm &wddm, std::vector<uint32_t> &operations, uint32_t submitId) : WddmMockInterface20(wddm), operations(operations), submitId(submitId) {
}
bool submit(uint64_t commandBuffer, size_t size, void *commandHeader, WddmSubmitArguments &submitArguments) override {
operations.push_back(submitId);
return submitRetVal;
}
std::vector<uint32_t> &operations;
const uint32_t submitId;
bool submitRetVal = true;
};
MyMockWddm myMockWddm(*rootDeviceEnvironment, operations, deviceStateId);
auto wddmMockInterface = new MyWddmMockInterface20(myMockWddm, operations, submitId);
myMockWddm.init();
myMockWddm.wddmInterface.reset(wddmMockInterface);
COMMAND_BUFFER_HEADER commandBufferHeader{};
MonitoredFence monitoredFence{};
WddmSubmitArguments submitArguments{};
submitArguments.monitorFence = &monitoredFence;
EXPECT_TRUE(myMockWddm.submit(0, 0, &commandBufferHeader, submitArguments));
ASSERT_EQ(2u, operations.size());
EXPECT_EQ(deviceStateId, operations[0]);
EXPECT_EQ(submitId, operations[1]);
wddmMockInterface->submitRetVal = false;
EXPECT_FALSE(myMockWddm.submit(0, 0, &commandBufferHeader, submitArguments));
ASSERT_EQ(4u, operations.size());
EXPECT_EQ(deviceStateId, operations[2]);
EXPECT_EQ(submitId, operations[3]);
DebugManager.flags.EnableDeviceStateVerificationAfterFailedSubmission.set(1);
EXPECT_FALSE(myMockWddm.submit(0, 0, &commandBufferHeader, submitArguments));
ASSERT_EQ(7u, operations.size());
EXPECT_EQ(deviceStateId, operations[4]);
EXPECT_EQ(submitId, operations[5]);
EXPECT_EQ(deviceStateId, operations[6]);
wddmMockInterface->submitRetVal = true;
EXPECT_TRUE(myMockWddm.submit(0, 0, &commandBufferHeader, submitArguments));
ASSERT_EQ(9u, operations.size());
EXPECT_EQ(deviceStateId, operations[7]);
EXPECT_EQ(submitId, operations[8]);
}
TEST_F(WddmTests, givenCheckDeviceStateSetToTrueWhenCallGetDeviceStateReturnsPageFaultThenProperMessageIsVisible) {
DebugManagerStateRestore restorer{};
DebugManager.flags.EnableDebugBreak.set(false);