Initialize storageInfo for new create allocation

in WddmMemoryManager::allocateGraphicsMemory64kb

Change-Id: Ie7ef14f2960c3923014941882c63f116ef265d74
Signed-off-by: Katarzyna Cencelewska <[email protected]>

Author: kcencele

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

@@ -162,6 +162,30 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAl
     memoryManager->freeGraphicsMemory(allocation);
 }
 
+TEST_F(WddmMemoryManagerSimpleTest, givenAllocationDataWithStorageInfoWhenAllocateGraphicsMemory64kbThenStorageInfoInAllocationIsSetCorrectly) {
+    memoryManager.reset(new MockWddmMemoryManager(false, false, *executionEnvironment));
+    AllocationData allocationData;
+    allocationData.storageInfo = {};
+    auto allocation = memoryManager->allocateGraphicsMemory64kb(allocationData);
+    EXPECT_NE(nullptr, allocation);
+    EXPECT_TRUE(memcmp(&allocationData.storageInfo, &allocation->storageInfo, sizeof(StorageInfo)) == 0);
+    memoryManager->freeGraphicsMemory(allocation);
+}
+
+TEST_F(WddmMemoryManagerSimpleTest, givenAllocationDataWithFlagsWhenAllocateGraphicsMemory64kbThenAllocationFlagFlushL3RequiredIsSetCorrectly) {
+    class MockGraphicsAllocation : public GraphicsAllocation {
+      public:
+        using GraphicsAllocation::allocationInfo;
+    };
+    memoryManager.reset(new MockWddmMemoryManager(false, false, *executionEnvironment));
+    AllocationData allocationData;
+    allocationData.flags.flushL3 = true;
+    auto allocation = static_cast<MockGraphicsAllocation *>(memoryManager->allocateGraphicsMemory64kb(allocationData));
+    EXPECT_NE(nullptr, allocation);
+    EXPECT_EQ(allocationData.flags.flushL3, allocation->allocationInfo.flags.flushL3Required);
+    memoryManager->freeGraphicsMemory(allocation);
+}
+
 TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemoryWithPtrIsCalledThenMemoryPoolIsSystem4KBPages) {
     memoryManager.reset(new MockWddmMemoryManager(false, false, *executionEnvironment));
     void *ptr = reinterpret_cast<void *>(0x1001);

shared/source/os_interface/windows/wddm_memory_manager.cpp

@@ -100,8 +100,13 @@ GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemory64kb(const Allocati
                                                            0u, // shareable
                                                            maxOsContextCount);
 
-    auto gmm = new Gmm(executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getGmmClientContext(), nullptr, sizeAligned, false, allocationData.flags.preferRenderCompressed, true, {});
+    auto gmm = new Gmm(executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getGmmClientContext(), nullptr,
+                       sizeAligned, allocationData.flags.uncacheable,
+                       allocationData.flags.preferRenderCompressed, true,
+                       allocationData.storageInfo);
     wddmAllocation->setDefaultGmm(gmm);
+    wddmAllocation->setFlushL3Required(allocationData.flags.flushL3);
+    wddmAllocation->storageInfo = allocationData.storageInfo;
 
     if (!getWddm(allocationData.rootDeviceIndex).createAllocation64k(gmm, wddmAllocation->getHandleToModify(0u))) {
         delete gmm;