Revert "performance: reduce ULLS controller timeout to 1ms"

This reverts commit 0db7128503.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-01-30 02:53:44 +01:00
committed by Compute-Runtime-Automation
parent dbc85c4322
commit 768e15bab2
8 changed files with 44 additions and 62 deletions

View File

@@ -193,12 +193,12 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerAndDivisorD
EXPECT_EQ(controller.directSubmissions[&csr].taskCount, 1u);
auto previousTimestamp = controller.lastTerminateCpuTimestamp;
controller.cpuTimestamp += DirectSubmissionController::getDefaultTimeout();
controller.cpuTimestamp += std::chrono::microseconds(5'000);
controller.checkNewSubmissions();
EXPECT_EQ(std::chrono::duration_cast<std::chrono::microseconds>(controller.lastTerminateCpuTimestamp - previousTimestamp).count(), DirectSubmissionController::getDefaultTimeout().count());
EXPECT_EQ(std::chrono::duration_cast<std::chrono::microseconds>(controller.lastTerminateCpuTimestamp - previousTimestamp).count(), 5'000);
EXPECT_TRUE(controller.directSubmissions[&csr].isStopped);
EXPECT_EQ(controller.directSubmissions[&csr].taskCount, 1u);
EXPECT_EQ(controller.timeout.count(), DirectSubmissionController::getDefaultTimeout().count());
EXPECT_EQ(controller.timeout.count(), 5'000);
EXPECT_EQ(controller.maxTimeout.count(), 200'000);
}
{
@@ -440,23 +440,23 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegiste
csr4.setupContext(*osContext4.get());
DirectSubmissionControllerMock controller;
auto timeout = DirectSubmissionController::getDefaultTimeout().count();
EXPECT_EQ(controller.timeout.count(), timeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr);
EXPECT_EQ(controller.timeout.count(), timeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr3);
EXPECT_EQ(controller.timeout.count(), timeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr1);
EXPECT_EQ(controller.timeout.count(), timeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr2);
EXPECT_EQ(controller.timeout.count(), timeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr4);
EXPECT_EQ(controller.timeout.count(), timeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.unregisterDirectSubmission(&csr);
controller.unregisterDirectSubmission(&csr1);
@@ -472,9 +472,8 @@ TEST(DirectSubmissionControllerTests, givenPowerSavingUintWhenCallingGetThrottle
}
TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegisterCsrsFromDifferentSubdevicesThenTimeoutIsAdjusted) {
static constexpr size_t divisor = 4;
DebugManagerStateRestore restorer;
debugManager.flags.DirectSubmissionControllerDivisor.set(divisor);
debugManager.flags.DirectSubmissionControllerDivisor.set(4);
MockExecutionEnvironment executionEnvironment;
executionEnvironment.prepareRootDeviceEnvironments(1);
executionEnvironment.initializeMemoryManager();
@@ -548,41 +547,38 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegiste
csr10.setupContext(*osContext10.get());
DirectSubmissionControllerMock controller;
auto defaultTimeout = DirectSubmissionController::getDefaultTimeout().count();
EXPECT_EQ(controller.timeout.count(), defaultTimeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr);
EXPECT_EQ(controller.timeout.count(), defaultTimeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr5);
EXPECT_EQ(controller.timeout.count(), defaultTimeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr1);
int64_t newTimeout = defaultTimeout / divisor;
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 1'250);
controller.registerDirectSubmission(&csr2);
newTimeout /= divisor;
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 312);
controller.registerDirectSubmission(&csr4);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 312);
controller.registerDirectSubmission(&csr6);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 312);
controller.registerDirectSubmission(&csr7);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 312);
controller.registerDirectSubmission(&csr9);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 312);
newTimeout /= divisor;
controller.registerDirectSubmission(&csr8);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 78);
controller.registerDirectSubmission(&csr10);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 78);
controller.unregisterDirectSubmission(&csr);
controller.unregisterDirectSubmission(&csr1);
@@ -592,9 +588,8 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegiste
}
TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerDirectSubmissionControllerDivisorSetWhenRegisterCsrsThenTimeoutIsAdjusted) {
static constexpr size_t divisor = 5;
DebugManagerStateRestore restorer;
debugManager.flags.DirectSubmissionControllerDivisor.set(divisor);
debugManager.flags.DirectSubmissionControllerDivisor.set(5);
MockExecutionEnvironment executionEnvironment;
executionEnvironment.prepareRootDeviceEnvironments(1);
@@ -632,25 +627,23 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerDirectSubmi
csr4.setupContext(*osContext4.get());
DirectSubmissionControllerMock controller;
auto defaultTimeout = DirectSubmissionController::getDefaultTimeout().count();
EXPECT_EQ(controller.timeout.count(), defaultTimeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr);
EXPECT_EQ(controller.timeout.count(), defaultTimeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr3);
EXPECT_EQ(controller.timeout.count(), defaultTimeout);
EXPECT_EQ(controller.timeout.count(), 5'000);
controller.registerDirectSubmission(&csr1);
int64_t newTimeout = defaultTimeout / divisor;
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 1'000);
controller.registerDirectSubmission(&csr2);
newTimeout /= divisor;
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 200);
controller.registerDirectSubmission(&csr4);
EXPECT_EQ(controller.timeout.count(), newTimeout);
EXPECT_EQ(controller.timeout.count(), 200);
controller.unregisterDirectSubmission(&csr);
controller.unregisterDirectSubmission(&csr1);