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

Delegate all MemoryManager::getResidencyAllocations() calls through CSR

Browse Source 
Change-Id: I9cfbfd86d39b5341598ff2bd8883e13605c58b72
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2018-09-12 09:47:01 +02:00
committed by sys_ocldev
parent 888b067adc
commit fafde2ec15
12 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unit_tests/os_interface/linux/drm_command_stream_tests.cpp
View File

@@ -1640,11 +1640,11 @@ TEST_F(DrmCommandStreamLeaksTest, MakeResidentClearResidencyAllocationsInMemoryM
csr->makeResident(*allocation1);
csr->makeResident(*allocation2);
EXPECT_NE(0u, mm->getResidencyAllocations().size());
EXPECT_NE(0u, csr->getResidencyAllocations().size());
csr->processResidency(nullptr, *device->getOsContext());
csr->makeSurfacePackNonResident(nullptr);
EXPECT_EQ(0u, mm->getResidencyAllocations().size());
EXPECT_EQ(0u, csr->getResidencyAllocations().size());
mm->freeGraphicsMemory(allocation1);
mm->freeGraphicsMemory(allocation2);
@@ -1658,12 +1658,12 @@ TEST_F(DrmCommandStreamLeaksTest, givenMultipleMakeResidentWhenMakeNonResidentIs
csr->makeResident(*allocation1);
csr->makeResident(*allocation1);
EXPECT_NE(0u, mm->getResidencyAllocations().size());
EXPECT_NE(0u, csr->getResidencyAllocations().size());
csr->processResidency(nullptr, *device->getOsContext());
csr->makeSurfacePackNonResident(nullptr);
EXPECT_EQ(0u, mm->getResidencyAllocations().size());
EXPECT_EQ(0u, csr->getResidencyAllocations().size());
EXPECT_FALSE(allocation1->isResident());
mm->freeGraphicsMemory(allocation1);

22
unit_tests/os_interface/windows/device_command_stream_tests.cpp
View File

@@ -444,8 +444,8 @@ TEST_F(WddmCommandStreamTest, givenWddmWithKmDafEnabledWhenFlushIsCalledWithResi
linearStreamAllocation->setAllocationType(GraphicsAllocation::AllocationType::LINEAR_STREAM);
csr->makeResident(*linearStreamAllocation);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(linearStreamAllocation, memManager->getResidencyAllocations()[0]);
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
EXPECT_EQ(linearStreamAllocation, csr->getResidencyAllocations()[0]);
wddm->setKmDafEnabled(true);
auto flushStamp = csr->flush(batchBuffer, EngineType::ENGINE_RCS, &csr->getResidencyAllocations(), *device->getOsContext());
@@ -532,8 +532,8 @@ TEST_F(WddmCommandStreamTest, makeResident) {
csr->makeResident(*commandBuffer);
EXPECT_EQ(0u, wddm->makeResidentResult.called);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(commandBuffer, memManager->getResidencyAllocations()[0]);
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
EXPECT_EQ(commandBuffer, csr->getResidencyAllocations()[0]);
memManager->freeGraphicsMemory(commandBuffer);
}
@@ -599,8 +599,8 @@ TEST_F(WddmCommandStreamTest, makeResidentNonResidentMemObj) {
csr->makeResident(*buffer->getGraphicsAllocation());
EXPECT_EQ(0u, wddm->makeResidentResult.called);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(gfxAllocation, memManager->getResidencyAllocations()[0]);
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
EXPECT_EQ(gfxAllocation, csr->getResidencyAllocations()[0]);
csr->makeNonResident(*buffer->getGraphicsAllocation());
EXPECT_EQ(gfxAllocation, memManager->getEvictionAllocations()[0]);
@@ -617,7 +617,7 @@ TEST_F(WddmCommandStreamTest, createAllocationAndMakeResident) {
ASSERT_NE(nullptr, gfxAllocation);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
EXPECT_EQ(hostPtr, gfxAllocation->getUnderlyingBuffer());
}
@@ -632,7 +632,7 @@ TEST_F(WddmCommandStreamTest, givenHostPtrWhenPtrBelowRestrictionThenCreateAlloc
ASSERT_NE(nullptr, gfxAllocation);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
EXPECT_EQ(hostPtr, gfxAllocation->getUnderlyingBuffer());
EXPECT_EQ(expectedReserve, gfxAllocation->getReservedAddress());
@@ -689,7 +689,7 @@ TEST_F(WddmCommandStreamMockGdiTest, FlushCallsWddmMakeResidentForResidencyAlloc
csr->makeResident(*commandBuffer);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
gdi->getMakeResidentArg().NumAllocations = 0;
@@ -708,7 +708,7 @@ TEST_F(WddmCommandStreamMockGdiTest, makeResidentClearsResidencyAllocations) {
csr->makeResident(*commandBuffer);
EXPECT_EQ(1u, memManager->getResidencyAllocations().size());
EXPECT_EQ(1u, csr->getResidencyAllocations().size());
EXPECT_EQ(0u, memManager->getEvictionAllocations().size());
EXPECT_EQ(trimListUnusedPosition, ((WddmAllocation *)commandBuffer)->getTrimCandidateListPosition());
@@ -717,7 +717,7 @@ TEST_F(WddmCommandStreamMockGdiTest, makeResidentClearsResidencyAllocations) {
csr->makeSurfacePackNonResident(nullptr);
EXPECT_EQ(0u, memManager->getResidencyAllocations().size());
EXPECT_EQ(0u, csr->getResidencyAllocations().size());
EXPECT_EQ(0u, memManager->getEvictionAllocations().size());
EXPECT_EQ(0u, ((WddmAllocation *)commandBuffer)->getTrimCandidateListPosition());