From 68df8be148ff533ca49cea2227cd51cc01eabb24 Mon Sep 17 00:00:00 2001 From: Michal Mrozek Date: Wed, 9 Oct 2019 16:25:20 +0200 Subject: [PATCH] Refactor inline reg key. Change-Id: Ib04b8d4236bbc2862dd152b7350760c2cf20e3f0 Signed-off-by: Michal Mrozek --- runtime/helpers/hardware_commands_helper.inl | 6 +++++- runtime/os_interface/debug_variables_base.inl | 2 +- unit_tests/helpers/hardware_commands_helper_tests.cpp | 4 ++-- unit_tests/test_files/igdrcl.config | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/runtime/helpers/hardware_commands_helper.inl b/runtime/helpers/hardware_commands_helper.inl index 5da9b1d557..237d8df063 100644 --- a/runtime/helpers/hardware_commands_helper.inl +++ b/runtime/helpers/hardware_commands_helper.inl @@ -418,7 +418,11 @@ bool HardwareCommandsHelper::doBindingTablePrefetch() { template bool HardwareCommandsHelper::inlineDataProgrammingRequired(const Kernel &kernel) { - if (DebugManager.flags.EnablePassInlineData.get()) { + auto checkKernelForInlineData = false; + if (DebugManager.flags.EnablePassInlineData.get() != -1) { + checkKernelForInlineData = !!DebugManager.flags.EnablePassInlineData.get(); + } + if (checkKernelForInlineData) { return kernel.getKernelInfo().patchInfo.threadPayload->PassInlineData; } return false; diff --git a/runtime/os_interface/debug_variables_base.inl b/runtime/os_interface/debug_variables_base.inl index bb131e6031..2d7faa22eb 100644 --- a/runtime/os_interface/debug_variables_base.inl +++ b/runtime/os_interface/debug_variables_base.inl @@ -101,7 +101,6 @@ DECLARE_DEBUG_VARIABLE(bool, EnableComputeWorkSizeSquared, false, "Enables algor DECLARE_DEBUG_VARIABLE(bool, EnableVaLibCalls, true, "Enable cl-va sharing lib calls") DECLARE_DEBUG_VARIABLE(bool, EnableExtendedVaFormats, false, "Enable more formats in cl-va sharing") DECLARE_DEBUG_VARIABLE(bool, AddClGlSharing, false, "Add cl-gl extension") -DECLARE_DEBUG_VARIABLE(bool, EnablePassInlineData, false, "Enable passing of inline data") DECLARE_DEBUG_VARIABLE(bool, EnableFormatQuery, false, "Enable sharing format querying") DECLARE_DEBUG_VARIABLE(bool, AllowOpenFdOperations, false, "When enabled driver is allowed to call DRM_IOCTL_PRIME_HANDLE_TO_FD.") DECLARE_DEBUG_VARIABLE(bool, EnableFreeMemory, false, "Enable freeMemory in memory manager") @@ -128,6 +127,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, OverrideDefaultFP64Settings, -1, "-1: dont overr DECLARE_DEBUG_VARIABLE(int32_t, RenderCompressedImagesEnabled, -1, "-1: default, 0: disabled, 1: enabled") DECLARE_DEBUG_VARIABLE(int32_t, RenderCompressedBuffersEnabled, -1, "-1: default, 0: disabled, 1: enabled") DECLARE_DEBUG_VARIABLE(int32_t, EnableSharedSystemUsmSupport, -1, "-1: default, 0: shared system memory disabled, 1: shared system memory enabled") +DECLARE_DEBUG_VARIABLE(int32_t, EnablePassInlineData, -1, "-1: default, 0: Do not allow to pass inline data 1: Enable passing of inline data") /*DRIVER TOGGLES*/ DECLARE_DEBUG_VARIABLE(int32_t, ForceOCLVersion, 0, "Force specific OpenCL API version") diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/unit_tests/helpers/hardware_commands_helper_tests.cpp index 72d5bdd185..4c345a1eb3 100644 --- a/unit_tests/helpers/hardware_commands_helper_tests.cpp +++ b/unit_tests/helpers/hardware_commands_helper_tests.cpp @@ -1174,7 +1174,7 @@ INSTANTIATE_TEST_CASE_P(ParentKernelCommandsFromBinaryTest, HWTEST_F(HardwareCommandsTest, givenEnabledPassInlineDataWhenKernelAllowsInlineThenReturnTrue) { DebugManagerStateRestore restore; - DebugManager.flags.EnablePassInlineData.set(true); + DebugManager.flags.EnablePassInlineData.set(1u); uint32_t crossThreadData[8]; @@ -1186,7 +1186,7 @@ HWTEST_F(HardwareCommandsTest, givenEnabledPassInlineDataWhenKernelAllowsInlineT HWTEST_F(HardwareCommandsTest, givenEnabledPassInlineDataWhenKernelDisallowsInlineThenReturnFalse) { DebugManagerStateRestore restore; - DebugManager.flags.EnablePassInlineData.set(true); + DebugManager.flags.EnablePassInlineData.set(1u); uint32_t crossThreadData[8]; diff --git a/unit_tests/test_files/igdrcl.config b/unit_tests/test_files/igdrcl.config index 860e78b491..f3a7b3b96d 100644 --- a/unit_tests/test_files/igdrcl.config +++ b/unit_tests/test_files/igdrcl.config @@ -95,7 +95,7 @@ ReturnRawGpuTimestamps = 0 DoNotRegisterTrimCallback = 0 OverrideGdiPath = unk AddClGlSharing = 0 -EnablePassInlineData = 0 +EnablePassInlineData = -1 LimitAmountOfReturnedDevices = 0 EnableLocalMemory = -1 UseAubStream = 1