intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-06 10:26:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add enableLocalMemory param to WddmMemoryManger constructor

Browse Source 
Change-Id: I89299c01f11565ab57a8421573a287c9a2e77b6e
This commit is contained in:
Venevtsev, Igor
2018-09-10 16:11:28 +02:00
committed by sys_ocldev
parent 3cc5d4ebd1
commit ed4e1e9c3e
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/os_interface/windows/wddm_device_command_stream.inl
View File

@@ -170,7 +170,7 @@ WddmMemoryManager *WddmCommandStreamReceiver<GfxFamily>::getMemoryManager() {
template <typename GfxFamily> template <typename GfxFamily>
MemoryManager *WddmCommandStreamReceiver<GfxFamily>::createMemoryManager(bool enable64kbPages, bool enableLocalMemory) { MemoryManager *WddmCommandStreamReceiver<GfxFamily>::createMemoryManager(bool enable64kbPages, bool enableLocalMemory) {
return memoryManager = new WddmMemoryManager(enable64kbPages, this->wddm); return memoryManager = new WddmMemoryManager(enable64kbPages, enableLocalMemory, this->wddm);
} }
template <typename GfxFamily> template <typename GfxFamily>

2
runtime/os_interface/windows/wddm_memory_manager.cpp
View File

@@ -43,7 +43,7 @@ WddmMemoryManager::~WddmMemoryManager() {
applyCommonCleanup(); applyCommonCleanup();
} }
WddmMemoryManager::WddmMemoryManager(bool enable64kbPages, Wddm *wddm) : MemoryManager(enable64kbPages, false), residencyLock(false) { WddmMemoryManager::WddmMemoryManager(bool enable64kbPages, bool enableLocalMemory, Wddm *wddm) : MemoryManager(enable64kbPages, enableLocalMemory), residencyLock(false) {
DEBUG_BREAK_IF(wddm == nullptr); DEBUG_BREAK_IF(wddm == nullptr);
this->wddm = wddm; this->wddm = wddm;
allocator32Bit = std::unique_ptr<Allocator32bit>(new Allocator32bit(wddm->getHeap32Base(), wddm->getHeap32Size())); allocator32Bit = std::unique_ptr<Allocator32bit>(new Allocator32bit(wddm->getHeap32Base(), wddm->getHeap32Size()));

2
runtime/os_interface/windows/wddm_memory_manager.h
View File

@@ -43,7 +43,7 @@ class WddmMemoryManager : public MemoryManager {
using MemoryManager::createGraphicsAllocationFromSharedHandle; using MemoryManager::createGraphicsAllocationFromSharedHandle;
~WddmMemoryManager(); ~WddmMemoryManager();
WddmMemoryManager(bool enable64kbPages, Wddm *wddm); WddmMemoryManager(bool enable64kbPages, bool enableLocalMemory, Wddm *wddm);
WddmMemoryManager(const WddmMemoryManager &) = delete; WddmMemoryManager(const WddmMemoryManager &) = delete;
WddmMemoryManager &operator=(const WddmMemoryManager &) = delete; WddmMemoryManager &operator=(const WddmMemoryManager &) = delete;

4
unit_tests/os_interface/windows/mock_wddm_memory_manager.h
View File

@@ -40,8 +40,8 @@ class MockWddmMemoryManager : public WddmMemoryManager {
using BaseClass::trimResidency; using BaseClass::trimResidency;
using BaseClass::trimResidencyToBudget; using BaseClass::trimResidencyToBudget;
MockWddmMemoryManager(bool enable64kbPages, Wddm *wddm) : WddmMemoryManager(enable64kbPages, wddm){}; MockWddmMemoryManager(bool enable64kbPages, bool enableLocalMemory, Wddm *wddm) : WddmMemoryManager(enable64kbPages, enableLocalMemory, wddm){};
MockWddmMemoryManager(Wddm *wddm) : WddmMemoryManager(false, wddm){}; MockWddmMemoryManager(Wddm *wddm) : WddmMemoryManager(false, false, wddm){};
void setDeferredDeleter(DeferredDeleter *deleter) { void setDeferredDeleter(DeferredDeleter *deleter) {
this->deferredDeleter.reset(deleter); this->deferredDeleter.reset(deleter);
} }

4
unit_tests/os_interface/windows/wddm20_tests.cpp
View File

@@ -412,7 +412,7 @@ TEST_F(Wddm20WithMockGdiDllTests, givenSharedHandleWhenCreateGraphicsAllocationF
auto status = setSizesFcn(gmm->gmmResourceInfo.get(), 1u, 1024u, 1u); auto status = setSizesFcn(gmm->gmmResourceInfo.get(), 1u, 1024u, 1u);
EXPECT_EQ(0u, status); EXPECT_EQ(0u, status);
WddmMemoryManager mm(false, wddm); WddmMemoryManager mm(false, false, wddm);
auto graphicsAllocation = mm.createGraphicsAllocationFromSharedHandle(ALLOCATION_HANDLE, false); auto graphicsAllocation = mm.createGraphicsAllocationFromSharedHandle(ALLOCATION_HANDLE, false);
auto wddmAllocation = (WddmAllocation *)graphicsAllocation; auto wddmAllocation = (WddmAllocation *)graphicsAllocation;
@@ -449,7 +449,7 @@ TEST_F(Wddm20WithMockGdiDllTests, givenSharedHandleWhenCreateGraphicsAllocationF
auto status = setSizesFcn(gmm->gmmResourceInfo.get(), 1u, 1024u, 1u); auto status = setSizesFcn(gmm->gmmResourceInfo.get(), 1u, 1024u, 1u);
EXPECT_EQ(0u, status); EXPECT_EQ(0u, status);
WddmMemoryManager mm(false, wddm); WddmMemoryManager mm(false, false, wddm);
auto graphicsAllocation = mm.createGraphicsAllocationFromSharedHandle(ALLOCATION_HANDLE, false); auto graphicsAllocation = mm.createGraphicsAllocationFromSharedHandle(ALLOCATION_HANDLE, false);
auto wddmAllocation = (WddmAllocation *)graphicsAllocation; auto wddmAllocation = (WddmAllocation *)graphicsAllocation;

2
unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl
View File

@@ -27,7 +27,7 @@ using namespace OCLRT;
using namespace ::testing; using namespace ::testing;
TEST_F(WddmMemoryManagerSimpleTest, givenUseSystemMemorySetToTrueWhenAllocateInDevicePoolIsCalledThenNullptrIsReturned) { TEST_F(WddmMemoryManagerSimpleTest, givenUseSystemMemorySetToTrueWhenAllocateInDevicePoolIsCalledThenNullptrIsReturned) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
MemoryManager::AllocationStatus status = MemoryManager::AllocationStatus::Success; MemoryManager::AllocationStatus status = MemoryManager::AllocationStatus::Success;
AllocationData allocData; AllocationData allocData;
allocData.allFlags = 0; allocData.allFlags = 0;

38
unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -74,7 +74,7 @@ TEST(WddmMemoryManagerAllocator32BitTest, allocator32BitIsCreatedWithCorrectBase
uint64_t size = 0x9000; uint64_t size = 0x9000;
wddm->setHeap32(base, size); wddm->setHeap32(base, size);
std::unique_ptr<WddmMemoryManager> memoryManager = std::unique_ptr<WddmMemoryManager>(new WddmMemoryManager(false, wddm.get())); std::unique_ptr<WddmMemoryManager> memoryManager = std::unique_ptr<WddmMemoryManager>(new WddmMemoryManager(false, false, wddm.get()));
ASSERT_NE(nullptr, memoryManager->allocator32Bit.get()); ASSERT_NE(nullptr, memoryManager->allocator32Bit.get());
@@ -93,7 +93,7 @@ TEST(WddmMemoryManagerWithDeferredDeleterTest, givenWMMWhenAsyncDeleterIsEnabled
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemoryIsCalledThenMemoryPoolIsSystem4KBPages) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemoryIsCalledThenMemoryPoolIsSystem4KBPages) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
auto size = 4096u; auto size = 4096u;
auto allocation = memoryManager->allocateGraphicsMemory(size); auto allocation = memoryManager->allocateGraphicsMemory(size);
@@ -110,7 +110,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemory
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAllocateGraphicsMemory64kbIsCalledThenMemoryPoolIsSystem64KBPages) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAllocateGraphicsMemory64kbIsCalledThenMemoryPoolIsSystem64KBPages) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
auto size = 4096u; auto size = 4096u;
auto allocation = memoryManager->allocateGraphicsMemory64kb(size, MemoryConstants::preferredAlignment, false, false); auto allocation = memoryManager->allocateGraphicsMemory64kb(size, MemoryConstants::preferredAlignment, false, false);
EXPECT_NE(nullptr, allocation); EXPECT_NE(nullptr, allocation);
@@ -120,7 +120,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAl
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemoryWithPtrIsCalledThenMemoryPoolIsSystem4KBPages) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemoryWithPtrIsCalledThenMemoryPoolIsSystem4KBPages) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
void *ptr = reinterpret_cast<void *>(0x1001); void *ptr = reinterpret_cast<void *>(0x1001);
auto size = 4096u; auto size = 4096u;
auto allocation = memoryManager->allocateGraphicsMemory(size, ptr, false); auto allocation = memoryManager->allocateGraphicsMemory(size, ptr, false);
@@ -133,7 +133,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocateGraphicsMemory
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocate32BitGraphicsMemoryWithPtrIsCalledThenMemoryPoolIsSystem4KBPagesWith32BitGpuAddressing) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocate32BitGraphicsMemoryWithPtrIsCalledThenMemoryPoolIsSystem4KBPagesWith32BitGpuAddressing) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
void *ptr = reinterpret_cast<void *>(0x1001); void *ptr = reinterpret_cast<void *>(0x1001);
auto size = MemoryConstants::pageSize; auto size = MemoryConstants::pageSize;
@@ -147,7 +147,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenAllocate32BitGraphicsM
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesDisabledWhenAllocateGraphicsMemoryForSVMIsCalledThen4KBGraphicsAllocationIsReturned) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesDisabledWhenAllocateGraphicsMemoryForSVMIsCalledThen4KBGraphicsAllocationIsReturned) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
auto size = MemoryConstants::pageSize; auto size = MemoryConstants::pageSize;
auto svmAllocation = memoryManager->allocateGraphicsMemoryForSVM(size, false); auto svmAllocation = memoryManager->allocateGraphicsMemoryForSVM(size, false);
@@ -158,7 +158,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesDisabledWhenA
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAllocateGraphicsMemoryForSVMIsCalledThenMemoryPoolIsSystem64KBPages) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAllocateGraphicsMemoryForSVMIsCalledThenMemoryPoolIsSystem64KBPages) {
memoryManager.reset(new MockWddmMemoryManager(true, wddm)); memoryManager.reset(new MockWddmMemoryManager(true, false, wddm));
auto size = MemoryConstants::pageSize; auto size = MemoryConstants::pageSize;
auto svmAllocation = memoryManager->allocateGraphicsMemoryForSVM(size, false); auto svmAllocation = memoryManager->allocateGraphicsMemoryForSVM(size, false);
@@ -168,7 +168,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWith64KBPagesEnabledWhenAl
} }
TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenCreateAllocationFromHandleIsCalledThenMemoryPoolIsSystemCpuInaccessible) { TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenCreateAllocationFromHandleIsCalledThenMemoryPoolIsSystemCpuInaccessible) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
auto osHandle = 1u; auto osHandle = 1u;
gdi->getQueryResourceInfoArgOut().NumAllocations = 1; gdi->getQueryResourceInfoArgOut().NumAllocations = 1;
std::unique_ptr<Gmm> gmm(new Gmm(nullptr, 0, false)); std::unique_ptr<Gmm> gmm(new Gmm(nullptr, 0, false));
@@ -188,7 +188,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenMemoryManagerWhenCreateAllocationFromHa
TEST_F(WddmMemoryManagerSimpleTest, TEST_F(WddmMemoryManagerSimpleTest,
givenAllocateGraphicsMemoryForNonSvmHostPtrIsCalledWhenNotAlignedPtrIsPassedThenAlignedGraphicsAllocationIsCreated) { givenAllocateGraphicsMemoryForNonSvmHostPtrIsCalledWhenNotAlignedPtrIsPassedThenAlignedGraphicsAllocationIsCreated) {
memoryManager.reset(new MockWddmMemoryManager(false, wddm)); memoryManager.reset(new MockWddmMemoryManager(false, false, wddm));
void *hostPtr = reinterpret_cast<void *>(0x5001); void *hostPtr = reinterpret_cast<void *>(0x5001);
auto allocation = memoryManager->allocateGraphicsMemoryForNonSvmHostPtr(13, hostPtr); auto allocation = memoryManager->allocateGraphicsMemoryForNonSvmHostPtr(13, hostPtr);
@@ -1979,7 +1979,7 @@ TEST_F(MockWddmMemoryManagerTest, givenEnabled64kbpagesWhenCreatingGraphicsMemor
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
EXPECT_TRUE(wddm->init()); EXPECT_TRUE(wddm->init());
DebugManager.flags.Enable64kbpages.set(true); DebugManager.flags.Enable64kbpages.set(true);
WddmMemoryManager memoryManager64k(true, wddm.get()); WddmMemoryManager memoryManager64k(true, false, wddm.get());
EXPECT_EQ(0, wddm->createAllocationResult.called); EXPECT_EQ(0, wddm->createAllocationResult.called);
GraphicsAllocation *galloc = memoryManager64k.allocateGraphicsMemoryInPreferredPool(true, nullptr, static_cast<size_t>(MemoryConstants::pageSize64k), GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY); GraphicsAllocation *galloc = memoryManager64k.allocateGraphicsMemoryInPreferredPool(true, nullptr, static_cast<size_t>(MemoryConstants::pageSize64k), GraphicsAllocation::AllocationType::BUFFER_HOST_MEMORY);
@@ -1997,7 +1997,7 @@ TEST_F(OsAgnosticMemoryManagerUsingWddmTest, givenEnabled64kbPagesWhenAllocation
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
EXPECT_TRUE(wddm->init()); EXPECT_TRUE(wddm->init());
DebugManager.flags.Enable64kbpages.set(true); DebugManager.flags.Enable64kbpages.set(true);
WddmMemoryManager memoryManager(true, wddm.get()); WddmMemoryManager memoryManager(true, false, wddm.get());
auto graphicsAllocation = memoryManager.allocateGraphicsMemory64kb(1, MemoryConstants::pageSize64k, false, false); auto graphicsAllocation = memoryManager.allocateGraphicsMemory64kb(1, MemoryConstants::pageSize64k, false, false);
EXPECT_NE(nullptr, graphicsAllocation); EXPECT_NE(nullptr, graphicsAllocation);
@@ -2026,14 +2026,14 @@ TEST_F(MockWddmMemoryManagerTest, givenWddmWhenallocateGraphicsMemory64kbThenLoc
TEST_F(MockWddmMemoryManagerTest, givenDefaultMemoryManagerWhenItIsCreatedThenAsyncDeleterEnabledIsTrue) { TEST_F(MockWddmMemoryManagerTest, givenDefaultMemoryManagerWhenItIsCreatedThenAsyncDeleterEnabledIsTrue) {
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
EXPECT_TRUE(memoryManager.isAsyncDeleterEnabled()); EXPECT_TRUE(memoryManager.isAsyncDeleterEnabled());
EXPECT_NE(nullptr, memoryManager.getDeferredDeleter()); EXPECT_NE(nullptr, memoryManager.getDeferredDeleter());
} }
TEST_F(MockWddmMemoryManagerTest, givenDefaultWddmMemoryManagerWhenItIsCreatedThenMemoryBudgetIsNotExhausted) { TEST_F(MockWddmMemoryManagerTest, givenDefaultWddmMemoryManagerWhenItIsCreatedThenMemoryBudgetIsNotExhausted) {
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
EXPECT_FALSE(memoryManager.isMemoryBudgetExhausted()); EXPECT_FALSE(memoryManager.isMemoryBudgetExhausted());
} }
@@ -2041,7 +2041,7 @@ TEST_F(MockWddmMemoryManagerTest, givenEnabledAsyncDeleterFlagWhenMemoryManagerI
bool defaultEnableDeferredDeleterFlag = DebugManager.flags.EnableDeferredDeleter.get(); bool defaultEnableDeferredDeleterFlag = DebugManager.flags.EnableDeferredDeleter.get();
DebugManager.flags.EnableDeferredDeleter.set(true); DebugManager.flags.EnableDeferredDeleter.set(true);
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
EXPECT_TRUE(memoryManager.isAsyncDeleterEnabled()); EXPECT_TRUE(memoryManager.isAsyncDeleterEnabled());
EXPECT_NE(nullptr, memoryManager.getDeferredDeleter()); EXPECT_NE(nullptr, memoryManager.getDeferredDeleter());
DebugManager.flags.EnableDeferredDeleter.set(defaultEnableDeferredDeleterFlag); DebugManager.flags.EnableDeferredDeleter.set(defaultEnableDeferredDeleterFlag);
@@ -2051,7 +2051,7 @@ TEST_F(MockWddmMemoryManagerTest, givenDisabledAsyncDeleterFlagWhenMemoryManager
bool defaultEnableDeferredDeleterFlag = DebugManager.flags.EnableDeferredDeleter.get(); bool defaultEnableDeferredDeleterFlag = DebugManager.flags.EnableDeferredDeleter.get();
DebugManager.flags.EnableDeferredDeleter.set(false); DebugManager.flags.EnableDeferredDeleter.set(false);
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
EXPECT_FALSE(memoryManager.isAsyncDeleterEnabled()); EXPECT_FALSE(memoryManager.isAsyncDeleterEnabled());
EXPECT_EQ(nullptr, memoryManager.getDeferredDeleter()); EXPECT_EQ(nullptr, memoryManager.getDeferredDeleter());
DebugManager.flags.EnableDeferredDeleter.set(defaultEnableDeferredDeleterFlag); DebugManager.flags.EnableDeferredDeleter.set(defaultEnableDeferredDeleterFlag);
@@ -2060,7 +2060,7 @@ TEST_F(MockWddmMemoryManagerTest, givenDisabledAsyncDeleterFlagWhenMemoryManager
TEST_F(MockWddmMemoryManagerTest, givenPageTableManagerWhenMapAuxGpuVaCalledThenUseWddmToMap) { TEST_F(MockWddmMemoryManagerTest, givenPageTableManagerWhenMapAuxGpuVaCalledThenUseWddmToMap) {
auto myWddm = std::make_unique<WddmMock>(); auto myWddm = std::make_unique<WddmMock>();
EXPECT_TRUE(myWddm->init()); EXPECT_TRUE(myWddm->init());
WddmMemoryManager memoryManager(false, myWddm.get()); WddmMemoryManager memoryManager(false, false, myWddm.get());
auto mockMngr = new NiceMock<MockGmmPageTableMngr>(); auto mockMngr = new NiceMock<MockGmmPageTableMngr>();
myWddm->resetPageTableManager(mockMngr); myWddm->resetPageTableManager(mockMngr);
@@ -2120,7 +2120,7 @@ TEST_F(MockWddmMemoryManagerTest, givenRenderCompressedAllocationWhenMappedGpuVa
TEST_F(MockWddmMemoryManagerTest, givenRenderCompressedAllocationWhenReleaseingThenUnmapAuxVa) { TEST_F(MockWddmMemoryManagerTest, givenRenderCompressedAllocationWhenReleaseingThenUnmapAuxVa) {
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
EXPECT_TRUE(wddm->init()); EXPECT_TRUE(wddm->init());
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
D3DGPU_VIRTUAL_ADDRESS gpuVa = 123; D3DGPU_VIRTUAL_ADDRESS gpuVa = 123;
auto mockMngr = new NiceMock<MockGmmPageTableMngr>(); auto mockMngr = new NiceMock<MockGmmPageTableMngr>();
@@ -2146,7 +2146,7 @@ TEST_F(MockWddmMemoryManagerTest, givenRenderCompressedAllocationWhenReleaseingT
TEST_F(MockWddmMemoryManagerTest, givenNonRenderCompressedAllocationWhenReleaseingThenDontUnmapAuxVa) { TEST_F(MockWddmMemoryManagerTest, givenNonRenderCompressedAllocationWhenReleaseingThenDontUnmapAuxVa) {
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
EXPECT_TRUE(wddm->init()); EXPECT_TRUE(wddm->init());
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
auto mockMngr = new NiceMock<MockGmmPageTableMngr>(); auto mockMngr = new NiceMock<MockGmmPageTableMngr>();
wddm->resetPageTableManager(mockMngr); wddm->resetPageTableManager(mockMngr);
@@ -2190,7 +2190,7 @@ TEST_F(MockWddmMemoryManagerTest, givenRenderCompressedFlagSetWhenInternalIsUnse
D3DGPU_VIRTUAL_ADDRESS gpuVa = 0; D3DGPU_VIRTUAL_ADDRESS gpuVa = 0;
auto wddm = std::make_unique<WddmMock>(); auto wddm = std::make_unique<WddmMock>();
EXPECT_TRUE(wddm->init()); EXPECT_TRUE(wddm->init());
WddmMemoryManager memoryManager(false, wddm.get()); WddmMemoryManager memoryManager(false, false, wddm.get());
auto mockMngr = new NiceMock<MockGmmPageTableMngr>(); auto mockMngr = new NiceMock<MockGmmPageTableMngr>();
wddm->resetPageTableManager(mockMngr); wddm->resetPageTableManager(mockMngr);