Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add finish before command queue is released

Browse Source 
Related-To: NEO-5279

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2022-07-19 19:32:15 +00:00
committed by Compute-Runtime-Automation
parent 4d35a76931
commit 50fae92ea2
7 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_queue/command_queue.h
View File

@ -358,6 +358,8 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
bool isTextureCacheFlushNeeded(uint32_t commandType) const; bool isTextureCacheFlushNeeded(uint32_t commandType) const;
void finishBeforeRelease();
protected: protected:
void *enqueueReadMemObjForMap(TransferProperties &transferProperties, EventsRequest &eventsRequest, cl_int &errcodeRet); void *enqueueReadMemObjForMap(TransferProperties &transferProperties, EventsRequest &eventsRequest, cl_int &errcodeRet);
cl_int enqueueWriteMemObjForUnmap(MemObj *memObj, void *mappedPtr, EventsRequest &eventsRequest); cl_int enqueueWriteMemObjForUnmap(MemObj *memObj, void *mappedPtr, EventsRequest &eventsRequest);

4
opencl/source/dll/command_queue_dll.cpp
View File

@ -17,4 +17,8 @@ bool CommandQueue::isTimestampWaitEnabled() {
return true; return true;
} }
void CommandQueue::finishBeforeRelease() {
this->finish();
}
} // namespace NEO } // namespace NEO

1
opencl/source/helpers/queue_helpers.h
View File

@ -48,6 +48,7 @@ inline void releaseQueue(cl_command_queue commandQueue, cl_int &retVal) {
if (queue) { if (queue) {
queue->flush(); queue->flush();
releaseVirtualEvent(*queue); releaseVirtualEvent(*queue);
queue->finishBeforeRelease();
queue->release(); queue->release();
retVal = CL_SUCCESS; retVal = CL_SUCCESS;
} }

11
opencl/test/unit_test/command_queue/command_queue_tests.cpp
View File

@ -1531,6 +1531,17 @@ TEST(CommandQueueDestructorTest, whenCommandQueueIsDestroyedThenDestroysTimestam
EXPECT_EQ(1, context->getRefInternalCount()); // NOLINT(clang-analyzer-cplusplus.NewDelete) EXPECT_EQ(1, context->getRefInternalCount()); // NOLINT(clang-analyzer-cplusplus.NewDelete)
} }
TEST(CommandQueueDestructorTest, GivenCommandQueueWhenDeletedThenFinishIsCalled) {
auto context = std::make_unique<MockContext>();
EXPECT_EQ(1, context->getRefInternalCount());
auto queue = new MockCommandQueue(context.get(), context->getDevice(0), nullptr, false);
cl_int ret = 0;
bool finishCalled = false;
queue->finishCalled = &finishCalled;
releaseQueue(queue, ret);
EXPECT_TRUE(finishCalled); // NOLINT
}
TEST(CommandQueuePropertiesTests, whenGetEngineIsCalledThenQueueEngineIsReturned) { TEST(CommandQueuePropertiesTests, whenGetEngineIsCalledThenQueueEngineIsReturned) {
MockCommandQueue queue; MockCommandQueue queue;
EngineControl engineControl; EngineControl engineControl;

3
opencl/test/unit_test/helpers/queue_helpers_tests.cpp
View File

@ -16,7 +16,8 @@ using namespace NEO;
TEST(QueueHelpersTest, givenCommandQueueWithoutVirtualEventWhenReleaseQueueIsCalledThenCmdQInternalRefCountIsNotDecremented) { TEST(QueueHelpersTest, givenCommandQueueWithoutVirtualEventWhenReleaseQueueIsCalledThenCmdQInternalRefCountIsNotDecremented) {
cl_int retVal = CL_SUCCESS; cl_int retVal = CL_SUCCESS;
MockCommandQueue *cmdQ = new MockCommandQueue; MockContext context;
MockCommandQueue *cmdQ = new MockCommandQueue(&context, context.getDevice(0), 0, false);
EXPECT_EQ(1, cmdQ->getRefInternalCount()); EXPECT_EQ(1, cmdQ->getRefInternalCount());
EXPECT_EQ(1, cmdQ->getRefInternalCount()); EXPECT_EQ(1, cmdQ->getRefInternalCount());

5
opencl/test/unit_test/libult/command_queue_ult.cpp
View File

@ -19,4 +19,9 @@ bool CommandQueue::isTimestampWaitEnabled() {
return ultHwConfig.useWaitForTimestamps; return ultHwConfig.useWaitForTimestamps;
} }
void CommandQueue::finishBeforeRelease() {
*this->getHwTagAddress() = this->taskCount;
this->finish();
}
} // namespace NEO } // namespace NEO

8
opencl/test/unit_test/mocks/mock_command_queue.h
View File

@ -206,7 +206,12 @@ class MockCommandQueue : public CommandQueue {
cl_int enqueueResourceBarrier(BarrierCommand *resourceBarrier, cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_int enqueueResourceBarrier(BarrierCommand *resourceBarrier, cl_uint numEventsInWaitList, const cl_event *eventWaitList,
cl_event *event) override { return CL_SUCCESS; } cl_event *event) override { return CL_SUCCESS; }
cl_int finish() override { return CL_SUCCESS; } cl_int finish() override {
if (finishCalled) {
*finishCalled = true;
}
return CL_SUCCESS;
}
cl_int flush() override { return CL_SUCCESS; } cl_int flush() override { return CL_SUCCESS; }
@ -227,6 +232,7 @@ class MockCommandQueue : public CommandQueue {
std::atomic<uint32_t> latestTaskCountWaited{std::numeric_limits<uint32_t>::max()}; std::atomic<uint32_t> latestTaskCountWaited{std::numeric_limits<uint32_t>::max()};
std::optional<WaitStatus> waitUntilCompleteReturnValue{}; std::optional<WaitStatus> waitUntilCompleteReturnValue{};
int waitUntilCompleteCalledCount{0}; int waitUntilCompleteCalledCount{0};
bool *finishCalled = nullptr;
}; };
template <typename GfxFamily> template <typename GfxFamily>