From 35064c3dea0729bf762d814c6f02a68fc710eecf Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Fri, 26 Feb 2021 13:44:43 +0000 Subject: [PATCH] Allow for hex input in file with debug keys Signed-off-by: Mateusz Jablonski --- opencl/test/unit_test/helpers/test_debug_variables.inl | 5 +++-- opencl/test/unit_test/test_files/igdrcl_string.config | 3 ++- opencl/test/unit_test/utilities/debug_file_reader_tests.inl | 6 +++++- shared/source/utilities/debug_file_reader.cpp | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/opencl/test/unit_test/helpers/test_debug_variables.inl b/opencl/test/unit_test/helpers/test_debug_variables.inl index 42d74ed8cf..391052722b 100644 --- a/opencl/test/unit_test/helpers/test_debug_variables.inl +++ b/opencl/test/unit_test/helpers/test_debug_variables.inl @@ -1,9 +1,10 @@ /* - * Copyright (C) 2017-2020 Intel Corporation + * Copyright (C) 2017-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ DECLARE_DEBUG_VARIABLE(std::string, StringTestKey, "DefaultTestValue", "TestDescription") -DECLARE_DEBUG_VARIABLE(int32_t, IntTestKey, 1, "TestDescription") +DECLARE_DEBUG_VARIABLE(int32_t, IntTestKey, 1234, "TestDescription") +DECLARE_DEBUG_VARIABLE(int32_t, IntTestKeyHex, 0xDEADBEEF, "TestDescription") diff --git a/opencl/test/unit_test/test_files/igdrcl_string.config b/opencl/test/unit_test/test_files/igdrcl_string.config index 7e481714a8..1f0d168f9b 100644 --- a/opencl/test/unit_test/test_files/igdrcl_string.config +++ b/opencl/test/unit_test/test_files/igdrcl_string.config @@ -1,2 +1,3 @@ StringTestKey = TestValue -IntTestKey = 1 +IntTestKey = 123 +IntTestKeyHex = 0xABCD \ No newline at end of file diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl index f6aa9b1f3d..aac0a1a5a9 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl +++ b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl @@ -89,7 +89,11 @@ TEST(SettingsFileReader, givenDebugFileSettingInWhichStringIsFollowedByIntegerWh int32_t retValue = 0; int32_t returnedIntValue = reader->getSetting("IntTestKey", retValue); - EXPECT_EQ(1, returnedIntValue); + EXPECT_EQ(123, returnedIntValue); + + int32_t returnedIntValueHex = reader->getSetting("IntTestKeyHex", 0); + + EXPECT_EQ(0xABCD, returnedIntValueHex); std::string retValueString; std::string returnedStringValue = reader->getSetting("StringTestKey", retValueString); diff --git a/shared/source/utilities/debug_file_reader.cpp b/shared/source/utilities/debug_file_reader.cpp index 800638cce7..db0d164c4b 100644 --- a/shared/source/utilities/debug_file_reader.cpp +++ b/shared/source/utilities/debug_file_reader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2020 Intel Corporation + * Copyright (C) 2017-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -36,7 +36,7 @@ int64_t SettingsFileReader::getSetting(const char *settingName, int64_t defaultV std::map::iterator it = settingStringMap.find(std::string(settingName)); if (it != settingStringMap.end()) { - value = atoll(it->second.c_str()); + value = strtoll(it->second.c_str(), nullptr, 0); } return value;