intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-28 00:03:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename engine member in CommandQueue

Browse Source 
Change-Id: I01516616c164f19afbcd62d39a2a42d04ff768c9
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2019-07-15 14:28:09 +02:00
committed by sys_ocldev
parent fe26b0b406
commit 89d1878cd6
98 changed files with 368 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/command_queue/command_queue_hw_tests.cpp
View File

@@ -682,7 +682,7 @@ HWTEST_F(CommandQueueHwTest, GivenEventThatIsNotCompletedWhenFinishIsCalledAndIt
auto ev = new Event(this->pCmdQ, CL_COMMAND_COPY_BUFFER, 3, Event::eventNotReady + 1);
clSetEventCallback(ev, CL_COMPLETE, ClbFuncTempStruct::ClbFuncT, &Value);
auto &csr = this->pCmdQ->getCommandStreamReceiver();
auto &csr = this->pCmdQ->getGpgpuCommandStreamReceiver();
EXPECT_GT(3u, csr.peekTaskCount());
*csr.getTagAddress() = Event::eventNotReady + 1;
ret = clFinish(this->pCmdQ);

20
unit_tests/command_queue/command_queue_tests.cpp
View File

@@ -204,7 +204,7 @@ TEST(CommandQueue, givenDeviceWhenCreatingCommandQueueThenPickCsrFromDefaultEngi
CommandQueue cmdQ(nullptr, mockDevice.get(), 0);
auto defaultCsr = mockDevice->getDefaultEngine().commandStreamReceiver;
EXPECT_EQ(defaultCsr, &cmdQ.getCommandStreamReceiver());
EXPECT_EQ(defaultCsr, &cmdQ.getGpgpuCommandStreamReceiver());
}
TEST(CommandQueue, givenCmdQueueBlockedByReadyVirtualEventWhenUnblockingThenUpdateFlushTaskFromEvent) {
@@ -334,7 +334,7 @@ TEST_F(CommandQueueCommandStreamTest, givenCommandStreamReceiverWithReusableAllo
auto memoryManager = pDevice->getMemoryManager();
size_t requiredSize = alignUp(100 + CSRequirements::minCommandQueueCommandStreamSize + CSRequirements::csOverfetchSize, MemoryConstants::pageSize64k);
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties({requiredSize, GraphicsAllocation::AllocationType::COMMAND_BUFFER});
auto &commandStreamReceiver = cmdQ.getCommandStreamReceiver();
auto &commandStreamReceiver = cmdQ.getGpgpuCommandStreamReceiver();
commandStreamReceiver.getInternalAllocationStorage()->storeAllocation(std::unique_ptr<GraphicsAllocation>(allocation), REUSABLE_ALLOCATION);
EXPECT_FALSE(commandStreamReceiver.getAllocationsForReuse().peekIsEmpty());
@@ -463,7 +463,7 @@ HWTEST_P(CommandQueueIndirectHeapTest, IndirectHeapContainsAtLeast64KB) {
auto &indirectHeap = cmdQ.getIndirectHeap(this->GetParam(), sizeof(uint32_t));
if (this->GetParam() == IndirectHeap::SURFACE_STATE) {
size_t expectedSshUse = cmdQ.getCommandStreamReceiver().defaultSshSize - MemoryConstants::pageSize - UnitTestHelper<FamilyType>::getDefaultSshUsage();
size_t expectedSshUse = cmdQ.getGpgpuCommandStreamReceiver().defaultSshSize - MemoryConstants::pageSize - UnitTestHelper<FamilyType>::getDefaultSshUsage();
EXPECT_EQ(expectedSshUse, indirectHeap.getAvailableSpace());
} else {
EXPECT_EQ(64 * KB, indirectHeap.getAvailableSpace());
@@ -491,7 +491,7 @@ TEST_P(CommandQueueIndirectHeapTest, getIndirectHeapCanRecycle) {
ASSERT_NE(nullptr, &indirectHeap);
if (this->GetParam() == IndirectHeap::SURFACE_STATE) {
//no matter what SSH is always capped
EXPECT_EQ(cmdQ.getCommandStreamReceiver().defaultSshSize - MemoryConstants::pageSize,
EXPECT_EQ(cmdQ.getGpgpuCommandStreamReceiver().defaultSshSize - MemoryConstants::pageSize,
indirectHeap.getMaxAvailableSpace());
} else {
EXPECT_LE(requiredSize, indirectHeap.getMaxAvailableSpace());
@@ -525,7 +525,7 @@ TEST_P(CommandQueueIndirectHeapTest, givenCommandStreamReceiverWithReusableAlloc
GraphicsAllocation *allocation = nullptr;
auto &commandStreamReceiver = cmdQ.getCommandStreamReceiver();
auto &commandStreamReceiver = cmdQ.getGpgpuCommandStreamReceiver();
auto allocationType = GraphicsAllocation::AllocationType::LINEAR_STREAM;
if (this->GetParam() == IndirectHeap::INDIRECT_OBJECT) {
allocationType = GraphicsAllocation::AllocationType::INTERNAL_HEAP;
@@ -968,7 +968,7 @@ HWTEST_F(CommandQueueCommandStreamTest, givenDebugKernelWhenSetupDebugSurfaceIsC
kernel->setSshLocal(nullptr, sizeof(RENDER_SURFACE_STATE) + kernel->getAllocatedKernelInfo()->patchInfo.pAllocateSystemThreadSurface->Offset);
kernel->getAllocatedKernelInfo()->usesSsh = true;
auto &commandStreamReceiver = cmdQ.getCommandStreamReceiver();
auto &commandStreamReceiver = cmdQ.getGpgpuCommandStreamReceiver();
cmdQ.setupDebugSurface(kernel.get());
@@ -987,7 +987,7 @@ HWTEST_F(CommandQueueCommandStreamTest, givenCsrWithDebugSurfaceAllocatedWhenSet
kernel->setSshLocal(nullptr, sizeof(RENDER_SURFACE_STATE) + kernel->getAllocatedKernelInfo()->patchInfo.pAllocateSystemThreadSurface->Offset);
kernel->getAllocatedKernelInfo()->usesSsh = true;
auto &commandStreamReceiver = cmdQ.getCommandStreamReceiver();
auto &commandStreamReceiver = cmdQ.getGpgpuCommandStreamReceiver();
commandStreamReceiver.allocateDebugSurface(SipKernel::maxDbgSurfaceSize);
auto debugSurface = commandStreamReceiver.getDebugSurfaceAllocation();
ASSERT_NE(nullptr, debugSurface);
@@ -1029,8 +1029,8 @@ TEST(CommandQueuePropertiesTests, whenDefaultCommandQueueIsCreatedThenItIsNotMul
TEST(CommandQueuePropertiesTests, whenGetEngineIsCalledThenQueueEngineIsReturned) {
MockCommandQueue queue;
EngineControl engineControl;
queue.engine = &engineControl;
EXPECT_EQ(queue.engine, &queue.getEngine());
queue.gpgpuEngine = &engineControl;
EXPECT_EQ(queue.gpgpuEngine, &queue.getGpgpuEngine());
}
TEST(CommandQueue, GivenCommandQueueWhenEnqueueResourceBarrierCalledThenSuccessReturned) {
MockContext context;
@@ -1049,4 +1049,4 @@ TEST(CommandQueue, GivenCommandQueueWhenCheckingIfIsCacheFlushCommandCalledThenF
bool isCommandCacheFlush = cmdQ.isCacheFlushCommand(0u);
EXPECT_FALSE(isCommandCacheFlush);
}
}

2
unit_tests/command_queue/dispatch_walker_tests.cpp
View File

@@ -806,7 +806,7 @@ HWTEST_F(DispatchWalkerTest, givenThereAreAllocationsForReuseWhenDispatchWalkerI
ASSERT_EQ(CL_SUCCESS, kernel.initialize());
MockMultiDispatchInfo multiDispatchInfo(&kernel);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto allocation = csr.getMemoryManager()->allocateGraphicsMemoryWithProperties({MemoryConstants::pageSize64k + CSRequirements::csOverfetchSize,
GraphicsAllocation::AllocationType::COMMAND_BUFFER});
csr.getInternalAllocationStorage()->storeAllocation(std::unique_ptr<GraphicsAllocation>{allocation}, REUSABLE_ALLOCATION);

2
unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp
View File

@@ -61,7 +61,7 @@ HWTEST_F(AsyncGPUoperations, MapBufferAfterWriteBuffer) {
}
t.join();
srcBuffer->getGraphicsAllocation()->updateTaskCount(0u, pCmdQ->getCommandStreamReceiver().getOsContext().getContextId());
srcBuffer->getGraphicsAllocation()->updateTaskCount(0u, pCmdQ->getGpgpuCommandStreamReceiver().getOsContext().getContextId());
alignedFree(ptrMemory);
}

4
unit_tests/command_queue/enqueue_barrier_tests.cpp
View File

@@ -187,7 +187,7 @@ HWTEST_F(BarrierTest, eventWithWaitDependenciesShouldSync) {
ASSERT_EQ(CL_SUCCESS, retVal);
ASSERT_NE(nullptr, event);
auto pEvent = castToObject<Event>(event);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
// in this case only cmdQ raises the taskLevel why csr stay intact
EXPECT_EQ(8u, pCmdQ->taskLevel);
@@ -220,7 +220,7 @@ HWTEST_F(BarrierTest, givenNotBlockedCommandQueueAndEnqueueBarrierWithWaitlistRe
eventWaitList,
&event);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(latestTaskCountWaitedBeforeEnqueue, this->pCmdQ->latestTaskCountWaited);

10
unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp
View File

@@ -43,17 +43,17 @@ HWTEST_F(EnqueueHandlerTest, GivenCommandStreamWithoutKernelWhenCommandEnqueuedT
auto blocking = true;
TimestampPacketContainer previousTimestampPacketNodes;
mockCmdQ->enqueueCommandWithoutKernel(surfaces, 1, mockCmdQ->getCS(0), 0, blocking, &previousTimestampPacketNodes, eventsRequest, eventBuilder, 0);
EXPECT_EQ(allocation->getTaskCount(mockCmdQ->getCommandStreamReceiver().getOsContext().getContextId()), 1u);
EXPECT_EQ(allocation->getTaskCount(mockCmdQ->getGpgpuCommandStreamReceiver().getOsContext().getContextId()), 1u);
}
HWTEST_F(EnqueueHandlerTest, whenEnqueueCommandWithoutKernelThenPassCorrectDispatchFlags) {
auto executionEnvironment = pDevice->getExecutionEnvironment();
auto mockCsr = std::make_unique<MockCsrHw2<FamilyType>>(*executionEnvironment);
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, pDevice, nullptr);
mockCsr->setupContext(*mockCmdQ->engine->osContext);
mockCsr->setupContext(*mockCmdQ->gpgpuEngine->osContext);
mockCsr->initializeTagAllocation();
auto oldCsr = mockCmdQ->engine->commandStreamReceiver;
mockCmdQ->engine->commandStreamReceiver = mockCsr.get();
auto oldCsr = mockCmdQ->gpgpuEngine->commandStreamReceiver;
mockCmdQ->gpgpuEngine->commandStreamReceiver = mockCsr.get();
mockCsr->createPreemptionAllocation();
auto blocking = true;
@@ -65,7 +65,7 @@ HWTEST_F(EnqueueHandlerTest, whenEnqueueCommandWithoutKernelThenPassCorrectDispa
EXPECT_EQ(blocking, mockCsr->passedDispatchFlags.blocking);
EXPECT_EQ(mockCmdQ->isMultiEngineQueue(), mockCsr->passedDispatchFlags.multiEngineQueue);
EXPECT_EQ(pDevice->getPreemptionMode(), mockCsr->passedDispatchFlags.preemptionMode);
mockCmdQ->engine->commandStreamReceiver = oldCsr;
mockCmdQ->gpgpuEngine->commandStreamReceiver = oldCsr;
}
HWTEST_F(EnqueueHandlerTest, GivenCommandStreamWithoutKernelAndZeroSurfacesWhenEnqueuedHandlerThenUsedSizeEqualZero) {

4
unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp
View File

@@ -191,7 +191,7 @@ HWTEST_F(EnqueueCopyBufferRectTest, 2D_LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, When2DEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueCopyBufferRect2D<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}
@@ -313,7 +313,7 @@ HWTEST_F(EnqueueCopyBufferRectTest, 3D_LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, When3DEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueCopyBufferRect3D<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_copy_buffer_tests.cpp
View File

@@ -161,7 +161,7 @@ HWTEST_F(EnqueueCopyBufferTest, LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueCopyBufferAndParse<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp
View File

@@ -92,7 +92,7 @@ HWTEST_F(EnqueueCopyBufferToImageTest, loadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueCopyBufferToImage<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_copy_image_tests.cpp
View File

@@ -95,7 +95,7 @@ HWTEST_F(EnqueueCopyImageTest, loadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueCopyImage<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp
View File

@@ -93,7 +93,7 @@ HWTEST_F(EnqueueCopyImageToBufferTest, loadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueCopyImageToBuffer<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_debug_kernel_tests.cpp
View File

@@ -104,7 +104,7 @@ HWTEST_F(EnqueueDebugKernelTest, givenDebugKernelWhenEnqueuedThenSSHAndBtiAreCor
auto debugSurfaceState = reinterpret_cast<RENDER_SURFACE_STATE *>(ptrOffset(ssh.getCpuBase(), surfaceStateOffset));
auto &commandStreamReceiver = mockCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = mockCmdQ->getGpgpuCommandStreamReceiver();
auto debugSurface = commandStreamReceiver.getDebugSurfaceAllocation();
EXPECT_EQ(1u, debugSurface->getTaskCount(commandStreamReceiver.getOsContext().getContextId()));

12
unit_tests/command_queue/enqueue_fill_buffer_tests.cpp
View File

@@ -208,7 +208,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueFillBuffer<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}
@@ -368,7 +368,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, argumentTwoShouldMatchPatternPtr) {
}
HWTEST_F(EnqueueFillBufferCmdTests, patternShouldBeCopied) {
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
ASSERT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());
EnqueueFillBufferHelper<>::enqueueFillBuffer(pCmdQ, buffer);
ASSERT_FALSE(csr.getTemporaryAllocations().peekIsEmpty());
@@ -389,7 +389,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, patternShouldBeCopied) {
}
HWTEST_F(EnqueueFillBufferCmdTests, patternShouldBeAligned) {
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
ASSERT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());
EnqueueFillBufferHelper<>::enqueueFillBuffer(pCmdQ, buffer);
ASSERT_FALSE(csr.getTemporaryAllocations().peekIsEmpty());
@@ -411,7 +411,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, patternShouldBeAligned) {
}
HWTEST_F(EnqueueFillBufferCmdTests, patternOfSizeOneByteShouldGetPreparedForMiddleKernel) {
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
ASSERT_TRUE(csr.getAllocationsForReuse().peekIsEmpty());
ASSERT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());
@@ -444,7 +444,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, patternOfSizeOneByteShouldGetPreparedForMidd
}
HWTEST_F(EnqueueFillBufferCmdTests, patternOfSizeTwoBytesShouldGetPreparedForMiddleKernel) {
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
ASSERT_TRUE(csr.getAllocationsForReuse().peekIsEmpty());
ASSERT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());
@@ -477,7 +477,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, patternOfSizeTwoBytesShouldGetPreparedForMid
}
HWTEST_F(EnqueueFillBufferCmdTests, givenEnqueueFillBufferWhenPatternAllocationIsObtainedThenItsTypeShouldBeSetToFillPattern) {
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
ASSERT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());
auto dstBuffer = std::unique_ptr<Buffer>(BufferHelper<>::create());

2
unit_tests/command_queue/enqueue_fill_image_tests.cpp
View File

@@ -103,7 +103,7 @@ HWTEST_F(EnqueueFillImageTest, loadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillImageTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueFillImage<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_handler_tests.cpp
View File

@@ -500,7 +500,7 @@ struct EnqueueHandlerTestBasic : public ::testing::Test {
auto mockCmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context.get(), device.get(), nullptr);
auto &ultCsr = static_cast<UltCommandStreamReceiver<FamilyType> &>(mockCmdQ->getCommandStreamReceiver());
auto &ultCsr = static_cast<UltCommandStreamReceiver<FamilyType> &>(mockCmdQ->getGpgpuCommandStreamReceiver());
ultCsr.taskCount = initialTaskCount;
mockInternalAllocationStorage = new MockInternalAllocationStorage(ultCsr);

2
unit_tests/command_queue/enqueue_kernel_1_tests.cpp
View File

@@ -294,7 +294,7 @@ TEST_F(EnqueueKernelTest, GivenKernelWithBuiltinDispatchInfoBuilderWhenBeingDisp
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueKernelTest, givenSecondEnqueueWithTheSameScratchRequirementWhenPreemptionIsEnabledThenDontProgramMVSAgain) {
typedef typename FamilyType::MEDIA_VFE_STATE MEDIA_VFE_STATE;
pDevice->setPreemptionMode(PreemptionMode::ThreadGroup);
auto &csr = pDevice->getCommandStreamReceiver();
auto &csr = pDevice->getGpgpuCommandStreamReceiver();
csr.getMemoryManager()->setForce32BitAllocations(false);
HardwareParse hwParser;
size_t off[3] = {0, 0, 0};

8
unit_tests/command_queue/enqueue_kernel_2_tests.cpp
View File

@@ -182,7 +182,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueWorkItemTestsWithLimitedParamSet, LoadRegiste
HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueWorkItemTestsWithLimitedParamSet, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueKernel<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pDevice->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pDevice->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList,
context->getMemoryManager()->peekForce32BitAllocations() ? context->getMemoryManager()->getExternalHeapBaseAddress() : 0llu);
}
@@ -458,7 +458,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueKernelWithScratch, givenDeviceForcing32bitAll
typedef typename PARSE::STATE_BASE_ADDRESS STATE_BASE_ADDRESS;
if (is64bit) {
CommandStreamReceiver *csr = &pDevice->getCommandStreamReceiver();
CommandStreamReceiver *csr = &pDevice->getGpgpuCommandStreamReceiver();
auto memoryManager = csr->getMemoryManager();
memoryManager->setForce32BitAllocations(true);
@@ -541,7 +541,7 @@ HWTEST_P(EnqueueKernelPrintfTest, GivenKernelWithPrintfWhenBeingDispatchedThenL3
MockKernelWithInternals mockKernel(*pDevice);
mockKernel.crossThreadData[64] = 0;
mockKernel.kernelInfo.patchInfo.pAllocateStatelessPrintfSurface = &patchData;
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto latestSentTaskCount = csr.peekTaskCount();
enqueueKernel<FamilyType, false>(mockKernel);
auto newLatestSentTaskCount = csr.peekTaskCount();
@@ -561,7 +561,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueKernelPrintfTest, GivenKernelWithPrintfBlocke
MockKernelWithInternals mockKernel(*pDevice);
mockKernel.crossThreadData[64] = 0;
mockKernel.kernelInfo.patchInfo.pAllocateStatelessPrintfSurface = &patchData;
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto latestSentDcFlushTaskCount = csr.peekTaskCount();
cl_uint workDim = 1;

8
unit_tests/command_queue/enqueue_kernel_event_tests.cpp
View File

@@ -70,7 +70,7 @@ TEST_F(EventTests, eventWaitShouldntSendPC) {
cl_event *eventWaitList = nullptr;
cl_event event = nullptr;
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto retVal = callOneWorkItemNDRKernel(eventWaitList, numEventsInWaitList, &event);
@@ -109,7 +109,7 @@ TEST_F(EventTests, waitForArray) {
cl_event *eventWaitList = nullptr;
cl_event event[2] = {};
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto retVal = callOneWorkItemNDRKernel(eventWaitList, numEventsInWaitList, &event[0]);
@@ -153,7 +153,7 @@ TEST_F(EventTests, event_NDR_Wait_NDR_Finish) {
cl_event *eventWaitList = nullptr;
cl_event event = nullptr;
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto retVal = callOneWorkItemNDRKernel(eventWaitList, numEventsInWaitList, &event);
@@ -192,7 +192,7 @@ TEST_F(EventTests, eventPassedToEnqueueMarkerHasTheSameLevelAsPreviousCommand) {
cl_uint numEventsInWaitList = 0;
cl_event *eventWaitList = nullptr;
cl_event event = nullptr;
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto retVal = callOneWorkItemNDRKernel(eventWaitList, numEventsInWaitList, &event);

12
unit_tests/command_queue/enqueue_map_buffer_tests.cpp
View File

@@ -285,7 +285,7 @@ TEST_F(EnqueueMapBufferTest, givenNonBlockingReadOnlyMapBufferOnZeroCopyBufferWh
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, buffer);
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
uint32_t taskCount = commandStreamReceiver.peekTaskCount();
EXPECT_EQ(0u, taskCount);
@@ -375,7 +375,7 @@ TEST_F(EnqueueMapBufferTest, givenNonReadOnlyBufferWhenMappedOnGpuThenSetValidEv
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, buffer.get());
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
EXPECT_EQ(0u, commandStreamReceiver.peekTaskCount());
auto ptrResult = clEnqueueMapBuffer(pCmdQ, buffer.get(), CL_FALSE, CL_MAP_WRITE, 0, 8, 0,
@@ -417,7 +417,7 @@ TEST_F(EnqueueMapBufferTest, givenReadOnlyBufferWhenMappedOnGpuThenSetValidEvent
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, buffer.get());
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
EXPECT_EQ(0u, commandStreamReceiver.peekTaskCount());
auto ptrResult = clEnqueueMapBuffer(pCmdQ, buffer.get(), CL_FALSE, CL_MAP_READ, 0, 8, 0,
@@ -463,7 +463,7 @@ TEST_F(EnqueueMapBufferTest, givenNonBlockingMapBufferAfterL3IsAlreadyFlushedThe
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_NE(nullptr, buffer);
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
uint32_t taskCount = commandStreamReceiver.peekTaskCount();
EXPECT_EQ(0u, taskCount);
@@ -544,7 +544,7 @@ TEST_F(EnqueueMapBufferTest, GivenBufferThatIsNotZeroCopyWhenNonBlockingMapIsCal
retVal = clEnqueueNDRangeKernel(pCmdQ, kernel, 1, 0, &GWS, nullptr, 0, nullptr, nullptr);
EXPECT_EQ(retVal, CL_SUCCESS);
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
uint32_t taskCount = commandStreamReceiver.peekTaskCount();
EXPECT_EQ(1u, taskCount);
@@ -641,7 +641,7 @@ HWTEST_F(EnqueueMapBufferTest, MapBufferEventProperties) {
}
TEST_F(EnqueueMapBufferTest, GivenZeroCopyBufferWhenMapBufferWithoutEventsThenCommandStreamReceiverUpdatesRequiredDCFlushCount) {
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
auto buffer = clCreateBuffer(
BufferDefaults::context,

8
unit_tests/command_queue/enqueue_map_image_tests.cpp
View File

@@ -226,8 +226,8 @@ HWTEST_F(EnqueueMapImageTest, givenTiledImageWhenMapImageIsCalledThenStorageIsSe
EXPECT_NE(nullptr, mapAllocation);
EXPECT_EQ(apiMapPtr, mapAllocation->getUnderlyingBuffer());
auto osContextId = pCmdQ->getCommandStreamReceiver().getOsContext().getContextId();
auto expectedTaskCount = pCmdQ->getCommandStreamReceiver().peekTaskCount();
auto osContextId = pCmdQ->getGpgpuCommandStreamReceiver().getOsContext().getContextId();
auto expectedTaskCount = pCmdQ->getGpgpuCommandStreamReceiver().peekTaskCount();
auto actualMapAllocationTaskCount = mapAllocation->getTaskCount(osContextId);
EXPECT_EQ(expectedTaskCount, actualMapAllocationTaskCount);
@@ -312,7 +312,7 @@ TEST_F(EnqueueMapImageTest, givenNonReadOnlyMapWithOutEventWhenMappedThenSetEven
MockKernelWithInternals kernel(*pDevice);
*pTagMemory = tagHW;
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
auto tag_address = commandStreamReceiver.getTagAddress();
EXPECT_TRUE(pTagMemory == tag_address);
@@ -391,7 +391,7 @@ TEST_F(EnqueueMapImageTest, givenReadOnlyMapWithOutEventWhenMappedThenSetEventAn
const size_t region[3] = {1, 1, 1};
*pTagMemory = 5;
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
EXPECT_EQ(1u, commandStreamReceiver.peekTaskCount());

4
unit_tests/command_queue/enqueue_marker_tests.cpp
View File

@@ -191,7 +191,7 @@ TEST_F(MarkerTest, givenMultipleEventWhenTheyArePassedToMarkerThenOutputEventHas
std::unique_ptr<Event> pEvent((Event *)(event));
if (pCmdQ->getCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
if (pCmdQ->getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
EXPECT_EQ(initialTaskCount + 1, pCmdQ->taskCount);
EXPECT_EQ(initialTaskCount + 1, pEvent->peekTaskCount());
} else {
@@ -225,7 +225,7 @@ TEST_F(MarkerTest, givenMultipleEventsAndCompletedUserEventWhenTheyArePassedToMa
std::unique_ptr<Event> pEvent((Event *)(event));
if (pCmdQ->getCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
if (pCmdQ->getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
EXPECT_EQ(initialTaskCount + 1, pCmdQ->taskCount);
EXPECT_EQ(initialTaskCount + 1, pEvent->peekTaskCount());
} else {

2
unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp
View File

@@ -335,7 +335,7 @@ TEST_F(EnqueueReadBuffer, givenOutOfOrderQueueAndDisabledSupportCpuCopiesAndDstP
ASSERT_NE(nullptr, event);
auto pEvent = castToObject<Event>(event);
if (pCmdOOQ->getCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
if (pCmdOOQ->getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
EXPECT_EQ(taskLevelEvent2 + 1, pCmdOOQ->taskLevel);
EXPECT_EQ(taskLevelEvent2 + 1, pEvent->taskLevel);
} else {

2
unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp
View File

@@ -205,7 +205,7 @@ HWTEST_F(EnqueueReadBufferRectTest, 2D_LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadBufferRectTest, When2DEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueReadBufferRect2D<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_read_buffer_tests.cpp
View File

@@ -168,7 +168,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadBufferTypeTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
srcBuffer->forceDisallowCPUCopy = true;
enqueueReadBuffer<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

6
unit_tests/command_queue/enqueue_read_image_tests.cpp
View File

@@ -105,7 +105,7 @@ HWTEST_F(EnqueueReadImageTest, loadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueReadImage<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}
@@ -228,7 +228,7 @@ HWTEST_F(EnqueueReadImageTest, GivenImage1DarrayWhenReadImageIsCalledThenHostPtr
EnqueueReadImageHelper<>::enqueueReadImage(pCmdQ, srcImage, CL_FALSE, origin, region);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto temporaryAllocation = csr.getTemporaryAllocations().peekHead();
ASSERT_NE(nullptr, temporaryAllocation);
@@ -287,7 +287,7 @@ HWTEST_F(EnqueueReadImageTest, GivenImage2DarrayWhenReadImageIsCalledThenHostPtr
EnqueueReadImageHelper<>::enqueueReadImage(pCmdQ, srcImage, CL_FALSE, origin, region);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto temporaryAllocation = csr.getTemporaryAllocations().peekHead();
ASSERT_NE(nullptr, temporaryAllocation);

14
unit_tests/command_queue/enqueue_svm_tests.cpp
View File

@@ -571,7 +571,7 @@ TEST_F(EnqueueSvmTest, enqueueSVMMemFillDoubleToReuseAllocation_Success) {
}
TEST_F(EnqueueSvmTest, givenEnqueueSVMMemFillWhenPatternAllocationIsObtainedThenItsTypeShouldBeSetToFillPattern) {
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
ASSERT_TRUE(csr.getAllocationsForReuse().peekIsEmpty());
const float pattern[1] = {1.2345f};
@@ -1086,8 +1086,8 @@ HWTEST_F(EnqueueSvmTest, GivenDstHostPtrWhenHostPtrAllocationCreationFailsThenRe
void *pSrcSVM = ptrSVM;
MockCommandQueueHw<FamilyType> cmdQ(context, pDevice, nullptr);
auto failCsr = std::make_unique<FailCsr<FamilyType>>(*pDevice->getExecutionEnvironment());
CommandStreamReceiver *oldCommandStreamReceiver = cmdQ.engine->commandStreamReceiver;
cmdQ.engine->commandStreamReceiver = failCsr.get();
CommandStreamReceiver *oldCommandStreamReceiver = cmdQ.gpgpuEngine->commandStreamReceiver;
cmdQ.gpgpuEngine->commandStreamReceiver = failCsr.get();
retVal = cmdQ.enqueueSVMMemcpy(
false, // cl_bool blocking_copy
pDstSVM, // void *dst_ptr
@@ -1098,7 +1098,7 @@ HWTEST_F(EnqueueSvmTest, GivenDstHostPtrWhenHostPtrAllocationCreationFailsThenRe
nullptr // cL_event *event
);
EXPECT_EQ(CL_OUT_OF_RESOURCES, retVal);
cmdQ.engine->commandStreamReceiver = oldCommandStreamReceiver;
cmdQ.gpgpuEngine->commandStreamReceiver = oldCommandStreamReceiver;
}
HWTEST_F(EnqueueSvmTest, GivenSrcHostPtrAndSizeZeroWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) {
@@ -1107,8 +1107,8 @@ HWTEST_F(EnqueueSvmTest, GivenSrcHostPtrAndSizeZeroWhenHostPtrAllocationCreation
void *pSrcSVM = srcHostPtr;
MockCommandQueueHw<FamilyType> cmdQ(context, pDevice, nullptr);
auto failCsr = std::make_unique<FailCsr<FamilyType>>(*pDevice->getExecutionEnvironment());
CommandStreamReceiver *oldCommandStreamReceiver = cmdQ.engine->commandStreamReceiver;
cmdQ.engine->commandStreamReceiver = failCsr.get();
CommandStreamReceiver *oldCommandStreamReceiver = cmdQ.gpgpuEngine->commandStreamReceiver;
cmdQ.gpgpuEngine->commandStreamReceiver = failCsr.get();
retVal = cmdQ.enqueueSVMMemcpy(
false, // cl_bool blocking_copy
pDstSVM, // void *dst_ptr
@@ -1119,5 +1119,5 @@ HWTEST_F(EnqueueSvmTest, GivenSrcHostPtrAndSizeZeroWhenHostPtrAllocationCreation
nullptr // cL_event *event
);
EXPECT_EQ(CL_OUT_OF_RESOURCES, retVal);
cmdQ.engine->commandStreamReceiver = oldCommandStreamReceiver;
cmdQ.gpgpuEngine->commandStreamReceiver = oldCommandStreamReceiver;
}

2
unit_tests/command_queue/enqueue_thread_tests.cpp
View File

@@ -420,7 +420,7 @@ HWTEST_F(EnqueueThreading, finish) {
// set something to finish
pCmdQ->taskCount = 1;
pCmdQ->taskLevel = 1;
auto csr = (CommandStreamReceiverMock<FamilyType> *)&this->pCmdQ->getCommandStreamReceiver();
auto csr = (CommandStreamReceiverMock<FamilyType> *)&this->pCmdQ->getGpgpuCommandStreamReceiver();
csr->expectedToFreeCount = 0u;
pCmdQ->finish(false);

2
unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp
View File

@@ -334,7 +334,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenOutOfOrderQueueAndDisabledSupportCpuCopi
ASSERT_NE(nullptr, event);
auto pEvent = castToObject<Event>(event);
if (pCmdOOQ->getCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
if (pCmdOOQ->getGpgpuCommandStreamReceiver().peekTimestampPacketWriteEnabled()) {
EXPECT_EQ(taskLevelEvent2 + 1, pCmdOOQ->taskLevel);
EXPECT_EQ(taskLevelEvent2 + 1, pEvent->taskLevel);
} else {

2
unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp
View File

@@ -179,7 +179,7 @@ HWTEST_F(EnqueueWriteBufferRectTest, 2D_LoadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferRectTest, When2DEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueWriteBufferRect2D<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

2
unit_tests/command_queue/enqueue_write_buffer_tests.cpp
View File

@@ -168,7 +168,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, WhenEnqueueIsDoneThenSta
srcBuffer->forceDisallowCPUCopy = true;
enqueueWriteBuffer<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}

6
unit_tests/command_queue/enqueue_write_image_tests.cpp
View File

@@ -104,7 +104,7 @@ HWTEST_F(EnqueueWriteImageTest, loadRegisterImmediateL3CNTLREG) {
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenEnqueueIsDoneThenStateBaseAddressIsProperlyProgrammed) {
enqueueWriteImage<FamilyType>();
validateStateBaseAddress<FamilyType>(this->pCmdQ->getCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
validateStateBaseAddress<FamilyType>(this->pCmdQ->getGpgpuCommandStreamReceiver().getMemoryManager()->getInternalHeapBaseAddress(),
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
}
@@ -201,7 +201,7 @@ HWTEST_F(EnqueueWriteImageTest, GivenImage1DarrayWhenReadWriteImageIsCalledThenH
EnqueueWriteImageHelper<>::enqueueWriteImage(pCmdQ, dstImage2, CL_FALSE, origin, region);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto temporaryAllocation1 = csr.getTemporaryAllocations().peekHead();
ASSERT_NE(nullptr, temporaryAllocation1);
@@ -267,7 +267,7 @@ HWTEST_F(EnqueueWriteImageTest, GivenImage2DarrayWhenReadWriteImageIsCalledThenH
EnqueueWriteImageHelper<>::enqueueWriteImage(pCmdQ, dstImage2, CL_FALSE, origin, region);
auto &csr = pCmdQ->getCommandStreamReceiver();
auto &csr = pCmdQ->getGpgpuCommandStreamReceiver();
auto temporaryAllocation1 = csr.getTemporaryAllocations().peekHead();
ASSERT_NE(nullptr, temporaryAllocation1);

6
unit_tests/command_queue/ioq_task_tests.cpp
View File

@@ -39,7 +39,7 @@ TEST_F(IOQ, enqueueReadBuffer_increasesTaskLevel) {
}
TEST_F(IOQ, enqueueKernel_changesTaskCount) {
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
auto previousTaskCount = commandStreamReceiver.peekTaskCount();
EnqueueKernelHelper<>::enqueueKernel(pCmdQ,
@@ -49,7 +49,7 @@ TEST_F(IOQ, enqueueKernel_changesTaskCount) {
}
TEST_F(IOQ, enqueueFillBuffer_changesTaskCount) {
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
auto previousTaskCount = commandStreamReceiver.peekTaskCount();
EnqueueFillBufferHelper<>::enqueue(pCmdQ);
@@ -58,7 +58,7 @@ TEST_F(IOQ, enqueueFillBuffer_changesTaskCount) {
}
TEST_F(IOQ, enqueueReadBuffer_changesTaskCount) {
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
auto previousTaskCount = commandStreamReceiver.peekTaskCount();
auto buffer = std::unique_ptr<Buffer>(BufferHelper<>::create());

6
unit_tests/command_queue/ooq_task_tests.cpp
View File

@@ -33,7 +33,7 @@ bool isBlockingCall(unsigned int cmdType) {
}
TYPED_TEST_P(OOQTaskTypedTests, givenNonBlockingCallWhenDoneOnOutOfOrderQueueThenTaskLevelDoesntChange) {
auto &commandStreamReceiver = this->pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = this->pCmdQ->getGpgpuCommandStreamReceiver();
auto tagAddress = commandStreamReceiver.getTagAddress();
auto blockingCall = isBlockingCall(TypeParam::Traits::cmdType);
@@ -60,7 +60,7 @@ TYPED_TEST_P(OOQTaskTypedTests, givenNonBlockingCallWhenDoneOnOutOfOrderQueueThe
}
TYPED_TEST_P(OOQTaskTypedTests, givenTaskWhenEnqueuedOnOutOfOrderQueueThenTaskCountIsUpdated) {
auto &commandStreamReceiver = this->pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = this->pCmdQ->getGpgpuCommandStreamReceiver();
auto previousTaskCount = commandStreamReceiver.peekTaskCount();
auto tagAddress = commandStreamReceiver.getTagAddress();
auto blockingCall = isBlockingCall(TypeParam::Traits::cmdType);
@@ -104,7 +104,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(OOQ, OOQTaskTypedTests, EnqueueParams);
typedef OOQTaskTypedTests<EnqueueKernelHelper<>> OOQTaskTests;
TEST_F(OOQTaskTests, enqueueKernel_changesTaskCount) {
auto &commandStreamReceiver = pCmdQ->getCommandStreamReceiver();
auto &commandStreamReceiver = pCmdQ->getGpgpuCommandStreamReceiver();
auto previousTaskCount = commandStreamReceiver.peekTaskCount();
EnqueueKernelHelper<>::enqueueKernel(this->pCmdQ,