diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index adf74bc3bf..d5aace1e21 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -355,8 +355,8 @@ TEST_F(SVMLocalMemoryAllocatorTest, whenSharedAllocationIsCreatedWithDebugFlagSe EXPECT_EQ(allocationSize, allocation->size); EXPECT_EQ(mockContext.getDevice(0u), allocation->device->getSpecializedDevice()); - EXPECT_EQ(alignUp(allocationSize, MemoryConstants::pageSize64k), gpuAllocation->getUnderlyingBufferSize()); - EXPECT_EQ(alignUp(allocationSize, MemoryConstants::pageSize64k), allocation->cpuAllocation->getUnderlyingBufferSize()); + EXPECT_EQ(alignUp(allocationSize, 64 * KB), gpuAllocation->getUnderlyingBufferSize()); + EXPECT_EQ(alignUp(allocationSize, MemoryConstants::pageSize2Mb), allocation->cpuAllocation->getUnderlyingBufferSize()); EXPECT_EQ(AllocationType::SVM_GPU, gpuAllocation->getAllocationType()); EXPECT_EQ(AllocationType::SVM_CPU, allocation->cpuAllocation->getAllocationType()); @@ -384,8 +384,8 @@ TEST_F(SVMLocalMemoryAllocatorTest, whenSharedAllocationIsCreatedWithLocalMemory EXPECT_EQ(InternalMemoryType::SHARED_UNIFIED_MEMORY, allocation->memoryType); EXPECT_EQ(allocationSize, allocation->size); - EXPECT_EQ(alignUp(allocationSize, MemoryConstants::pageSize64k), gpuAllocation->getUnderlyingBufferSize()); - EXPECT_EQ(alignUp(allocationSize, MemoryConstants::pageSize64k), allocation->cpuAllocation->getUnderlyingBufferSize()); + EXPECT_EQ(alignUp(allocationSize, 64 * KB), gpuAllocation->getUnderlyingBufferSize()); + EXPECT_EQ(alignUp(allocationSize, MemoryConstants::pageSize2Mb), allocation->cpuAllocation->getUnderlyingBufferSize()); EXPECT_EQ(AllocationType::SVM_GPU, gpuAllocation->getAllocationType()); EXPECT_EQ(AllocationType::SVM_CPU, allocation->cpuAllocation->getAllocationType()); diff --git a/shared/source/memory_manager/unified_memory_manager.cpp b/shared/source/memory_manager/unified_memory_manager.cpp index bb773bac78..c72851a72b 100644 --- a/shared/source/memory_manager/unified_memory_manager.cpp +++ b/shared/source/memory_manager/unified_memory_manager.cpp @@ -408,7 +408,7 @@ void *SVMAllocsManager::createUnifiedAllocationWithDeviceStorage(size_t size, co auto rootDeviceIndex = unifiedMemoryProperties.device ? unifiedMemoryProperties.device->getRootDeviceIndex() : *unifiedMemoryProperties.rootDeviceIndices.begin(); - size_t alignedSizeCpu = alignUp(size, MemoryConstants::pageSize64k); + size_t alignedSizeCpu = alignUp(size, MemoryConstants::pageSize2Mb); size_t pageSizeForAlignment = MemoryConstants::pageSize64k; size_t alignedSizeGpu = alignUp(size, pageSizeForAlignment); DeviceBitfield subDevices = unifiedMemoryProperties.subdeviceBitfields.at(rootDeviceIndex); @@ -417,7 +417,7 @@ void *SVMAllocsManager::createUnifiedAllocationWithDeviceStorage(size_t size, co alignedSizeCpu, AllocationType::SVM_CPU, false, // isMultiStorageAllocation subDevices}; - cpuProperties.alignment = MemoryConstants::pageSize64k; + cpuProperties.alignment = MemoryConstants::pageSize2Mb; auto cacheRegion = MemoryPropertiesHelper::getCacheRegion(unifiedMemoryProperties.allocationFlags); MemoryPropertiesHelper::fillCachePolicyInProperties(cpuProperties, false, svmProperties.readOnly, false, cacheRegion); GraphicsAllocation *allocationCpu = memoryManager->allocateGraphicsMemoryWithProperties(cpuProperties);