diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index 88ba848fd4..0a2b32909c 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -1217,12 +1217,6 @@ uint64_t MemoryManager::adjustToggleBitFlagForGpuVa(AllocationType inputAllocati return gpuAddress; } -bool MemoryManager::usmCompressionSupported(Device *device) { - auto &hwInfo = device->getHardwareInfo(); - auto &gfxCoreHelper = device->getGfxCoreHelper(); - return gfxCoreHelper.usmCompressionSupported(hwInfo); -} - void MemoryManager::addCustomHeapAllocatorConfig(AllocationType allocationType, bool isFrontWindowPool, const CustomHeapAllocatorConfig &config) { customHeapAllocators[{allocationType, isFrontWindowPool}] = config; } diff --git a/shared/source/memory_manager/memory_manager.h b/shared/source/memory_manager/memory_manager.h index 943ebb66f4..ec0c863b84 100644 --- a/shared/source/memory_manager/memory_manager.h +++ b/shared/source/memory_manager/memory_manager.h @@ -328,7 +328,6 @@ class MemoryManager { virtual uint32_t getNumMediaEncoders(uint32_t rootDeviceIndex) const { return 0; } virtual bool isCompressionSupportedForShareable(bool isShareable) { return true; } - virtual bool usmCompressionSupported(Device *device); size_t getUsedLocalMemorySize(uint32_t rootDeviceIndex) const { return localMemAllocsSize[rootDeviceIndex]; } size_t getUsedSystemMemorySize() const { return sysMemAllocsSize; } diff --git a/shared/source/memory_manager/unified_memory_manager.cpp b/shared/source/memory_manager/unified_memory_manager.cpp index a3a0d6ea16..82e87ef143 100644 --- a/shared/source/memory_manager/unified_memory_manager.cpp +++ b/shared/source/memory_manager/unified_memory_manager.cpp @@ -767,7 +767,9 @@ void *SVMAllocsManager::createUnifiedAllocationWithDeviceStorage(size_t size, co gpuProperties.alignment = alignment; auto compressionSupported = false; if (unifiedMemoryProperties.device) { - compressionSupported = memoryManager->usmCompressionSupported(unifiedMemoryProperties.device); + auto &gfxCoreHelper = unifiedMemoryProperties.device->getGfxCoreHelper(); + auto &hwInfo = unifiedMemoryProperties.device->getHardwareInfo(); + compressionSupported = gfxCoreHelper.usmCompressionSupported(hwInfo); compressionSupported &= memoryManager->isCompressionSupportedForShareable(unifiedMemoryProperties.allocationFlags.flags.shareable); } gpuProperties.flags.preferCompressed = compressionSupported; @@ -960,7 +962,9 @@ AllocationType SVMAllocsManager::getGraphicsAllocationTypeAndCompressionPreferen allocationType = AllocationType::writeCombined; } else { UNRECOVERABLE_IF(nullptr == unifiedMemoryProperties.device); - if (CompressionSelector::allowStatelessCompression() || memoryManager->usmCompressionSupported(unifiedMemoryProperties.device)) { + auto &gfxCoreHelper = unifiedMemoryProperties.device->getGfxCoreHelper(); + auto &hwInfo = unifiedMemoryProperties.device->getHardwareInfo(); + if (CompressionSelector::allowStatelessCompression() || gfxCoreHelper.usmCompressionSupported(hwInfo)) { compressionEnabled = true; } if (unifiedMemoryProperties.requestedAllocationType != AllocationType::unknown) { diff --git a/shared/source/os_interface/linux/drm_memory_manager.cpp b/shared/source/os_interface/linux/drm_memory_manager.cpp index ac1aed04b0..4c23dc1503 100644 --- a/shared/source/os_interface/linux/drm_memory_manager.cpp +++ b/shared/source/os_interface/linux/drm_memory_manager.cpp @@ -2966,13 +2966,6 @@ bool DrmMemoryManager::isCompressionSupportedForShareable(bool isShareable) { return !isShareable; } -bool DrmMemoryManager::usmCompressionSupported(Device *device) { - if (NEO::debugManager.flags.RenderCompressedBuffersEnabled.get() != -1) { - return !!NEO::debugManager.flags.RenderCompressedBuffersEnabled.get(); - } - return false; -} - void DrmMemoryManager::getExtraDeviceProperties(uint32_t rootDeviceIndex, uint32_t *moduleId, uint16_t *serverType) { getDrm(rootDeviceIndex).getIoctlHelper()->queryDeviceParams(moduleId, serverType); } diff --git a/shared/source/os_interface/linux/drm_memory_manager.h b/shared/source/os_interface/linux/drm_memory_manager.h index 7cc40a8994..9b5a3d2358 100644 --- a/shared/source/os_interface/linux/drm_memory_manager.h +++ b/shared/source/os_interface/linux/drm_memory_manager.h @@ -119,7 +119,6 @@ class DrmMemoryManager : public MemoryManager { uint32_t getNumMediaEncoders(uint32_t rootDeviceIndex) const override; bool isCompressionSupportedForShareable(bool isShareable) override; - bool usmCompressionSupported(Device *device) override; MOCKABLE_VIRTUAL SubmissionStatus emitPinningRequestForBoContainer(BufferObject **bo, uint32_t boCount, uint32_t rootDeviceIndex) const; void getExtraDeviceProperties(uint32_t rootDeviceIndex, uint32_t *moduleId, uint16_t *serverType) override; diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 2101a16a5d..27bb3baf18 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -8612,14 +8612,6 @@ TEST_F(DrmMemoryManagerTest, givenIsCompressionSupportedForShareableThenReturnCo EXPECT_TRUE(memoryManager->isCompressionSupportedForShareable(false)); } -TEST_F(DrmMemoryManagerTest, givenUsmCompressionSupportedThenReturnFalse) { - DebugManagerStateRestore dbgState; - EXPECT_FALSE(memoryManager->usmCompressionSupported(device)); - - debugManager.flags.RenderCompressedBuffersEnabled.set(1); - EXPECT_TRUE(memoryManager->usmCompressionSupported(device)); -} - TEST_F(DrmMemoryManagerTest, givenVmAdviseAtomicAttributeEqualZeroWhenCreateSharedUnifiedMemoryAllocationIsCalledThenNullptrReturned) { std::vector regionInfo(1); regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};