From 1783f5b7404db1ba8f2a3cbf3ff32d03b3ba302b Mon Sep 17 00:00:00 2001 From: "Dunajski, Bartosz" Date: Wed, 14 Dec 2022 15:47:56 +0000 Subject: [PATCH] Add missing makeResident call Signed-off-by: Dunajski, Bartosz --- .../unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp | 4 ++++ .../source/command_stream/command_stream_receiver_hw_base.inl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp index 44eeecca05..63a720b543 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp @@ -189,6 +189,7 @@ HWTEST2_F(AppendMemoryCopy, givenAsyncImmediateCommandListWhenAppendingMemoryCop DebugManagerStateRestore restore; NEO::DebugManager.flags.EnableFlushTaskSubmission.set(1); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); + ultCsr->storeMakeResidentAllocations = true; auto cmdQueue = std::make_unique>(); cmdQueue->csr = ultCsr; @@ -220,6 +221,7 @@ HWTEST2_F(AppendMemoryCopy, givenAsyncImmediateCommandListWhenAppendingMemoryCop ASSERT_EQ(ZE_RESULT_SUCCESS, commandList->appendMemoryCopy(dstPtr, srcPtr, 8, nullptr, 0, nullptr)); EXPECT_EQ(expectedSize, ultCsr->getCS(0).getUsed()); + EXPECT_TRUE(ultCsr->isMadeResident(commandList->commandContainer.getCommandStream()->getGraphicsAllocation())); size_t offset = 0; if constexpr (FamilyType::isUsingMiMemFence) { @@ -282,6 +284,7 @@ HWTEST2_F(AppendMemoryCopy, givenSyncImmediateCommandListWhenAppendingMemoryCopy DebugManagerStateRestore restore; NEO::DebugManager.flags.EnableFlushTaskSubmission.set(1); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); + ultCsr->storeMakeResidentAllocations = true; auto cmdQueue = std::make_unique>(); cmdQueue->csr = ultCsr; @@ -313,6 +316,7 @@ HWTEST2_F(AppendMemoryCopy, givenSyncImmediateCommandListWhenAppendingMemoryCopy ASSERT_EQ(ZE_RESULT_SUCCESS, commandList->appendMemoryCopy(dstPtr, srcPtr, 8, nullptr, 0, nullptr)); EXPECT_EQ(expectedSize, ultCsr->getCS(0).getUsed()); + EXPECT_TRUE(ultCsr->isMadeResident(commandList->commandContainer.getCommandStream()->getGraphicsAllocation())); size_t offset = 0; if constexpr (FamilyType::isUsingMiMemFence) { diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl index 6e9580df18..7b2b0d24d3 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl @@ -210,6 +210,8 @@ CompletionStamp CommandStreamReceiverHw::flushBcsTask(LinearStream &c makeResident(*getTagAllocation()); } + makeResident(*commandStreamTask.getGraphicsAllocation()); + bool submitCSR = (commandStreamStartCSR != commandStreamCSR.getUsed()); void *bbEndLocation = nullptr;