Allow Device creating multiple CSRs [3/n]

Add CSR from Device to CommandQueue

Change-Id: Iaccf3c73d25e357242837677777d0513e81f520e
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2018-11-22 13:57:10 +01:00
committed by sys_ocldev
parent fbf0d44fff
commit 3ad33bf1b8
72 changed files with 239 additions and 242 deletions

View File

@@ -154,7 +154,7 @@ TEST_F(EventTests, blockedUserEventPassedToEnqueueNdRangeWithoutReturnEventIsNot
cl_event userEvent = (cl_event)&uEvent;
cl_event *eventWaitList = &userEvent;
auto &csr = pCmdQ->getDevice().getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto taskCount = csr.peekTaskCount();
//call NDR
@@ -187,7 +187,7 @@ TEST_F(EventTests, blockedUserEventPassedToEnqueueNdRangeWithReturnEventIsNotSub
cl_event retEvent = nullptr;
cl_event *eventWaitList = &userEvent;
auto &csr = pCmdQ->getDevice().getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto taskCount = csr.peekTaskCount();
//call NDR
@@ -432,8 +432,7 @@ HWTEST_F(EventTests, userEventObtainsProperTaskLevelAfterSignaling) {
TEST_F(EventTests, normalEventsBasingOnUserEventHasProperTaskLevel) {
UserEvent uEvent(context);
auto &device = this->pCmdQ->getDevice();
auto &csr = device.getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto taskLevel = csr.peekTaskLevel();
cl_event retEvent = nullptr;
@@ -504,7 +503,7 @@ TEST_F(EventTests, enqueueWithAbortedUserEventDoesntFlushToCSR) {
int sizeOfWaitList = sizeof(eventWaitList) / sizeof(cl_event);
cl_event retEvent = nullptr;
auto &csr = pCmdQ->getDevice().getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto taskCount = csr.peekTaskCount();
//call NDR
@@ -537,7 +536,7 @@ TEST_F(EventTests, childEventDestructorDoesntProcessBlockedCommandsWhenParentEve
int sizeOfWaitList = sizeof(eventWaitList) / sizeof(cl_event);
cl_event retEvent = nullptr;
auto &csr = pCmdQ->getDevice().getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto taskCount = csr.peekTaskCount();
//call NDR
@@ -619,7 +618,7 @@ TEST_F(EventTests, waitForEventDependingOnAbortedUserEventReturnsFailureTwoInput
TEST_F(EventTests, finishReturnsSuccessAfterQueueIsAborted) {
UserEvent uEvent(context);
auto &csr = pDevice->getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto taskLevel = csr.peekTaskLevel();
cl_event eventWaitList[] = {&uEvent};
@@ -669,7 +668,7 @@ TEST_F(EventTests, userEventDependantCommandPacketContainsValidCommandStream) {
TEST_F(EventTests, unblockingEventSendsBlockedPackets) {
UserEvent uEvent(context);
auto &csr = pCmdQ->getDevice().getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
cl_event eventWaitList[] = {&uEvent};
int sizeOfWaitList = sizeof(eventWaitList) / sizeof(cl_event);
@@ -891,7 +890,7 @@ TEST_F(EventTests, enqueueReadImageBlockedOnUserEvent) {
}
TEST_F(EventTests, waitForEventsDestroysTemporaryAllocations) {
auto &csr = pCmdQ->getDevice().getCommandStreamReceiver();
auto &csr = pCmdQ->getCommandStreamReceiver();
auto memoryManager = pCmdQ->getDevice().getMemoryManager();
EXPECT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());
@@ -1058,7 +1057,7 @@ TEST_F(EventTests, givenUserEventWhenSetStatusIsDoneThenDeviceMutextisAcquired)
struct mockedEvent : public UserEvent {
using UserEvent::UserEvent;
bool setStatus(cl_int status) override {
auto commandStreamReceiverOwnership = this->getContext()->getDevice(0)->getCommandStreamReceiver().obtainUniqueOwnership();
auto commandStreamReceiverOwnership = ctx->getDevice(0)->getEngine(0).commandStreamReceiver->obtainUniqueOwnership();
mutexProperlyAcquired = commandStreamReceiverOwnership.owns_lock();
return true;
}