diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index 8156b0a675..e07dd12856 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -194,8 +194,7 @@ bool inline copyHostPointer(Buffer *buffer, bool copyOnCpuAllowed = implicitScalingEnabled == false && size <= Buffer::maxBufferSizeForCopyOnCpu && isCompressionEnabled == false && - hwInfoConfig->getLocalMemoryAccessMode(hwInfo) != LocalMemoryAccessMode::CpuAccessDisallowed && - memory->storageInfo.isLockable; + hwInfoConfig->getLocalMemoryAccessMode(hwInfo) != LocalMemoryAccessMode::CpuAccessDisallowed; if (DebugManager.flags.CopyHostPtrOnCpu.get() != -1) { copyOnCpuAllowed = DebugManager.flags.CopyHostPtrOnCpu.get() == 1; } diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 029df0b0e3..b1bf757674 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -12,7 +12,6 @@ #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/fixtures/memory_management_fixture.h" -#include "shared/test/common/helpers/raii_hw_helper.h" #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" @@ -1807,17 +1806,8 @@ HWTEST_F(BufferHwFromDeviceTests, givenMultiGraphicsAllocationWhenCreateBufferHw alignedFree(ptr); } -using BufferCreateTests = BufferTests; - -HWTEST_F(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAllocationIsNotInSystemMemoryPoolAndCopyOnCpuEnabledThenAllocationIsWrittenUsingLockedPointerIfAllowed) { +TEST(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAllocationIsNotInSystemMemoryPoolAndCopyOnCpuEnabledThenAllocationIsWrittenUsingLockedPointerIfAllowed) { DebugManagerStateRestore restorer; - struct MockHwHelperHw : HwHelperHw { - void setExtraAllocationData(AllocationData &allocationData, const AllocationProperties &properties, const HardwareInfo &hwInfo) const override { - allocationData.storageInfo.isLockable = setIsLockable; - } - bool setIsLockable = false; - }; - DebugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); auto executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get()); @@ -1840,22 +1830,11 @@ HWTEST_F(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAll cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_COPY_HOST_PTR; auto writeBufferCounter = commandQueue->writeBufferCounter; size_t lockResourceCalled = memoryManager->lockResourceCalled; - RAIIHwHelperFactory overrideHwHelper{defaultHwInfo->platform.eRenderCoreFamily}; - overrideHwHelper.mockHwHelper.setIsLockable = true; - std::unique_ptr bufferWhenLockAllowed(Buffer::create(&context, flags, sizeof(memory), memory, retVal)); - ASSERT_NE(nullptr, bufferWhenLockAllowed.get()); + std::unique_ptr buffer(Buffer::create(&context, flags, sizeof(memory), memory, retVal)); + ASSERT_NE(nullptr, buffer.get()); EXPECT_EQ(commandQueue->writeBufferCounter, writeBufferCounter); EXPECT_EQ(memoryManager->lockResourceCalled, lockResourceCalled + 1); - - writeBufferCounter = commandQueue->writeBufferCounter; - lockResourceCalled = memoryManager->lockResourceCalled; - overrideHwHelper.mockHwHelper.setIsLockable = false; - - std::unique_ptr bufferWhenLockNotAllowed(Buffer::create(&context, flags, sizeof(memory), memory, retVal)); - ASSERT_NE(nullptr, bufferWhenLockNotAllowed.get()); - EXPECT_EQ(commandQueue->writeBufferCounter, writeBufferCounter + 1); - EXPECT_EQ(memoryManager->lockResourceCalled, lockResourceCalled); } { // buffer size over threshold -> cpu copy disallowed @@ -1863,20 +1842,9 @@ HWTEST_F(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAll cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_COPY_HOST_PTR; auto writeBufferCounter = commandQueue->writeBufferCounter; size_t lockResourceCalled = memoryManager->lockResourceCalled; - RAIIHwHelperFactory overrideHwHelper{defaultHwInfo->platform.eRenderCoreFamily}; - overrideHwHelper.mockHwHelper.setIsLockable = true; - std::unique_ptr bufferWhenLockAllowed(Buffer::create(&context, flags, sizeof(bigMemory), bigMemory, retVal)); - ASSERT_NE(nullptr, bufferWhenLockAllowed.get()); - EXPECT_EQ(commandQueue->writeBufferCounter, writeBufferCounter + 1); - EXPECT_EQ(memoryManager->lockResourceCalled, lockResourceCalled); - - writeBufferCounter = commandQueue->writeBufferCounter; - lockResourceCalled = memoryManager->lockResourceCalled; - overrideHwHelper.mockHwHelper.setIsLockable = false; - - std::unique_ptr bufferWhenLockNotAllowed(Buffer::create(&context, flags, sizeof(bigMemory), bigMemory, retVal)); - ASSERT_NE(nullptr, bufferWhenLockNotAllowed.get()); + std::unique_ptr buffer(Buffer::create(&context, flags, sizeof(bigMemory), bigMemory, retVal)); + ASSERT_NE(nullptr, buffer.get()); EXPECT_EQ(commandQueue->writeBufferCounter, writeBufferCounter + 1); EXPECT_EQ(memoryManager->lockResourceCalled, lockResourceCalled); } diff --git a/shared/test/common/helpers/raii_hw_helper.h b/shared/test/common/helpers/raii_hw_helper.h index 94bf674086..343073b27b 100644 --- a/shared/test/common/helpers/raii_hw_helper.h +++ b/shared/test/common/helpers/raii_hw_helper.h @@ -17,7 +17,7 @@ class RAIIHwHelperFactory { public: GFXCORE_FAMILY gfxCoreFamily; HwHelper *hwHelper; - MockHelper mockHwHelper{}; + MockHelper mockHwHelper; RAIIHwHelperFactory(GFXCORE_FAMILY gfxCoreFamily) { this->gfxCoreFamily = gfxCoreFamily;