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

Command stream receiver: handle flush method failure when flushing BCS task

Browse Source 
Related-To: NEO-7412
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-11-04 17:02:46 +00:00
committed by Compute-Runtime-Automation
parent 27d042107a
commit 33e1b3a717
5 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/source/command_stream/command_stream_receiver.cpp
View File

@@ -928,4 +928,15 @@ LogicalStateHelper *CommandStreamReceiver::getLogicalStateHelper() const {
return logicalStateHelper.get();
}
uint32_t CompletionStamp::getTaskCountFromSubmissionStatusError(SubmissionStatus status) {
switch (status) {
case SubmissionStatus::OUT_OF_HOST_MEMORY:
return CompletionStamp::outOfHostMemory;
case SubmissionStatus::OUT_OF_MEMORY:
return CompletionStamp::outOfDeviceMemory;
default:
return 0;
}
}
} // namespace NEO

5
shared/source/command_stream/command_stream_receiver_hw_base.inl
View File

@@ -1164,7 +1164,10 @@ uint32_t CommandStreamReceiverHw<GfxFamily>::flushBcsTask(const BlitPropertiesCo
commandStream.getGraphicsAllocation()->updateTaskCount(newTaskCount, this->osContext->getContextId());
commandStream.getGraphicsAllocation()->updateResidencyTaskCount(newTaskCount, this->osContext->getContextId());
flush(batchBuffer, getResidencyAllocations());
auto flushSubmissionStatus = flush(batchBuffer, getResidencyAllocations());
if (flushSubmissionStatus != SubmissionStatus::SUCCESS) {
return CompletionStamp::getTaskCountFromSubmissionStatusError(flushSubmissionStatus);
}
makeSurfacePackNonResident(getResidencyAllocations(), true);
if (updateTag) {

3
shared/source/helpers/completion_stamp.h
View File

@@ -11,7 +11,10 @@
namespace NEO {
using FlushStamp = uint64_t;
enum class SubmissionStatus : uint32_t;
struct CompletionStamp {
static uint32_t getTaskCountFromSubmissionStatusError(SubmissionStatus submissionStatus);
uint32_t taskCount;
uint32_t taskLevel;
FlushStamp flushStamp;

4
shared/test/common/libult/ult_command_stream_receiver.h
View File

@@ -163,6 +163,9 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, publ
}
NEO::SubmissionStatus flush(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency) override {
if (flushReturnValue) {
return *flushReturnValue;
}
if (recordFlusheBatchBuffer) {
latestFlushedBatchBuffer = batchBuffer;
}
@@ -393,6 +396,7 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, publ
std::optional<WaitStatus> waitForTaskCountWithKmdNotifyFallbackReturnValue{};
bool callBaseFlushBcsTask{true};
uint32_t flushBcsTaskReturnValue{};
std::optional<SubmissionStatus> flushReturnValue{};
};
} // namespace NEO

24
shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp
View File

@@ -2321,3 +2321,27 @@ HWTEST_F(CommandStreamReceiverHwTest, givenSshHeapNotProvidedWhenFlushTaskPerfor
EXPECT_FALSE(scratchController->setRequiredScratchSpaceCalled);
}
TEST(CommandStreamReceiverSimpleTest, whenTranslatingSubmissionStatusToTaskCountValueThenProperValueIsReturned) {
EXPECT_EQ(0u, CompletionStamp::getTaskCountFromSubmissionStatusError(SubmissionStatus::SUCCESS));
EXPECT_EQ(CompletionStamp::outOfHostMemory, CompletionStamp::getTaskCountFromSubmissionStatusError(SubmissionStatus::OUT_OF_HOST_MEMORY));
EXPECT_EQ(CompletionStamp::outOfDeviceMemory, CompletionStamp::getTaskCountFromSubmissionStatusError(SubmissionStatus::OUT_OF_MEMORY));
}
HWTEST_F(CommandStreamReceiverHwTest, givenFailureOnFlushWhenFlushingBcsTaskThenErrorIsPropagated) {
auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
auto blitProperties = BlitProperties::constructPropertiesForReadWrite(BlitterConstants::BlitDirection::BufferToHostPtr,
commandStreamReceiver, commandStreamReceiver.getTagAllocation(), nullptr,
commandStreamReceiver.getTagAllocation()->getUnderlyingBuffer(),
commandStreamReceiver.getTagAllocation()->getGpuAddress(), 0,
0, 0, 0, 0, 0, 0, 0);
BlitPropertiesContainer container;
container.push_back(blitProperties);
commandStreamReceiver.flushReturnValue = SubmissionStatus::OUT_OF_HOST_MEMORY;
EXPECT_EQ(CompletionStamp::outOfHostMemory, commandStreamReceiver.flushBcsTask(container, true, false, *pDevice));
commandStreamReceiver.flushReturnValue = SubmissionStatus::OUT_OF_MEMORY;
EXPECT_EQ(CompletionStamp::outOfDeviceMemory, commandStreamReceiver.flushBcsTask(container, true, false, *pDevice));
}