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

fix: Switch copy-engine idle check to try-lock

Browse Source 
Related-To: NEO-13325

Replace blocking obtainUniqueOwnership with non-blocking
tryObtainUniqueOwnership in isCopyEngineOnDeviceIdle.
Treat copy engine as not idle when lock is contended
(conservative; prevents false stops).
Avoid deadlock scenarios caused by holding
directSubmissionsMutex while waiting on a CSR lock.

Signed-off-by: Slawomir Milczarek <slawomir.milczarek@intel.com>
This commit is contained in:
Slawomir Milczarek
2025-09-29 14:17:38 +00:00
committed by Compute-Runtime-Automation
parent e88b4d7b4c
commit 7334aee8a8
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/test/unit_test/direct_submission/direct_submission_controller_mock.h
View File

@@ -19,6 +19,7 @@ struct DirectSubmissionControllerMock : public DirectSubmissionController {
using DirectSubmissionController::directSubmissionsMutex;
using DirectSubmissionController::getSleepValue;
using DirectSubmissionController::handlePagingFenceRequests;
using DirectSubmissionController::isCopyEngineOnDeviceIdle;
using DirectSubmissionController::isCsrsContextGroupIdleDetectionEnabled;
using DirectSubmissionController::isDirectSubmissionIdle;
using DirectSubmissionController::keepControlling;

48
shared/test/unit_test/direct_submission/direct_submission_controller_tests.cpp
View File

@@ -528,6 +528,54 @@ TEST_F(DirectSubmissionIdleDetectionTests, givenSimulatedCsrLockContentionWhenCh
controller->unregisterDirectSubmission(contentionCsr.get());
}
TEST_F(DirectSubmissionIdleDetectionTests, givenTryLockContentionThenIsCopyEngineOnDeviceIdleReturnsFalse) {
struct ContentionSimulatingCsr : public TagUpdateMockCommandStreamReceiver {
using TagUpdateMockCommandStreamReceiver::TagUpdateMockCommandStreamReceiver;
bool simulateContention = false;
std::unique_lock<CommandStreamReceiver::MutexType> tryObtainUniqueOwnership() override {
if (simulateContention) {
return std::unique_lock<CommandStreamReceiver::MutexType>();
}
return TagUpdateMockCommandStreamReceiver::tryObtainUniqueOwnership();
}
};
// Remove original csr from controller
controller->unregisterDirectSubmission(csr.get());
DeviceBitfield deviceBitfield(1);
auto contCsr = std::make_unique<ContentionSimulatingCsr>(executionEnvironment, 0u, deviceBitfield);
auto osCtx = std::unique_ptr<OsContext>(OsContext::create(nullptr, 0, 1,
EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::regular},
PreemptionMode::ThreadGroup, deviceBitfield)));
contCsr->setupContext(*osCtx);
contCsr->taskCount.store(50u);
contCsr->setLatestFlushedTaskCount(50u);
contCsr->isBusyReturnValue = false;
controller->registerDirectSubmission(contCsr.get());
controller->directSubmissions[contCsr.get()].taskCount = 50u;
controller->directSubmissions[contCsr.get()].isStopped = false;
std::optional<TaskCountType> bcsTaskCount(50u);
// No contention -> true
EXPECT_TRUE(controller->isCopyEngineOnDeviceIdle(0u, bcsTaskCount));
// Contention -> false
contCsr->simulateContention = true;
EXPECT_FALSE(controller->isCopyEngineOnDeviceIdle(0u, bcsTaskCount));
// Remove contention -> true again
contCsr->simulateContention = false;
EXPECT_TRUE(controller->isCopyEngineOnDeviceIdle(0u, bcsTaskCount));
controller->unregisterDirectSubmission(contCsr.get());
}
struct DirectSubmissionCheckForCopyEngineIdleTests : public ::testing::Test {
void SetUp() override {
controller = std::make_unique<DirectSubmissionControllerMock>();