Revert "[1/n] Use GfxPartition for 32-bit allocations - WddmMemoryManager"

This reverts commit 2bb451e76d922861673e052f5f889658ac7db15f.

Change-Id: I1deada59a291a96ef88c8b9b4f2b28861ad27347
Signed-off-by: Venevtsev, Igor <igor.venevtsev@intel.com>
This commit is contained in:
Venevtsev, Igor
2019-04-12 15:21:42 +02:00
committed by sys_ocldev
parent 54c4678cb5
commit 3a008fafc6
10 changed files with 44 additions and 47 deletions

View File

@ -69,9 +69,6 @@ void testGfxPartition(uint64_t gpuAddressSpace) {
continue;
}
EXPECT_GT(gfxPartition.getHeapMinimalAddress(heap), gfxPartition.getHeapBase(heap));
EXPECT_EQ(gfxPartition.getHeapMinimalAddress(heap), gfxPartition.getHeapBase(heap) + GfxPartition::heapGranularity);
auto ptrBig = gfxPartition.heapAllocate(heap, sizeBig);
EXPECT_NE(ptrBig, 0ull);
EXPECT_LT(gfxPartition.getHeapBase(heap), ptrBig);

View File

@ -336,14 +336,6 @@ TEST_F(MemoryAllocatorTest, GivenPointerAndSizeWhenAskedToCreateGrahicsAllocatio
EXPECT_NE(&allocation->fragmentsStorage, &handleStorage);
}
TEST_F(MemoryAllocatorTest, defaultInternalHeapBaseIsInitialized) {
EXPECT_LE(0ull, memoryManager->MemoryManager::getInternalHeapBaseAddress());
}
TEST_F(MemoryAllocatorTest, defaultExternalHeapBaseIsNotNull) {
EXPECT_LT(0ull, memoryManager->getExternalHeapBaseAddress());
}
TEST_F(MemoryAllocatorTest, givenMemoryManagerWhensetForce32BitAllocationsIsCalledWithTrueMutlipleTimesThenAllocatorIsReused) {
memoryManager->setForce32BitAllocations(true);
EXPECT_NE(nullptr, memoryManager->allocator32Bit.get());