Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DebugVariables cleanup 

- small cleanup
- files renaming to match convention

Change-Id: Iff9ed3a509001bcf6f154fc35f6d241ee9a968ae
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk 2018-10-26 14:13:04 +02:00 committed by sys_ocldev
parent ebe851e6d9
commit 6aa9b36a7b
10 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/os_interface/CMakeLists.txt
View File

@ -7,8 +7,8 @@
set(RUNTIME_SRCS_OS_INTERFACE_BASE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/32bit_memory.h
${CMAKE_CURRENT_SOURCE_DIR}/DebugVariables_base.inl
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/DebugVariables.inl
${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/debug_variables.inl
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp

2
runtime/os_interface/debug_settings_manager.cpp
View File

@ -37,7 +37,7 @@ DebugSettingsManager<DebugLevel>::DebugSettingsManager() {
dataType tempData = readerImpl->getSetting(#variableName, flags.variableName.get()); \
flags.variableName.set(tempData); \
}
#include "DebugVariables.inl"
#include "debug_variables.inl"
}
std::remove(logFileName.c_str());

4
runtime/os_interface/debug_settings_manager.h
View File

@ -62,7 +62,7 @@ private:
dataType value; \
};
#include "DebugVariables.inl"
#include "debug_variables.inl"
#undef DECLARE_DEBUG_VARIABLE
// clang-format on
@ -72,7 +72,7 @@ class DebugSettingsManager {
struct DebugVariables {
#define DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) \
DebugVar##variableName variableName;
#include "DebugVariables.inl"
#include "debug_variables.inl"
#undef DECLARE_DEBUG_VARIABLE
};

6
runtime/os_interface/DebugVariables_base.inl → runtime/os_interface/debug_variables_base.inl
View File

@ -5,7 +5,6 @@
*
*/
// clang-format off
/*SIMULATION FLAGS*/
DECLARE_DEBUG_VARIABLE(std::string, TbxServer, std::string("127.0.0.1"), "TCP-IP address of TBX server")
DECLARE_DEBUG_VARIABLE(std::string, ProductFamilyOverride, std::string("unk"), "Specify product for use in AUB/TBX")
@ -100,11 +99,10 @@ DECLARE_DEBUG_VARIABLE(int32_t, OverrideDefaultFP64Settings, -1, "-1: dont overr
/*DRIVER TOGGLES*/
DECLARE_DEBUG_VARIABLE(int32_t, ForceOCLVersion, 0, "Force specific OpenCL API version")
DECLARE_DEBUG_VARIABLE(int32_t, ForcePreemptionMode, -1, "Keep this variable in sync with PreemptionMode enum. -1 - devices default mode, 1 - disable, 2 - midBatch, 3 " "- threadGroup, 4 - midThread")
DECLARE_DEBUG_VARIABLE(int32_t, ForcePreemptionMode, -1, "Keep this variable in sync with PreemptionMode enum. -1 - devices default mode, 1 - disable, 2 - midBatch, 3 - threadGroup, 4 - midThread")
DECLARE_DEBUG_VARIABLE(int32_t, NodeOrdinal, -1, "-1: default do not override, 0: ENGINE_RCS")
DECLARE_DEBUG_VARIABLE(int32_t, OverrideThreadArbitrationPolicy, -1, "-1 (dont override) or any valid config (0: Age Based, 1: Round Robin)")
DECLARE_DEBUG_VARIABLE(int32_t, OverrideAubDeviceId, -1, "-1 dont override, any other: use this value for AUB generation device id")
DECLARE_DEBUG_VARIABLE(bool, UseMaxSimdSizeToDeduceMaxWorkgroupSize, false, "With this flag on, max workgroup size is deduced using SIMD32 instead of SIMD8, this causes the max wkg size " "to be 4 times bigger")
DECLARE_DEBUG_VARIABLE(bool, UseMaxSimdSizeToDeduceMaxWorkgroupSize, false, "With this flag on, max workgroup size is deduced using SIMD32 instead of SIMD8, this causes the max wkg size to be 4 times bigger")
DECLARE_DEBUG_VARIABLE(int32_t, EnableTimestampPacket, -1, "-1: default, 0: disable, 1:enable. Write Timestamp Packet for each set of gpu walkers")
DECLARE_DEBUG_VARIABLE(bool, ReturnRawGpuTimestamps, false, "Driver returns raw GPU tiemstamps instead of calculated ones.")
// clang-format on

2
runtime/os_interface/definitions/DebugVariables.inl → runtime/os_interface/definitions/debug_variables.inl
View File

@ -5,4 +5,4 @@
*
*/
#include "runtime/os_interface/DebugVariables_base.inl"
#include "runtime/os_interface/debug_variables_base.inl"

2
unit_tests/helpers/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/task_information_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/TestDebugVariables.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_debug_variables.inl
${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.h

0
unit_tests/helpers/TestDebugVariables.inl → unit_tests/helpers/test_debug_variables.inl
View File

2
unit_tests/os_interface/debug_settings_manager_tests.cpp
View File

@ -719,7 +719,7 @@ TEST(DebugSettingsManager, WithoutDebugFunctionality) {
bool isEqual = TestDebugFlagsChecker::isEqual(debugManager.flags.variableName.get(), defaultValue); \
EXPECT_TRUE(isEqual); \
}
#include "DebugVariables.inl"
#include "debug_variables.inl"
#undef DECLARE_DEBUG_VARIABLE
// test kernel dumping

4
unit_tests/utilities/debug_file_reader_tests.cpp
View File

@ -24,7 +24,7 @@ TEST(SettingsFileReader, givenTestFileWithDefaultValuesWhenTheyAreQueriedThenDef
compareSuccessful = (defaultValue == reader->getSetting(#variableName, defaultValue)); \
EXPECT_TRUE(compareSuccessful) << #variableName; \
debugVariableCount++;
#include "DebugVariables.inl"
#include "debug_variables.inl"
#undef DECLARE_DEBUG_VARIABLE
size_t mapCount = reader->getValueSettingsCount() + reader->getStringSettingsCount();
@ -47,6 +47,6 @@ TEST(SettingsFileReader, GetSetting) {
EXPECT_TRUE(true); \
} \
}
#include "DebugVariables.inl"
#include "debug_variables.inl"
#undef DECLARE_DEBUG_VARIABLE
}

4
unit_tests/utilities/debug_file_reader_tests.inl
View File

@ -62,7 +62,7 @@ TEST(SettingsFileReader, GetStringSettingFromFile) {
ASSERT_NE(nullptr, reader);
string retValue;
// StringTestKey is defined in file: unit_tests\helpers\TestDebugVariables.inl
// StringTestKey is defined in file: unit_tests\helpers\test_debug_variables.inl
string returnedStringValue = reader->getSetting("StringTestKey", retValue);
// "Test Value" is a value that should be read from file defined in stringTestPath member
@ -76,7 +76,7 @@ TEST(SettingsFileReader, GetStringSettingFromFile) {
EXPECT_TRUE(true); \
} \
}
#include "unit_tests/helpers/TestDebugVariables.inl"
#include "unit_tests/helpers/test_debug_variables.inl"
#undef DECLARE_DEBUG_VARIABLE
}