From ba244634b30a6b550659cb98c5d412e533b90c26 Mon Sep 17 00:00:00 2001 From: Lukasz Jobczyk Date: Fri, 5 Aug 2022 08:02:01 +0000 Subject: [PATCH] Set the default value of the controller timeout divisor to 1 Signed-off-by: Lukasz Jobczyk --- shared/source/debug_settings/debug_variables_base.inl | 2 +- .../direct_submission/direct_submission_controller.h | 2 +- .../direct_submission_controller_tests.cpp | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index 576a49c834..e62bbff87d 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -304,7 +304,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionNewResourceTlbFlush, -1, "-1: dr DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionDisableMonitorFence, -1, "Disable dispatching monitor fence commands") DECLARE_DEBUG_VARIABLE(int32_t, EnableDirectSubmissionController, -1, "Enable direct submission terminating after given timeout, -1: default, 0: disabled, 1: enabled") DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionControllerTimeout, -1, "Set direct submission controller timeout, -1: default 5000 us, >=0: timeout in us") -DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionControllerDivisor, -1, "Set direct submission controller timeout divider, -1: default 2, >0: divider value") +DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionControllerDivisor, -1, "Set direct submission controller timeout divider, -1: default 1, >0: divider value") DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionForceLocalMemoryStorageMode, -1, "Force local memory storage for command/ring/semaphore buffer, -1: default - for all engines, 0: disabled, 1: for multiOsContextCapable engine, 2: for all engines") DECLARE_DEBUG_VARIABLE(int32_t, EnableRingSwitchTagUpdateWa, -1, "-1: default, 0 - disable, 1 - enable. If enabled, completionFences wont be updated if ring is not running.") DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionReadBackCommandBuffer, -1, "-1: default - disabled, 0 - disable, 1 - enable. If enabled, read first dword of cmd buffer after handling residency.") diff --git a/shared/source/direct_submission/direct_submission_controller.h b/shared/source/direct_submission/direct_submission_controller.h index bd13277c13..1ae8a3241f 100644 --- a/shared/source/direct_submission/direct_submission_controller.h +++ b/shared/source/direct_submission/direct_submission_controller.h @@ -54,6 +54,6 @@ class DirectSubmissionController { std::atomic_bool runControlling = false; int timeout = 5000; - int timeoutDivisor = 4; + int timeoutDivisor = 1; }; } // namespace NEO \ No newline at end of file diff --git a/shared/test/unit_test/direct_submission/direct_submission_controller_tests.cpp b/shared/test/unit_test/direct_submission/direct_submission_controller_tests.cpp index b73c6c9ea5..d7e8d6b21e 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_controller_tests.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_controller_tests.cpp @@ -133,7 +133,7 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWithNotStar controller.directSubmissionControllingThread.reset(); } -TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegisterCsrsThenTimeoutIsAdjusted) { +TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegisterCsrsThenTimeoutIsNotAdjusted) { MockExecutionEnvironment executionEnvironment; executionEnvironment.prepareRootDeviceEnvironments(1); executionEnvironment.initializeMemoryManager(); @@ -183,13 +183,13 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegiste EXPECT_EQ(controller.timeout, 5000); controller.registerDirectSubmission(&csr1); - EXPECT_EQ(controller.timeout, 1250); + EXPECT_EQ(controller.timeout, 5000); controller.registerDirectSubmission(&csr2); - EXPECT_EQ(controller.timeout, 312); + EXPECT_EQ(controller.timeout, 5000); controller.registerDirectSubmission(&csr4); - EXPECT_EQ(controller.timeout, 312); + EXPECT_EQ(controller.timeout, 5000); controller.unregisterDirectSubmission(&csr); controller.unregisterDirectSubmission(&csr1); @@ -199,6 +199,8 @@ TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegiste } TEST(DirectSubmissionControllerTests, givenDirectSubmissionControllerWhenRegisterCsrsFromDifferentSubdevicesThenTimeoutIsAdjusted) { + DebugManagerStateRestore restorer; + DebugManager.flags.DirectSubmissionControllerDivisor.set(4); MockExecutionEnvironment executionEnvironment; executionEnvironment.prepareRootDeviceEnvironments(1); executionEnvironment.initializeMemoryManager();