From 8c376fe2f976bc0bfb79da01419eb51185e2a45b Mon Sep 17 00:00:00 2001 From: Slawomir Milczarek Date: Fri, 25 Jul 2025 11:59:44 +0000 Subject: [PATCH] feature: Introduce split for release variables Related-To: NEO-12952 Signed-off-by: Slawomir Milczarek --- shared/source/debug_settings/CMakeLists.txt | 5 +++-- .../debug_settings/definitions/release_variables.inl | 8 ++++++++ .../{release_variables.inl => release_variables_base.inl} | 0 shared/test/common/base_ult_config_listener.cpp | 3 +-- shared/test/common/helpers/debug_manager_state_restore.h | 3 +-- .../debug_settings/debug_settings_manager_tests.cpp | 3 +-- .../execution_environment/execution_environment_tests.cpp | 6 ++---- .../test/unit_test/utilities/debug_file_reader_tests.cpp | 3 +-- 8 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 shared/source/debug_settings/definitions/release_variables.inl rename shared/source/debug_settings/{release_variables.inl => release_variables_base.inl} (100%) diff --git a/shared/source/debug_settings/CMakeLists.txt b/shared/source/debug_settings/CMakeLists.txt index 3fd6953fe1..dc68c87c3e 100644 --- a/shared/source/debug_settings/CMakeLists.txt +++ b/shared/source/debug_settings/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019-2021 Intel Corporation +# Copyright (C) 2019-2025 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,8 +10,9 @@ set(NEO_CORE_DEBUG_SETTINGS ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/release_variables.inl + ${CMAKE_CURRENT_SOURCE_DIR}/release_variables_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}debug_variables.inl + ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}release_variables.inl ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}translate_debug_settings.cpp ${CMAKE_CURRENT_SOURCE_DIR}/definitions/translate_debug_settings.h ) diff --git a/shared/source/debug_settings/definitions/release_variables.inl b/shared/source/debug_settings/definitions/release_variables.inl new file mode 100644 index 0000000000..cd07c95e1e --- /dev/null +++ b/shared/source/debug_settings/definitions/release_variables.inl @@ -0,0 +1,8 @@ +/* + * Copyright (C) 2025 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/source/debug_settings/release_variables_base.inl" diff --git a/shared/source/debug_settings/release_variables.inl b/shared/source/debug_settings/release_variables_base.inl similarity index 100% rename from shared/source/debug_settings/release_variables.inl rename to shared/source/debug_settings/release_variables_base.inl diff --git a/shared/test/common/base_ult_config_listener.cpp b/shared/test/common/base_ult_config_listener.cpp index 86d460ab95..63db2fa8b0 100644 --- a/shared/test/common/base_ult_config_listener.cpp +++ b/shared/test/common/base_ult_config_listener.cpp @@ -51,9 +51,8 @@ void BaseUltConfigListener::OnTestEnd(const ::testing::TestInfo &) { EXPECT_EQ(debugVarSnapshot.variableName.getRef(), debugManager.flags.variableName.getRef()); #define DECLARE_DEBUG_SCOPED_V(dataType, variableName, defaultValue, description, ...) \ DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) -#include "shared/source/debug_settings/release_variables.inl" - #include "debug_variables.inl" +#include "release_variables.inl" #undef DECLARE_DEBUG_SCOPED_V #undef DECLARE_DEBUG_VARIABLE diff --git a/shared/test/common/helpers/debug_manager_state_restore.h b/shared/test/common/helpers/debug_manager_state_restore.h index 21d9aa5470..b749f4e0e0 100644 --- a/shared/test/common/helpers/debug_manager_state_restore.h +++ b/shared/test/common/helpers/debug_manager_state_restore.h @@ -23,9 +23,8 @@ class DebugManagerStateRestore { #define DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) shrink(debugManager.flags.variableName.getRef()); #define DECLARE_DEBUG_SCOPED_V(dataType, variableName, defaultValue, description, ...) \ DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) -#include "shared/source/debug_settings/release_variables.inl" - #include "debug_variables.inl" +#include "release_variables.inl" #undef DECLARE_DEBUG_SCOPED_V #undef DECLARE_DEBUG_VARIABLE } diff --git a/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp b/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp index d10a3e4ffc..57068d4076 100644 --- a/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp +++ b/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp @@ -61,9 +61,8 @@ TEST(DebugSettingsManager, WhenDebugManagerIsDisabledThenDebugFunctionalityIsNot } #define DECLARE_DEBUG_SCOPED_V(dataType, variableName, defaultValue, description, ...) \ DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) -#include "shared/source/debug_settings/release_variables.inl" - #include "debug_variables.inl" +#include "release_variables.inl" #undef DECLARE_DEBUG_SCOPED_V #undef DECLARE_DEBUG_VARIABLE } diff --git a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp index 03f0115077..9b5d092fd0 100644 --- a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -365,9 +365,8 @@ TEST(ExecutionEnvironment, givenNeoCalEnabledWhenCreateExecutionEnvironmentThenS EXPECT_EQ(defaultValue, debugManager.flags.variableName.getRef()); #define DECLARE_DEBUG_SCOPED_V(dataType, variableName, defaultValue, description, ...) \ DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) -#include "shared/source/debug_settings/release_variables.inl" - #include "debug_variables.inl" +#include "release_variables.inl" #undef DECLARE_DEBUG_SCOPED_V #undef DECLARE_DEBUG_VARIABLE @@ -400,9 +399,8 @@ TEST(ExecutionEnvironment, givenNeoCalEnabledWhenCreateExecutionEnvironmentThenS #define DECLARE_DEBUG_SCOPED_V(dataType, variableName, defaultValue, description, ...) \ DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) -#include "shared/source/debug_settings/release_variables.inl" - #include "debug_variables.inl" +#include "release_variables.inl" #undef DECLARE_DEBUG_SCOPED_V #undef DECLARE_DEBUG_VARIABLE } diff --git a/shared/test/unit_test/utilities/debug_file_reader_tests.cpp b/shared/test/unit_test/utilities/debug_file_reader_tests.cpp index 237416bd8a..f6cd2e3f61 100644 --- a/shared/test/unit_test/utilities/debug_file_reader_tests.cpp +++ b/shared/test/unit_test/utilities/debug_file_reader_tests.cpp @@ -28,9 +28,8 @@ TEST(SettingsFileReader, givenTestFileWithDefaultValuesWhenTheyAreQueriedThenDef debugVariableCount++; #define DECLARE_DEBUG_SCOPED_V(dataType, variableName, defaultValue, description, ...) \ DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) -#include "shared/source/debug_settings/release_variables.inl" - #include "debug_variables.inl" +#include "release_variables.inl" #undef DECLARE_DEBUG_SCOPED_V #undef DECLARE_DEBUG_VARIABLE