Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert async Event destruction

Browse Source 
This reverts f9a5f8a86e and
f89c731a11

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
2022-05-12 12:13:48 +00:00
committed by Compute-Runtime-Automation
parent 268393d776
commit 83a9037640
7 changed files with 6 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
opencl/test/unit_test/event/async_events_handler_tests.cpp
View File

@ -18,7 +18,6 @@
#include "opencl/test/unit_test/mocks/mock_async_event_handler.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_event.h"
using namespace NEO;
using namespace ::testing;
@ -55,10 +54,6 @@ class AsyncEventsHandlerTests : public ::testing::Test {
++(*(int *)data);
}
void setTagValue(uint32_t newValue) {
*(commandQueue->getGpgpuCommandStreamReceiver().getTagAddress()) = newValue;
}
void SetUp() override {
dbgRestore.reset(new DebugManagerStateRestore());
DebugManager.flags.EnableAsyncEventsHandler.set(false);
@ -67,7 +62,7 @@ class AsyncEventsHandlerTests : public ::testing::Test {
commandQueue = make_releaseable<MockCommandQueue>(context.get(), context->getDevice(0), nullptr, false);
setTagValue(0);
*(commandQueue->getGpgpuCommandStreamReceiver().getTagAddress()) = 0;
event1 = make_releaseable<MyEvent>(context.get(), commandQueue.get(), CL_COMMAND_BARRIER, CompletionStamp::notReady, CompletionStamp::notReady);
event2 = make_releaseable<MyEvent>(context.get(), commandQueue.get(), CL_COMMAND_BARRIER, CompletionStamp::notReady, CompletionStamp::notReady);
@ -316,75 +311,6 @@ TEST_F(AsyncEventsHandlerTests, givenUserEventWhenCallbackIsAddedThenDontRegiste
userEvent.decRefInternal();
}
TEST_F(AsyncEventsHandlerTests, givenNotReadyEventWhenReleasingThenRegisterAndTrackUntilCompleted) {
DebugManager.flags.EnableAsyncEventsHandler.set(true);
auto myHandler = new MockHandler(false);
context->getAsyncEventsHandlerUniquePtr().reset(myHandler);
constexpr uint32_t eventTaskCount = 1;
setTagValue(0);
auto mockEvent = new MockEvent<Event>(context.get(), commandQueue.get(), CL_COMMAND_NDRANGE_KERNEL, 0, eventTaskCount);
EXPECT_TRUE(myHandler->peekIsRegisterListEmpty());
clReleaseEvent(mockEvent);
EXPECT_FALSE(myHandler->peekIsRegisterListEmpty());
EXPECT_TRUE(myHandler->peekIsListEmpty());
myHandler->process();
EXPECT_FALSE(myHandler->peekIsListEmpty());
setTagValue(eventTaskCount);
myHandler->process();
EXPECT_TRUE(myHandler->peekIsRegisterListEmpty());
EXPECT_TRUE(myHandler->peekIsListEmpty());
}
TEST_F(AsyncEventsHandlerTests, givenTerminatedEventWhenReleasingThenDontRegister) {
DebugManager.flags.EnableAsyncEventsHandler.set(true);
auto myHandler = new MockHandler(false);
context->getAsyncEventsHandlerUniquePtr().reset(myHandler);
constexpr uint32_t eventTaskCount = 1;
setTagValue(0);
auto mockEvent = new MockEvent<Event>(context.get(), commandQueue.get(), CL_COMMAND_NDRANGE_KERNEL, 0, eventTaskCount);
mockEvent->setStatus(-1);
clReleaseEvent(mockEvent);
EXPECT_TRUE(myHandler->peekIsRegisterListEmpty());
}
TEST_F(AsyncEventsHandlerTests, givenNotReadyEventWithRefCountWhenReleasingThenDontRegister) {
DebugManager.flags.EnableAsyncEventsHandler.set(true);
auto myHandler = new MockHandler(false);
context->getAsyncEventsHandlerUniquePtr().reset(myHandler);
constexpr uint32_t eventTaskCount = 1;
setTagValue(0);
auto mockEvent = new MockEvent<Event>(context.get(), commandQueue.get(), CL_COMMAND_NDRANGE_KERNEL, 0, eventTaskCount);
mockEvent->incRefInternal();
clReleaseEvent(mockEvent);
EXPECT_TRUE(myHandler->peekIsRegisterListEmpty());
setTagValue(eventTaskCount);
mockEvent->decRefInternal();
}
TEST_F(AsyncEventsHandlerTests, givenEventWithoutCommandQueueWhenReleasingThenDontRegister) {
DebugManager.flags.EnableAsyncEventsHandler.set(true);
auto myHandler = new MockHandler(false);
context->getAsyncEventsHandlerUniquePtr().reset(myHandler);
auto userEvent = new UserEvent(context.get());
userEvent->setStatus(CL_QUEUED);
clReleaseEvent(userEvent);
EXPECT_TRUE(myHandler->peekIsRegisterListEmpty());
}
TEST_F(AsyncEventsHandlerTests, givenRegistredEventsWhenProcessIsCalledThenReturnCandidateWithLowestTaskCount) {
int event1Counter(0), event2Counter(0), event3Counter(0);