Unify release variables

Resolves: NEO-4719

Change-Id: Ib2ab959c0a1eb45f24a4e0e2f02c437d96d47751
Signed-off-by: Lukasz Jobczyk <[email protected]>

Author: LukaszJobczyk

level_zero/core/source/device/device_imp.cpp

@@ -291,7 +291,7 @@ ze_result_t DeviceImp::getKernelProperties(ze_device_kernel_properties_t *pKerne
     pKernelProperties->int64AtomicsSupported = hardwareInfo.capabilityTable.ftrSupportsInteger64BitAtomics;
     pKernelProperties->halfFpCapabilities = defaultFpFlags;
 
-    if (NEO::releaseFP64Override() || NEO::DebugManager.flags.OverrideDefaultFP64Settings.get() == 1) {
+    if (NEO::DebugManager.flags.OverrideDefaultFP64Settings.get() == 1) {
         pKernelProperties->fp64Supported = true;
         pKernelProperties->singleFpCapabilities = ZE_FP_CAPS_ROUNDED_DIVIDE_SQRT;
         pKernelProperties->doubleFpCapabilities = defaultFpFlags;

opencl/source/cl_device/cl_device_caps.cpp

@@ -37,12 +37,10 @@ static constexpr cl_device_fp_config defaultFpFlags = static_cast<cl_device_fp_c
                                                                                        CL_FP_DENORM |
                                                                                        CL_FP_FMA);
 
-bool releaseFP64Override();
-
 void ClDevice::setupFp64Flags() {
     auto &hwInfo = getHardwareInfo();
 
-    if (releaseFP64Override() || DebugManager.flags.OverrideDefaultFP64Settings.get() == 1) {
+    if (DebugManager.flags.OverrideDefaultFP64Settings.get() == 1) {
         deviceExtensions += "cl_khr_fp64 ";
         deviceInfo.singleFpConfig = static_cast<cl_device_fp_config>(CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT);
         deviceInfo.doubleFpConfig = defaultFpFlags;

opencl/source/cl_device/linux/CMakeLists.txt

@@ -358,7 +358,7 @@ Buffer *Buffer::create(Context *context,
         return nullptr;
     }
 
-    if (isMakeAllBuffersResidentSet()) {
+    if (DebugManager.flags.MakeAllBuffersResident.get()) {
         auto graphicsAllocation = pBuffer->multiGraphicsAllocation.getDefaultGraphicsAllocation();
         auto rootDeviceEnvironment = pBuffer->executionEnvironment->rootDeviceEnvironments[graphicsAllocation->getRootDeviceIndex()].get();
         rootDeviceEnvironment->memoryOperationsInterface->makeResident(ArrayRef<GraphicsAllocation *>(&graphicsAllocation, 1));
@@ -452,19 +452,6 @@ bool Buffer::isReadOnlyMemoryPermittedByFlags(const MemoryProperties &properties
     return (properties.flags.hostNoAccess || properties.flags.hostReadOnly) && properties.flags.readOnly;
 }
 
-bool Buffer::isMakeAllBuffersResidentSet() {
-    static std::once_flag isMakeAllBufferResidentObtained;
-
-    std::call_once(isMakeAllBufferResidentObtained, [&]() {
-        auto value = DebugManager.flags.MakeAllBuffersResident.get();
-        auto settingsReader = SettingsReaderCreator::create(oclRegPath);
-        value |= settingsReader->getSetting("MakeAllBuffersResident", false);
-        DebugManager.flags.MakeAllBuffersResident.set(value);
-    });
-
-    return DebugManager.flags.MakeAllBuffersResident.get();
-}
-
 Buffer *Buffer::createSubBuffer(cl_mem_flags flags,
                                 cl_mem_flags_intel flagsIntel,
                                 const cl_buffer_region *region,

opencl/source/cl_device/linux/fp64_override.cpp

@@ -182,7 +182,6 @@ class Buffer : public MemObj {
                                                                         bool renderCompressedBuffers, bool localMemoryEnabled,
                                                                         bool preferCompression);
     static bool isReadOnlyMemoryPermittedByFlags(const MemoryProperties &properties);
-    static bool isMakeAllBuffersResidentSet();
 
     void transferData(void *dst, void *src, size_t copySize, size_t copyOffset);
 };

opencl/source/cl_device/windows/CMakeLists.txt

@@ -26,6 +26,8 @@ TEST(SettingsFileReader, givenTestFileWithDefaultValuesWhenTheyAreQueriedThenDef
     compareSuccessful = (defaultValue == reader->getSetting(#variableName, defaultValue)); \
     EXPECT_TRUE(compareSuccessful) << #variableName;                                       \
     debugVariableCount++;
+#include "shared/source/debug_settings/release_variables.inl"
+
 #include "debug_variables.inl"
 #undef DECLARE_DEBUG_VARIABLE
 

opencl/source/cl_device/windows/fp64_override.cpp

@@ -9,6 +9,7 @@ set(NEO_CORE_DEBUG_SETTINGS
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/release_variables.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/debug_variables.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/translate_debug_settings.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions/translate_debug_settings.h