Revert "refactor: Add dc flush mitigation infrastructure"

This reverts commit d6076941a8.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>

opencl/source/dll/command_queue_dll.cpp

@@ -17,8 +17,4 @@ bool CommandQueue::isTimestampWaitEnabled() {
     return true;
 }
 
-bool checkIsGpuCopyRequiredForDcFlushMitigation(AllocationType type) {
-    return type != AllocationType::bufferHostMemory;
-}
-
 } // namespace NEO

opencl/source/mem_obj/buffer.cpp

@@ -184,8 +184,6 @@ Buffer *Buffer::create(Context *context,
                   flags, 0, size, hostPtr, bufferCreateArgs, errcodeRet);
 }
 
-extern bool checkIsGpuCopyRequiredForDcFlushMitigation(AllocationType type);
-
 bool inline copyHostPointer(Buffer *buffer,
                             Device &device,
                             size_t size,
@@ -197,8 +195,7 @@ bool inline copyHostPointer(Buffer *buffer,
     auto memory = buffer->getGraphicsAllocation(rootDeviceIndex);
     auto isCompressionEnabled = memory->isCompressionEnabled();
     const bool isLocalMemory = !MemoryPoolHelper::isSystemMemoryPool(memory->getMemoryPool());
-    const bool isGpuCopyRequiredForDcFlushMitigation = productHelper.isDcFlushMitigated() && checkIsGpuCopyRequiredForDcFlushMitigation(memory->getAllocationType());
+    const bool gpuCopyRequired = isCompressionEnabled || isLocalMemory || productHelper.isDcFlushMitigated();
-    const bool gpuCopyRequired = isCompressionEnabled || isLocalMemory || isGpuCopyRequiredForDcFlushMitigation;
     if (gpuCopyRequired) {
         auto &hwInfo = device.getHardwareInfo();
 
@@ -213,7 +210,7 @@ bool inline copyHostPointer(Buffer *buffer,
                                 isCompressionEnabled == false &&
                                 productHelper.getLocalMemoryAccessMode(hwInfo) != LocalMemoryAccessMode::cpuAccessDisallowed &&
                                 isLockable &&
-                                !isGpuCopyRequiredForDcFlushMitigation;
+                                !productHelper.isDcFlushMitigated();
 
         if (debugManager.flags.CopyHostPtrOnCpu.get() != -1) {
             copyOnCpuAllowed = debugManager.flags.CopyHostPtrOnCpu.get() == 1;
@@ -226,7 +223,7 @@ bool inline copyHostPointer(Buffer *buffer,
         } else {
             auto blitMemoryToAllocationResult = BlitOperationResult::unsupported;
 
-            if (productHelper.isBlitterFullySupported(hwInfo) && (isLocalMemory || isGpuCopyRequiredForDcFlushMitigation)) {
+            if (productHelper.isBlitterFullySupported(hwInfo) && (isLocalMemory || productHelper.isDcFlushMitigated())) {
                 blitMemoryToAllocationResult = BlitHelperFunctions::blitMemoryToAllocation(device, memory, buffer->getOffset(), hostPtr, {size, 1, 1});
             }
 

opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h

@@ -403,7 +403,7 @@ void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenSrcCompressedBuffer
 template <uint32_t numTiles, bool testLocalMemory>
 template <typename FamilyType>
 void CopyEngineXeHPAndLater<numTiles, testLocalMemory>::givenCompressedBufferWhenAuxTranslationCalledThenResolveAndCompressImpl() {
-    if (this->context->getDevice(0u)->areSharedSystemAllocationsAllowed() || !compressionSupported() || this->context->getDevice(0u)->getProductHelper().isDcFlushMitigated()) {
+    if (this->context->getDevice(0u)->areSharedSystemAllocationsAllowed() || !compressionSupported()) {
         // no support for scenarios where stateless is mixed with blitter compression
         GTEST_SKIP();
     }

opencl/test/unit_test/libult/command_queue_ult.cpp

@@ -19,8 +19,4 @@ bool CommandQueue::isTimestampWaitEnabled() {
     return ultHwConfig.useWaitForTimestamps;
 }
 
-bool checkIsGpuCopyRequiredForDcFlushMitigation(AllocationType type) {
-    return false;
-}
-
 } // namespace NEO

opencl/test/unit_test/mem_obj/buffer_tests.cpp

@@ -1930,10 +1930,6 @@ HWTEST_F(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAll
     auto memoryManager = new MockMemoryManager(true, *executionEnvironment);
     executionEnvironment->memoryManager.reset(memoryManager);
 
-    if (executionEnvironment->rootDeviceEnvironments[0]->getProductHelper().isDcFlushMitigated()) {
-        debugManager.flags.AllowDcFlush.set(1);
-    }
-
     MockClDevice device(new MockDevice(executionEnvironment, mockRootDeviceIndex));
     ASSERT_TRUE(device.createEngines());
     DeviceFactory::prepareDeviceEnvironments(*device.getExecutionEnvironment());

opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp

@@ -115,10 +115,6 @@ HWTEST2_F(PvcAndLaterBufferTests, givenCompressedBufferInSystemAndBlitterSupport
     auto pDevice = deviceFactory.rootDevices[0];
     auto pMockContext = std::make_unique<MockContext>(pDevice);
 
-    if (pDevice->getProductHelper().isDcFlushMitigated()) {
-        debugManager.flags.AllowDcFlush.set(1);
-    }
-
     static_cast<MockMemoryManager *>(pDevice->getExecutionEnvironment()->memoryManager.get())->enable64kbpages[0] = true;
     static_cast<MockMemoryManager *>(pDevice->getExecutionEnvironment()->memoryManager.get())->localMemorySupported[0] = false;
 

opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp

@@ -152,10 +152,6 @@ HWTEST_F(BufferCreateWindowsTests, givenClMemCopyHostPointerPassedToBufferCreate
     auto memoryManager = new MockMemoryManager(true, *executionEnvironment);
     executionEnvironment->memoryManager.reset(memoryManager);
 
-    if (executionEnvironment->rootDeviceEnvironments[0]->getProductHelper().isDcFlushMitigated()) {
-        debugManager.flags.AllowDcFlush.set(1);
-    }
-
     MockClDevice device(new MockDevice(executionEnvironment, mockRootDeviceIndex));
     ASSERT_TRUE(device.createEngines());
     DeviceFactory::prepareDeviceEnvironments(*device.getExecutionEnvironment());

shared/source/os_interface/product_helper.h

@@ -132,7 +132,6 @@ class ProductHelper {
     virtual bool isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const = 0;
     virtual bool isDcFlushAllowed() const = 0;
     virtual bool isDcFlushMitigated() const = 0;
-    virtual bool mitigateDcFlush() const = 0;
     virtual bool overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const = 0;
     virtual bool overrideCacheableForDcFlushMitigation(AllocationType allocationType) const = 0;
     virtual uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const = 0;

shared/source/os_interface/product_helper.inl

@@ -394,7 +394,7 @@ bool ProductHelperHw<gfxProduct>::isDisableScratchPagesSupported() const {
 template <PRODUCT_FAMILY gfxProduct>
 bool ProductHelperHw<gfxProduct>::isDcFlushAllowed() const {
     using GfxProduct = typename HwMapper<gfxProduct>::GfxProduct;
-    bool dcFlushAllowed = GfxProduct::isDcFlushAllowed && !this->mitigateDcFlush();
+    bool dcFlushAllowed = GfxProduct::isDcFlushAllowed;
 
     if (debugManager.flags.AllowDcFlush.get() != -1) {
         dcFlushAllowed = debugManager.flags.AllowDcFlush.get();
@@ -403,11 +403,6 @@ bool ProductHelperHw<gfxProduct>::isDcFlushAllowed() const {
     return dcFlushAllowed;
 }
 
-template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::mitigateDcFlush() const {
-    return false;
-}
-
 template <PRODUCT_FAMILY gfxProduct>
 bool ProductHelperHw<gfxProduct>::isDcFlushMitigated() const {
     using GfxProduct = typename HwMapper<gfxProduct>::GfxProduct;

shared/source/os_interface/product_helper_hw.h

@@ -76,7 +76,6 @@ class ProductHelperHw : public ProductHelper {
     bool isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const override;
     bool isDcFlushAllowed() const override;
     bool isDcFlushMitigated() const override;
-    bool mitigateDcFlush() const override;
     bool overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const override;
     bool overrideCacheableForDcFlushMitigation(AllocationType allocationType) const override;
     uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const override;

shared/source/xe2_hpg_core/windows/product_helper_lnl.cpp

@@ -35,11 +35,6 @@ uint64_t ProductHelperHw<gfxProduct>::overridePatIndex(bool isUncachedType, uint
     return patIndex;
 }
 
-template <>
-bool ProductHelperHw<gfxProduct>::mitigateDcFlush() const {
-    return true;
-}
-
 template <>
 bool ProductHelperHw<gfxProduct>::isDirectSubmissionSupported(ReleaseHelper *releaseHelper) const {
     return true;

shared/test/common/mocks/mock_product_helper.cpp

@@ -281,11 +281,6 @@ bool ProductHelperHw<IGFX_UNKNOWN>::isDcFlushMitigated() const {
     return false;
 }
 
-template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::mitigateDcFlush() const {
-    return false;
-}
-
 template <>
 bool ProductHelperHw<IGFX_UNKNOWN>::overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const {
     return false;

shared/test/unit_test/gmm_helper/gmm_helper_tests.cpp

@@ -685,11 +685,6 @@ TEST(GmmTest, givenHwInfoWhenDeviceIsCreatedThenSetThisHwInfoToGmmHelper) {
 TEST(GmmTest, givenAllocationTypeWhenGettingUsageTypeThenReturnCorrectValue) {
     MockExecutionEnvironment mockExecutionEnvironment{};
     const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<ProductHelper>();
-
-    if (productHelper.isDcFlushMitigated()) {
-        GTEST_SKIP();
-    }
-
     for (uint32_t i = 0; i < static_cast<uint32_t>(AllocationType::count); i++) {
         auto allocationType = static_cast<AllocationType>(i);
         auto uncachedGmmUsageType = productHelper.isNewCoherencyModelSupported() ? GMM_RESOURCE_USAGE_OCL_BUFFER_CSR_UC : GMM_RESOURCE_USAGE_OCL_BUFFER_CACHELINE_MISALIGNED;
@@ -888,10 +883,6 @@ TEST(GmmTest, givenUncachedDebugFlagMaskSetWhenAskingForUsageTypeThenReturnUncac
     MockExecutionEnvironment mockExecutionEnvironment{};
     const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<ProductHelper>();
 
-    if (productHelper.isDcFlushMitigated()) {
-        GTEST_SKIP();
-    }
-
     constexpr int64_t bufferMask = 1 << (static_cast<int64_t>(AllocationType::buffer) - 1);
     constexpr int64_t imageMask = 1 << (static_cast<int64_t>(AllocationType::image) - 1);
 

shared/test/unit_test/os_interface/product_helper_tests.cpp

@@ -311,11 +311,9 @@ HWTEST_F(ProductHelperTest, givenVariousValuesWhenGettingAubStreamSteppingFromHw
 
 HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatAndUsageForDcFlushMitigationThenReturnCorrectValue) {
     DebugManagerStateRestore restorer;
-    if (!productHelper->isDcFlushMitigated()) {
+    for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {
-        for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {
+        auto allocationType = static_cast<AllocationType>(i);
-            auto allocationType = static_cast<AllocationType>(i);
+        EXPECT_FALSE(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType));
-            EXPECT_FALSE(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType));
-        }
     }
     debugManager.flags.AllowDcFlush.set(0);
     for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {

shared/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp

@@ -2873,11 +2873,7 @@ HWTEST_F(WddmMemoryManagerTest, givenInternalHeapOrLinearStreamTypeWhenAllocatin
 
         ASSERT_NE(nullptr, allocation);
 
-        if (rootDeviceEnvironment->getProductHelper().isDcFlushMitigated()) {
+        EXPECT_TRUE(allocation->getDefaultGmm()->resourceParams.Usage == GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER);
-            EXPECT_TRUE(allocation->getDefaultGmm()->resourceParams.Usage == GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER_CACHELINE_MISALIGNED);
-        } else {
-            EXPECT_TRUE(allocation->getDefaultGmm()->resourceParams.Usage == GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER);
-        }
 
         memoryManager->freeGraphicsMemory(allocation);
     }
@@ -2889,11 +2885,7 @@ HWTEST_F(WddmMemoryManagerTest, givenInternalHeapOrLinearStreamTypeWhenAllocatin
 
         ASSERT_NE(nullptr, allocation);
 
-        if (rootDeviceEnvironment->getProductHelper().isDcFlushMitigated()) {
+        EXPECT_TRUE(allocation->getDefaultGmm()->resourceParams.Usage == GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER);
-            EXPECT_TRUE(allocation->getDefaultGmm()->resourceParams.Usage == GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER_CACHELINE_MISALIGNED);
-        } else {
-            EXPECT_TRUE(allocation->getDefaultGmm()->resourceParams.Usage == GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER);
-        }
 
         memoryManager->freeGraphicsMemory(allocation);
     }

shared/test/unit_test/xe2_hpg_core/lnl/gfx_core_helper_tests_lnl.cpp

@@ -29,5 +29,5 @@ LNLTEST_F(GfxCoreHelperTestsLnl, givenCommandBufferAllocationTypeWhenGetAllocati
 }
 
 LNLTEST_F(GfxCoreHelperTestsLnl, WhenAskingForDcFlushThenReturnTrue) {
-    EXPECT_NE(MemorySynchronizationCommands<FamilyType>::getDcFlushEnable(true, this->pDevice->getRootDeviceEnvironment()), this->pDevice->getRootDeviceEnvironment().getProductHelper().isDcFlushMitigated());
+    EXPECT_TRUE(MemorySynchronizationCommands<FamilyType>::getDcFlushEnable(true, this->pDevice->getRootDeviceEnvironment()));
 }

shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp

@@ -89,7 +89,6 @@ LNLTEST_F(LnlProductHelper, givenCompilerProductHelperWhenGetDefaultHwIpVersionT
 
 LNLTEST_F(LnlProductHelper, whenCheckPreferredAllocationMethodThenAllocateByKmdIsReturnedExceptTagBufferAndTimestampPacketTagBuffer) {
     DebugManagerStateRestore restorer;
-    debugManager.flags.AllowDcFlush.set(1);
     for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {
         auto allocationType = static_cast<AllocationType>(i);
         auto preferredAllocationMethod = productHelper->getPreferredAllocationMethod(allocationType);
@@ -127,13 +126,11 @@ LNLTEST_F(LnlProductHelper, givenProductHelperWhenCheckOverrideAllocationCacheab
 }
 
 LNLTEST_F(LnlProductHelper, givenExternalHostPtrWhenMitigateDcFlushThenOverrideCacheable) {
-    DebugManagerStateRestore restorer;
-    debugManager.flags.AllowDcFlush.set(1);
-
     AllocationData allocationData{};
     allocationData.type = AllocationType::externalHostPtr;
     EXPECT_FALSE(productHelper->overrideAllocationCacheable(allocationData));
 
+    DebugManagerStateRestore restorer;
     debugManager.flags.AllowDcFlush.set(0);
 
     for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {

shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp

@@ -23,14 +23,8 @@ LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenCheckDirectSubmissionSu
     EXPECT_TRUE(productHelper->isDirectSubmissionSupported(releaseHelper));
 }
 
-LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenDcFlushMitigationThenReturnTrue) {
-    EXPECT_TRUE(productHelper->mitigateDcFlush());
-    EXPECT_TRUE(productHelper->isDcFlushMitigated());
-}
-
 LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenOverridePatIndexCalledThenCorrectValueIsReturned) {
     DebugManagerStateRestore restorer;
-    debugManager.flags.AllowDcFlush.set(1);
 
     uint64_t expectedPatIndex = 6u;
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::bufferHostMemory));