Add programBarrierEnable helper function

Related-To: NEO-3211

Change-Id: I7afe11fa9d440837d66f0003b9e02db1f404d650
Signed-off-by: Filip Hazubski <[email protected]>

Author: fhazubski-Intel

runtime/device_queue/device_queue_hw_bdw_plus.inl

@@ -198,8 +198,10 @@ void DeviceQueueHw<GfxFamily>::setupIndirectState(IndirectHeap &surfaceStateHeap
         pIDDestination[blockIndex + i] = *pBlockID;
         pIDDestination[blockIndex + i].setKernelStartPointerHigh(gpuAddress >> 32);
         pIDDestination[blockIndex + i].setKernelStartPointer((uint32_t)gpuAddress);
-        pIDDestination[blockIndex + i].setBarrierEnable(pBlockInfo->patchInfo.executionEnvironment->HasBarriers);
         pIDDestination[blockIndex + i].setDenormMode(INTERFACE_DESCRIPTOR_DATA::DENORM_MODE_SETBYKERNEL);
+        HardwareCommandsHelper<GfxFamily>::programBarrierEnable(ptrOffset(pIDDestination, blockIndex + i),
+                                                                pBlockInfo->patchInfo.executionEnvironment->HasBarriers,
+                                                                parentKernel->getDevice().getHardwareInfo());
 
         // Set offset to sampler states, block's DHSOffset is added by scheduler
         pIDDestination[blockIndex + i].setSamplerStatePointer(static_cast<uint32_t>(pBlockInfo->getBorderColorStateSize()));

runtime/helpers/hardware_commands_helper.h

@@ -207,6 +207,7 @@ struct HardwareCommandsHelper : public PerThreadDataHelper {
     static MI_ATOMIC *programMiAtomic(LinearStream &commandStream, uint64_t writeAddress, typename MI_ATOMIC::ATOMIC_OPCODES opcode, typename MI_ATOMIC::DATA_SIZE dataSize);
     static void programMiAtomic(MI_ATOMIC &atomic, uint64_t writeAddress, typename MI_ATOMIC::ATOMIC_OPCODES opcode, typename MI_ATOMIC::DATA_SIZE dataSize);
     static void programCacheFlushAfterWalkerCommand(LinearStream *commandStream, const CommandQueue &commandQueue, const Kernel *kernel, uint64_t postSyncAddress);
+    static void programBarrierEnable(INTERFACE_DESCRIPTOR_DATA *pInterfaceDescriptor, uint32_t value, const HardwareInfo &hwInfo);
 
     static const size_t alignInterfaceDescriptorData = 64 * sizeof(uint8_t);
     static const uint32_t alignIndirectStatePointer = 64 * sizeof(uint8_t);

runtime/helpers/hardware_commands_helper.inl

@@ -163,7 +163,8 @@ size_t HardwareCommandsHelper<GfxFamily>::sendInterfaceDescriptorData(
     auto programmableIDSLMSize = static_cast<typename INTERFACE_DESCRIPTOR_DATA::SHARED_LOCAL_MEMORY_SIZE>(computeSlmValues(kernel.slmTotalSize));
 
     pInterfaceDescriptor->setSharedLocalMemorySize(programmableIDSLMSize);
-    pInterfaceDescriptor->setBarrierEnable(kernel.getKernelInfo().patchInfo.executionEnvironment->HasBarriers);
+    programBarrierEnable(pInterfaceDescriptor, kernel.getKernelInfo().patchInfo.executionEnvironment->HasBarriers,
+                         kernel.getDevice().getHardwareInfo());
 
     PreemptionHelper::programInterfaceDescriptorDataPreemption<GfxFamily>(pInterfaceDescriptor, preemptionMode);
 

runtime/helpers/hardware_commands_helper_base.inl

@@ -170,4 +170,10 @@ void HardwareCommandsHelper<GfxFamily>::programCacheFlushAfterWalkerCommand(Line
 
 template <typename GfxFamily>
 void HardwareCommandsHelper<GfxFamily>::appendMiFlushDw(typename GfxFamily::MI_FLUSH_DW *miFlushDwCmd) {}
+
+template <typename GfxFamily>
+void HardwareCommandsHelper<GfxFamily>::programBarrierEnable(INTERFACE_DESCRIPTOR_DATA *pInterfaceDescriptor, uint32_t value, const HardwareInfo &hwInfo) {
+    pInterfaceDescriptor->setBarrierEnable(value);
+}
+
 } // namespace NEO

unit_tests/gen_common/hw_cmds_tests.cpp

@@ -6,20 +6,24 @@
  */
 
 #include "runtime/gen_common/hw_cmds.h"
+#include "runtime/helpers/hardware_commands_helper.h"
 #include "test.h"
+#include "unit_tests/mocks/mock_device.h"
 
 using InterfaceDescriptorDataTests = ::testing::Test;
 
-HWTEST_F(InterfaceDescriptorDataTests, givenVariousValuesWhenCallingSetBarrierEnableThenCorrectValueIsSet) {
+HWCMDTEST_F(IGFX_GEN8_CORE, InterfaceDescriptorDataTests, givenVariousValuesWhenCallingSetBarrierEnableThenCorrectValueIsSet) {
     using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;
     INTERFACE_DESCRIPTOR_DATA idd = FamilyType::cmdInitInterfaceDescriptorData;
+    MockDevice device;
+    auto hwInfo = device.getHardwareInfo();
 
-    idd.setBarrierEnable(0);
+    HardwareCommandsHelper<FamilyType>::programBarrierEnable(&idd, 0, hwInfo);
     EXPECT_FALSE(idd.getBarrierEnable());
 
-    idd.setBarrierEnable(1);
+    HardwareCommandsHelper<FamilyType>::programBarrierEnable(&idd, 1, hwInfo);
     EXPECT_TRUE(idd.getBarrierEnable());
 
-    idd.setBarrierEnable(2);
+    HardwareCommandsHelper<FamilyType>::programBarrierEnable(&idd, 2, hwInfo);
     EXPECT_TRUE(idd.getBarrierEnable());
 }