diff --git a/level_zero/core/source/helpers/api_specific_config_l0.cpp b/level_zero/core/source/helpers/api_specific_config_l0.cpp index 8555421160..b4bb93bc86 100644 --- a/level_zero/core/source/helpers/api_specific_config_l0.cpp +++ b/level_zero/core/source/helpers/api_specific_config_l0.cpp @@ -14,8 +14,8 @@ #include namespace NEO { -std::vector validL0Prefixes; -std::vector validL0PrefixTypes; +StackVec validL0Prefixes; +StackVec validL0PrefixTypes; bool ApiSpecificConfig::isStatelessCompressionSupported() { return false; } @@ -61,11 +61,11 @@ void ApiSpecificConfig::initPrefixes() { validL0PrefixTypes = {DebugVarPrefix::Neo_L0, DebugVarPrefix::Neo, DebugVarPrefix::None}; } -const std::vector &ApiSpecificConfig::getPrefixStrings() { +const StackVec &ApiSpecificConfig::getPrefixStrings() { return validL0Prefixes; } -const std::vector &ApiSpecificConfig::getPrefixTypes() { +const StackVec &ApiSpecificConfig::getPrefixTypes() { return validL0PrefixTypes; } } // namespace NEO diff --git a/opencl/source/helpers/api_specific_config_ocl.cpp b/opencl/source/helpers/api_specific_config_ocl.cpp index 17563a6d23..9dce002dcd 100644 --- a/opencl/source/helpers/api_specific_config_ocl.cpp +++ b/opencl/source/helpers/api_specific_config_ocl.cpp @@ -14,8 +14,8 @@ #include namespace NEO { -std::vector validClPrefixes; -std::vector validClPrefixTypes; +StackVec validClPrefixes; +StackVec validClPrefixTypes; bool ApiSpecificConfig::isStatelessCompressionSupported() { return true; } @@ -61,11 +61,11 @@ void ApiSpecificConfig::initPrefixes() { validClPrefixTypes = {DebugVarPrefix::Neo_Ocl, DebugVarPrefix::Neo, DebugVarPrefix::None}; } -const std::vector &ApiSpecificConfig::getPrefixStrings() { +const StackVec &ApiSpecificConfig::getPrefixStrings() { return validClPrefixes; } -const std::vector &ApiSpecificConfig::getPrefixTypes() { +const StackVec &ApiSpecificConfig::getPrefixTypes() { return validClPrefixTypes; } } // namespace NEO diff --git a/shared/source/helpers/api_specific_config.h b/shared/source/helpers/api_specific_config.h index 7e951f1b97..4fb1465efc 100644 --- a/shared/source/helpers/api_specific_config.h +++ b/shared/source/helpers/api_specific_config.h @@ -7,6 +7,7 @@ #pragma once #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/utilities/stackvec.h" #include #include @@ -27,8 +28,8 @@ struct ApiSpecificConfig { static uint64_t getReducedMaxAllocSize(uint64_t maxAllocSize); static const char *getRegistryPath(); static void initPrefixes(); - static const std::vector &getPrefixStrings(); - static const std::vector &getPrefixTypes(); + static const StackVec &getPrefixStrings(); + static const StackVec &getPrefixTypes(); static std::string getAubPrefixForSpecificApi() { return (getName() + "_"); } diff --git a/shared/source/os_interface/debug_env_reader.cpp b/shared/source/os_interface/debug_env_reader.cpp index dcd74fd450..33e73880c6 100644 --- a/shared/source/os_interface/debug_env_reader.cpp +++ b/shared/source/os_interface/debug_env_reader.cpp @@ -38,8 +38,8 @@ int64_t EnvironmentVariableReader::getSetting(const char *settingName, int64_t d int64_t value = defaultValue; char *envValue; - const std::vector prefixString = ApiSpecificConfig::getPrefixStrings(); - const std::vector prefixType = ApiSpecificConfig::getPrefixTypes(); + auto prefixString = ApiSpecificConfig::getPrefixStrings(); + auto prefixType = ApiSpecificConfig::getPrefixTypes(); uint32_t i = 0; for (const auto &prefix : prefixString) { @@ -73,8 +73,8 @@ std::string EnvironmentVariableReader::getSetting(const char *settingName, const std::string keyValue; keyValue.assign(value); - const std::vector prefixString = ApiSpecificConfig::getPrefixStrings(); - const std::vector prefixType = ApiSpecificConfig::getPrefixTypes(); + auto prefixString = ApiSpecificConfig::getPrefixStrings(); + auto prefixType = ApiSpecificConfig::getPrefixTypes(); uint32_t i = 0; for (const auto &prefix : prefixString) { diff --git a/shared/source/os_interface/windows/debug_registry_reader.cpp b/shared/source/os_interface/windows/debug_registry_reader.cpp index b1e3dea480..2281bef5b1 100644 --- a/shared/source/os_interface/windows/debug_registry_reader.cpp +++ b/shared/source/os_interface/windows/debug_registry_reader.cpp @@ -92,8 +92,8 @@ int64_t RegistryReader::getSetting(const char *settingName, int64_t defaultValue if (!(getSettingIntCommon(settingName, value))) { char *envValue; - const std::vector prefixString = ApiSpecificConfig::getPrefixStrings(); - const std::vector prefixType = ApiSpecificConfig::getPrefixTypes(); + auto prefixString = ApiSpecificConfig::getPrefixStrings(); + auto prefixType = ApiSpecificConfig::getPrefixTypes(); uint32_t i = 0; for (const auto &prefix : prefixString) { @@ -190,8 +190,8 @@ std::string RegistryReader::getSetting(const char *settingName, const std::strin if (!(getSettingStringCommon(settingName, keyValue))) { char *envValue; - const std::vector prefixString = ApiSpecificConfig::getPrefixStrings(); - const std::vector prefixType = ApiSpecificConfig::getPrefixTypes(); + auto prefixString = ApiSpecificConfig::getPrefixStrings(); + auto prefixType = ApiSpecificConfig::getPrefixTypes(); uint32_t i = 0; for (const auto &prefix : prefixString) { diff --git a/shared/source/utilities/debug_file_reader.cpp b/shared/source/utilities/debug_file_reader.cpp index 6437bbeed5..1c9580508d 100644 --- a/shared/source/utilities/debug_file_reader.cpp +++ b/shared/source/utilities/debug_file_reader.cpp @@ -42,8 +42,8 @@ int32_t SettingsFileReader::getSetting(const char *settingName, int32_t defaultV int64_t SettingsFileReader::getSetting(const char *settingName, int64_t defaultValue, DebugVarPrefix &type) { int64_t value = defaultValue; - const std::vector prefixString = ApiSpecificConfig::getPrefixStrings(); - const std::vector prefixType = ApiSpecificConfig::getPrefixTypes(); + auto prefixString = ApiSpecificConfig::getPrefixStrings(); + auto prefixType = ApiSpecificConfig::getPrefixTypes(); uint32_t i = 0; for (const auto &prefix : prefixString) { @@ -83,8 +83,8 @@ bool SettingsFileReader::getSetting(const char *settingName, bool defaultValue) std::string SettingsFileReader::getSetting(const char *settingName, const std::string &value, DebugVarPrefix &type) { std::string returnValue = value; - const std::vector prefixString = ApiSpecificConfig::getPrefixStrings(); - const std::vector prefixType = ApiSpecificConfig::getPrefixTypes(); + auto prefixString = ApiSpecificConfig::getPrefixStrings(); + auto prefixType = ApiSpecificConfig::getPrefixTypes(); uint32_t i = 0; for (const auto &prefix : prefixString) { diff --git a/shared/test/unit_test/ult_specific_config.cpp b/shared/test/unit_test/ult_specific_config.cpp index 0098f60867..c6a945d6a7 100644 --- a/shared/test/unit_test/ult_specific_config.cpp +++ b/shared/test/unit_test/ult_specific_config.cpp @@ -25,10 +25,10 @@ bool apiSupport = false; } // namespace ImplicitScaling const char *neoMockSettingsFileName = "neo_mock.config"; -std::vector validUltL0Prefixes = {"NEO_L0_", "NEO_", ""}; -std::vector validUltL0PrefixTypes = {DebugVarPrefix::Neo_L0, DebugVarPrefix::Neo, DebugVarPrefix::None}; -std::vector validUltOclPrefixes = {"NEO_OCL_", "NEO_", ""}; -std::vector validUltOclPrefixTypes = {DebugVarPrefix::Neo_Ocl, DebugVarPrefix::Neo, DebugVarPrefix::None}; +StackVec validUltL0Prefixes = {"NEO_L0_", "NEO_", ""}; +StackVec validUltL0PrefixTypes = {DebugVarPrefix::Neo_L0, DebugVarPrefix::Neo, DebugVarPrefix::None}; +StackVec validUltOclPrefixes = {"NEO_OCL_", "NEO_", ""}; +StackVec validUltOclPrefixTypes = {DebugVarPrefix::Neo_Ocl, DebugVarPrefix::Neo, DebugVarPrefix::None}; bool CompressionSelector::preferCompressedAllocation(const AllocationProperties &properties) { return false; @@ -88,7 +88,7 @@ const char *ApiSpecificConfig::getRegistryPath() { void ApiSpecificConfig::initPrefixes() { } -const std::vector &ApiSpecificConfig::getPrefixStrings() { +const StackVec &ApiSpecificConfig::getPrefixStrings() { if (apiTypeForUlts == ApiSpecificConfig::L0) { return validUltL0Prefixes; } else { @@ -96,7 +96,7 @@ const std::vector &ApiSpecificConfig::getPrefixStrings() { } } -const std::vector &ApiSpecificConfig::getPrefixTypes() { +const StackVec &ApiSpecificConfig::getPrefixTypes() { if (apiTypeForUlts == ApiSpecificConfig::L0) { return validUltL0PrefixTypes; } else {