Decouple aub stream memoryFree from makeNonResident

smilczar · smilczar · commit 80fa9d0260c1 · 2018-11-29T08:28:21.000-08:00
Change-Id: Ic4614441aff131356ce3ec03330d7dc42b5b0ecb
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.inl b/runtime/command_stream/aub_command_stream_receiver_hw.inl
@@ -769,9 +769,6 @@ void AUBCommandStreamReceiverHw<GfxFamily>::processResidency(ResidencyContainer
 template <typename GfxFamily>
 void AUBCommandStreamReceiverHw<GfxFamily>::makeNonResident(GraphicsAllocation &gfxAllocation) {
     if (gfxAllocation.isResident(this->deviceIndex)) {
-        if (hardwareContext) {
-            hardwareContext->freeMemory(gfxAllocation.getGpuAddress(), gfxAllocation.getUnderlyingBufferSize());
-        }
         this->getEvictionAllocations().push_back(&gfxAllocation);
         gfxAllocation.resetResidencyTaskCount(this->deviceIndex);
     }
diff --git a/unit_tests/command_stream/aub_file_stream_tests.cpp b/unit_tests/command_stream/aub_file_stream_tests.cpp
@@ -177,10 +177,8 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenMakeResidentIsCall
     MockGraphicsAllocation allocation(reinterpret_cast<void *>(0x1000), 0x1000);
     ResidencyContainer allocationsForResidency = {&allocation};
     aubCsr->processResidency(allocationsForResidency);
-    aubCsr->makeNonResident(allocation);
 
     EXPECT_TRUE(mockHardwareContext->writeMemoryCalled);
-    EXPECT_TRUE(mockHardwareContext->freeMemoryCalled);
 }
 
 HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenFlushIsCalledThenFileStreamShouldBeFlushed) {

Original file line number	Diff line number	Diff line change
`@@ -177,10 +177,8 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenMakeResidentIsCall`
`177`	`177`	`MockGraphicsAllocation allocation(reinterpret_cast<void *>(0x1000), 0x1000);`
`178`	`178`	`ResidencyContainer allocationsForResidency = {&allocation};`
`179`	`179`	`aubCsr->processResidency(allocationsForResidency);`
`180`		`- aubCsr->makeNonResident(allocation);`
`181`	`180`
`182`	`181`	`EXPECT_TRUE(mockHardwareContext->writeMemoryCalled);`
`183`		`- EXPECT_TRUE(mockHardwareContext->freeMemoryCalled);`
`184`	`182`	`}`
`185`	`183`
`186`	`184`	`HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenFlushIsCalledThenFileStreamShouldBeFlushed) {`