WSL - fixing allocation alignment

Signed-off-by: Jaroslaw Chodor <[email protected]>

Author: jchodor

opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h

@@ -20,6 +20,7 @@ class MockWddmMemoryManager : public MemoryManagerCreate<WddmMemoryManager> {
   public:
     using BaseClass::alignmentSelector;
     using BaseClass::allocateGraphicsMemoryForNonSvmHostPtr;
+    using BaseClass::allocateGraphicsMemoryWithAlignment;
     using BaseClass::allocateGraphicsMemoryWithGpuVa;
     using BaseClass::allocateGraphicsMemoryWithProperties;
     using BaseClass::allocateShareableMemory;

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

@@ -2290,3 +2290,46 @@ TEST_F(WddmMemoryManagerSimpleTest, givenWddmMemoryManagerWhenGettingGlobalMemor
     uint32_t rootDeviceIndex = 0u;
     EXPECT_EQ(memoryManager.getPercentOfGlobalMemoryAvailable(rootDeviceIndex), 0.8);
 }
+
+TEST_F(WddmMemoryManagerSimpleTest, whenAlignmentRequirementExceedsPageSizeThenAllocateGraphicsMemoryFromSystemPtr) {
+    struct MockWddmMemoryManagerAllocateWithAlignment : MockWddmMemoryManager {
+        using MockWddmMemoryManager::MockWddmMemoryManager;
+
+        GraphicsAllocation *allocateSystemMemoryAndCreateGraphicsAllocationFromIt(const AllocationData &allocationData) override {
+            ++callCount.allocateSystemMemoryAndCreateGraphicsAllocationFromIt;
+            return nullptr;
+        }
+        GraphicsAllocation *allocateGraphicsMemoryUsingKmdAndMapItToCpuVA(const AllocationData &allocationData, bool allowLargePages) override {
+            ++callCount.allocateGraphicsMemoryUsingKmdAndMapItToCpuVA;
+            return nullptr;
+        }
+
+        struct {
+            int allocateSystemMemoryAndCreateGraphicsAllocationFromIt = 0;
+            int allocateGraphicsMemoryUsingKmdAndMapItToCpuVA = 0;
+        } callCount;
+    };
+
+    MockWddmMemoryManagerAllocateWithAlignment memoryManager(true, true, *executionEnvironment);
+
+    AllocationData allocData = {};
+    allocData.size = 1024;
+    allocData.alignment = MemoryConstants::pageSize64k * 4;
+    memoryManager.allocateGraphicsMemoryWithAlignment(allocData);
+    EXPECT_EQ(1U, memoryManager.callCount.allocateSystemMemoryAndCreateGraphicsAllocationFromIt);
+    EXPECT_EQ(0U, memoryManager.callCount.allocateGraphicsMemoryUsingKmdAndMapItToCpuVA);
+
+    memoryManager.callCount.allocateSystemMemoryAndCreateGraphicsAllocationFromIt = 0;
+    memoryManager.callCount.allocateGraphicsMemoryUsingKmdAndMapItToCpuVA = 0;
+
+    allocData.size = 1024;
+    allocData.alignment = MemoryConstants::pageSize;
+    memoryManager.allocateGraphicsMemoryWithAlignment(allocData);
+    if (preferredAllocationMethod == GfxMemoryAllocationMethod::AllocateByKmd) {
+        EXPECT_EQ(0U, memoryManager.callCount.allocateSystemMemoryAndCreateGraphicsAllocationFromIt);
+        EXPECT_EQ(1U, memoryManager.callCount.allocateGraphicsMemoryUsingKmdAndMapItToCpuVA);
+    } else {
+        EXPECT_EQ(1U, memoryManager.callCount.allocateSystemMemoryAndCreateGraphicsAllocationFromIt);
+        EXPECT_EQ(0U, memoryManager.callCount.allocateGraphicsMemoryUsingKmdAndMapItToCpuVA);
+    }
+}

shared/source/os_interface/windows/wddm_memory_manager.cpp

@@ -199,7 +199,9 @@ GraphicsAllocation *WddmMemoryManager::allocateUSMHostGraphicsMemory(const Alloc
 }
 
 GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) {
-    if (preferredAllocationMethod == GfxMemoryAllocationMethod::UseUmdSystemPtr) {
+    auto pageSize = NEO::OSInterface::osEnabled64kbPages ? MemoryConstants::pageSize64k : MemoryConstants::pageSize;
+    bool requiresNonStandardAlignment = allocationData.alignment > pageSize;
+    if ((preferredAllocationMethod == GfxMemoryAllocationMethod::UseUmdSystemPtr) || requiresNonStandardAlignment) {
         return allocateSystemMemoryAndCreateGraphicsAllocationFromIt(allocationData);
     } else {
         return allocateGraphicsMemoryUsingKmdAndMapItToCpuVA(allocationData, NEO::OSInterface::osEnabled64kbPages);

shared/source/os_interface/windows/wddm_memory_manager.h

@@ -84,8 +84,8 @@ class WddmMemoryManager : public MemoryManager {
     GraphicsAllocation *allocateGraphicsMemoryWithGpuVa(const AllocationData &allocationData) override { return nullptr; }
 
     GraphicsAllocation *allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) override;
-    GraphicsAllocation *allocateSystemMemoryAndCreateGraphicsAllocationFromIt(const AllocationData &allocationData);
-    GraphicsAllocation *allocateGraphicsMemoryUsingKmdAndMapItToCpuVA(const AllocationData &allocationData, bool allowLargePages);
+    MOCKABLE_VIRTUAL GraphicsAllocation *allocateSystemMemoryAndCreateGraphicsAllocationFromIt(const AllocationData &allocationData);
+    MOCKABLE_VIRTUAL GraphicsAllocation *allocateGraphicsMemoryUsingKmdAndMapItToCpuVA(const AllocationData &allocationData, bool allowLargePages);
 
     void *lockResourceImpl(GraphicsAllocation &graphicsAllocation) override;
     void unlockResourceImpl(GraphicsAllocation &graphicsAllocation) override;