From be8545f7df1ecc1c590cd1cba3e97cb4b030f400 Mon Sep 17 00:00:00 2001 From: Lukasz Jobczyk Date: Tue, 11 Mar 2025 07:24:52 +0000 Subject: [PATCH] refactor: reset all waitpkg variables on test start Signed-off-by: Lukasz Jobczyk --- shared/source/utilities/wait_util.cpp | 3 --- shared/source/utilities/wait_util.h | 2 ++ shared/test/common/base_ult_config_listener.cpp | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/shared/source/utilities/wait_util.cpp b/shared/source/utilities/wait_util.cpp index c34226bcdd..c2d4352f49 100644 --- a/shared/source/utilities/wait_util.cpp +++ b/shared/source/utilities/wait_util.cpp @@ -14,9 +14,6 @@ namespace NEO { namespace WaitUtils { -constexpr uint64_t defaultCounterValue = 10000; -constexpr uint32_t defaultControlValue = 0; - uint64_t waitpkgCounterValue = defaultCounterValue; uint32_t waitpkgControlValue = defaultControlValue; diff --git a/shared/source/utilities/wait_util.h b/shared/source/utilities/wait_util.h index 250fa614b3..3405ad7215 100644 --- a/shared/source/utilities/wait_util.h +++ b/shared/source/utilities/wait_util.h @@ -17,6 +17,8 @@ namespace NEO { namespace WaitUtils { +constexpr uint64_t defaultCounterValue = 10000; +constexpr uint32_t defaultControlValue = 0; constexpr uint32_t defaultWaitCount = 1u; extern uint64_t waitpkgCounterValue; diff --git a/shared/test/common/base_ult_config_listener.cpp b/shared/test/common/base_ult_config_listener.cpp index 5f92a24cac..e7783442b5 100644 --- a/shared/test/common/base_ult_config_listener.cpp +++ b/shared/test/common/base_ult_config_listener.cpp @@ -22,6 +22,10 @@ extern unsigned int testCaseMaxTimeInMs; void BaseUltConfigListener::OnTestStart(const ::testing::TestInfo &) { WaitUtils::waitpkgUse = false; + WaitUtils::waitpkgCounterValue = WaitUtils::defaultCounterValue; + WaitUtils::waitpkgControlValue = WaitUtils::defaultControlValue; + WaitUtils::waitCount = WaitUtils::defaultWaitCount; + maxOsContextCountBackup = MemoryManager::maxOsContextCount; debugVarSnapshot = debugManager.flags; injectFcnSnapshot = debugManager.injectFcn;