From 87b8b6e26116b57a17c3d23d96ed8bf8e00d07c3 Mon Sep 17 00:00:00 2001 From: "Mrozek, Michal" Date: Mon, 16 Apr 2018 16:39:00 +0200 Subject: [PATCH] [28/n] Internal 4GB allocator. Avoid default parameter to getIndirectHeap. Change-Id: I105ceaa4b5e9b23ce8dc96631410b9535e5a44e0 --- runtime/command_queue/command_queue.h | 2 +- runtime/command_queue/enqueue_common.h | 14 ++++---- runtime/helpers/task_information.cpp | 12 +++---- .../command_queue/command_queue_tests.cpp | 2 +- .../get_size_required_buffer_tests.cpp | 36 +++++++++---------- .../get_size_required_image_tests.cpp | 36 +++++++++---------- .../command_queue/get_size_required_tests.cpp | 6 ++-- .../parent_kernel_dispatch_tests.cpp | 8 ++--- .../scheduler_dispatch_tests.cpp | 8 ++--- .../submit_blocked_parent_kernel_tests.cpp | 4 +-- unit_tests/gen8/scheduler_dispatch_tests.cpp | 2 +- 11 files changed, 65 insertions(+), 65 deletions(-) diff --git a/runtime/command_queue/command_queue.h b/runtime/command_queue/command_queue.h index fbc3fb75bc..0304f4d528 100644 --- a/runtime/command_queue/command_queue.h +++ b/runtime/command_queue/command_queue.h @@ -334,7 +334,7 @@ class CommandQueue : public BaseObject<_cl_command_queue> { LinearStream &getCS(size_t minRequiredSize = 1024u); IndirectHeap &getIndirectHeap(IndirectHeap::Type heapType, - size_t minRequiredSize = 0u); + size_t minRequiredSize); void allocateHeapMemory(IndirectHeap::Type heapType, size_t minRequiredSize, IndirectHeap *&indirectHeap); diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h index 96651e1c24..b802c308e3 100644 --- a/runtime/command_queue/enqueue_common.h +++ b/runtime/command_queue/enqueue_common.h @@ -125,7 +125,7 @@ void CommandQueueHw::forceDispatchScheduler(OCLRT::MultiDispatchInfo devQueueHw->getDshBuffer(), reflectionSurface, devQueueHw->getQueueStorageBuffer(), - this->getIndirectHeap(IndirectHeap::SURFACE_STATE).getGraphicsAllocation()); + this->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u).getGraphicsAllocation()); multiDispatchInfo.push(dispatchInfo); } @@ -291,7 +291,7 @@ void CommandQueueHw::enqueueHandler(Surface **surfacesForResidency, devQueueHw->getDshBuffer(), multiDispatchInfo.begin()->getKernel()->getKernelReflectionSurface(), devQueueHw->getQueueStorageBuffer(), - this->getIndirectHeap(IndirectHeap::SURFACE_STATE).getGraphicsAllocation(), + this->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u).getGraphicsAllocation(), devQueueHw->getDebugQueue()); GpgpuWalkerHelper::dispatchScheduler( @@ -299,7 +299,7 @@ void CommandQueueHw::enqueueHandler(Surface **surfacesForResidency, *devQueueHw, preemption, scheduler, - &getIndirectHeap(IndirectHeap::SURFACE_STATE), + &getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), devQueueHw->getIndirectHeap(IndirectHeap::DYNAMIC_STATE)); scheduler.makeResident(commandStreamReceiver); @@ -343,7 +343,7 @@ void CommandQueueHw::enqueueHandler(Surface **surfacesForResidency, devQueueHw->getDshBuffer(), multiDispatchInfo.begin()->getKernel()->getKernelReflectionSurface(), devQueueHw->getQueueStorageBuffer(), - this->getIndirectHeap(IndirectHeap::SURFACE_STATE).getGraphicsAllocation(), + this->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u).getGraphicsAllocation(), devQueueHw->getDebugQueue()); } } @@ -537,8 +537,8 @@ CompletionStamp CommandQueueHw::enqueueNonBlocked( ioh = dsh; implicitFlush = true; } else { - dsh = &getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - ioh = &getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); + dsh = &getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + ioh = &getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); } commandStreamReceiver.requestThreadArbitrationPolicy(multiDispatchInfo.begin()->getKernel()->getThreadArbitrationPolicy()); @@ -568,7 +568,7 @@ CompletionStamp CommandQueueHw::enqueueNonBlocked( commandStreamStart, *dsh, *ioh, - getIndirectHeap(IndirectHeap::SURFACE_STATE), + getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), taskLevel, dispatchFlags); diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp index 41bedb2859..45b0875d0e 100644 --- a/runtime/helpers/task_information.cpp +++ b/runtime/helpers/task_information.cpp @@ -83,9 +83,9 @@ CompletionStamp &CommandMapUnmap::submit(uint32_t taskLevel, bool terminated) { completionStamp = csr.flushTask(queueCommandStream, offset, - cmdQ.getIndirectHeap(IndirectHeap::DYNAMIC_STATE), - cmdQ.getIndirectHeap(IndirectHeap::INDIRECT_OBJECT), - cmdQ.getIndirectHeap(IndirectHeap::SURFACE_STATE), + cmdQ.getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u), + cmdQ.getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u), + cmdQ.getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), taskLevel, dispatchFlags); @@ -269,9 +269,9 @@ CompletionStamp &CommandMarker::submit(uint32_t taskLevel, bool terminated) { completionStamp = csr.flushTask(queueCommandStream, offset, - cmdQ.getIndirectHeap(IndirectHeap::DYNAMIC_STATE), - cmdQ.getIndirectHeap(IndirectHeap::INDIRECT_OBJECT), - cmdQ.getIndirectHeap(IndirectHeap::SURFACE_STATE), + cmdQ.getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u), + cmdQ.getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u), + cmdQ.getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), taskLevel, dispatchFlags); diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/unit_tests/command_queue/command_queue_tests.cpp index 8b776c01ac..9ddbb81356 100644 --- a/unit_tests/command_queue/command_queue_tests.cpp +++ b/unit_tests/command_queue/command_queue_tests.cpp @@ -594,7 +594,7 @@ TEST_P(CommandQueueIndirectHeapTest, GivenCommandQueueWithHeapWhenGraphicAllocat const cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, 0, 0}; MockCommandQueue cmdQ(context.get(), pDevice, props); - auto &ih = cmdQ.getIndirectHeap(this->GetParam()); + auto &ih = cmdQ.getIndirectHeap(this->GetParam(), 0u); auto allocation = ih.getGraphicsAllocation(); EXPECT_NE(nullptr, allocation); diff --git a/unit_tests/command_queue/get_size_required_buffer_tests.cpp b/unit_tests/command_queue/get_size_required_buffer_tests.cpp index 6facd9a1d3..f13fb86655 100644 --- a/unit_tests/command_queue/get_size_required_buffer_tests.cpp +++ b/unit_tests/command_queue/get_size_required_buffer_tests.cpp @@ -79,9 +79,9 @@ HWTEST_F(GetSizeRequiredBufferTest, enqueueFillBuffer) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -131,9 +131,9 @@ HWTEST_F(GetSizeRequiredBufferTest, enqueueCopyBuffer) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -182,9 +182,9 @@ HWTEST_F(GetSizeRequiredBufferTest, enqueueReadBufferNonBlocking) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -234,9 +234,9 @@ HWTEST_F(GetSizeRequiredBufferTest, enqueueReadBufferBlocking) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -287,9 +287,9 @@ HWTEST_F(GetSizeRequiredBufferTest, enqueueWriteBufferNonBlocking) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -336,9 +336,9 @@ HWTEST_F(GetSizeRequiredBufferTest, enqueueWriteBufferNonBlocking) { HWTEST_F(GetSizeRequiredBufferTest, enqueueWriteBufferBlocking) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); diff --git a/unit_tests/command_queue/get_size_required_image_tests.cpp b/unit_tests/command_queue/get_size_required_image_tests.cpp index c90ae5bd64..dbb54b6141 100644 --- a/unit_tests/command_queue/get_size_required_image_tests.cpp +++ b/unit_tests/command_queue/get_size_required_image_tests.cpp @@ -70,9 +70,9 @@ struct GetSizeRequiredImageTest : public CommandEnqueueFixture, HWTEST_F(GetSizeRequiredImageTest, enqueueCopyImage) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -120,9 +120,9 @@ HWTEST_F(GetSizeRequiredImageTest, enqueueCopyImage) { HWTEST_F(GetSizeRequiredImageTest, enqueueCopyReadAndWriteImage) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -170,9 +170,9 @@ HWTEST_F(GetSizeRequiredImageTest, enqueueCopyReadAndWriteImage) { HWTEST_F(GetSizeRequiredImageTest, enqueueReadImageNonBlocking) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -224,9 +224,9 @@ HWTEST_F(GetSizeRequiredImageTest, enqueueReadImageNonBlocking) { HWTEST_F(GetSizeRequiredImageTest, enqueueReadImageBlocking) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -278,9 +278,9 @@ HWTEST_F(GetSizeRequiredImageTest, enqueueReadImageBlocking) { HWTEST_F(GetSizeRequiredImageTest, enqueueWriteImageNonBlocking) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); @@ -332,9 +332,9 @@ HWTEST_F(GetSizeRequiredImageTest, enqueueWriteImageNonBlocking) { HWTEST_F(GetSizeRequiredImageTest, enqueueWriteImageBlocking) { auto &commandStream = pCmdQ->getCS(); auto usedBeforeCS = commandStream.getUsed(); - auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &dsh = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); auto usedBeforeDSH = dsh.getUsed(); auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeSSH = ssh.getUsed(); diff --git a/unit_tests/command_queue/get_size_required_tests.cpp b/unit_tests/command_queue/get_size_required_tests.cpp index e7445f4bb6..a3de7ca2ab 100644 --- a/unit_tests/command_queue/get_size_required_tests.cpp +++ b/unit_tests/command_queue/get_size_required_tests.cpp @@ -36,9 +36,9 @@ struct GetSizeRequiredTest : public CommandEnqueueFixture, void SetUp() override { CommandEnqueueFixture::SetUp(); - dsh = &pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE); - ioh = &pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); - ssh = &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + dsh = &pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u); + ioh = &pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); + ssh = &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); usedBeforeDSH = dsh->getUsed(); usedBeforeIOH = ioh->getUsed(); diff --git a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp b/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp index 1bde6afad6..b0dcf90887 100644 --- a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp +++ b/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp @@ -48,7 +48,7 @@ HWTEST_P(ParentKernelDispatchTest, givenParentKernelWhenQueueIsNotBlockedThenDev pKernel->createReflectionSurface(); - size_t dshUsedBefore = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE).getUsed(); + size_t dshUsedBefore = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u).getUsed(); EXPECT_EQ(0u, dshUsedBefore); size_t executionModelDSHUsedBefore = pDevQueueHw->getIndirectHeap(IndirectHeap::DYNAMIC_STATE)->getUsed(); @@ -67,7 +67,7 @@ HWTEST_P(ParentKernelDispatchTest, givenParentKernelWhenQueueIsNotBlockedThenDev pDevice->getPreemptionMode(), false); - size_t dshUsedAfter = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE).getUsed(); + size_t dshUsedAfter = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 0u).getUsed(); EXPECT_EQ(0u, dshUsedAfter); size_t executionModelDSHUsedAfter = pDevQueueHw->getIndirectHeap(IndirectHeap::DYNAMIC_STATE)->getUsed(); @@ -107,7 +107,7 @@ HWTEST_P(ParentKernelDispatchTest, givenParentKernelWhenQueueIsNotBlockedThenDef MockMultiDispatchInfo multiDispatchInfo(pKernel); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); GpgpuWalkerHelper::dispatchWalker(*pCmdQ, *pKernel, @@ -150,7 +150,7 @@ HWTEST_P(ParentKernelDispatchTest, givenParentKernelWhenQueueIsNotBlockedThenSSH pDevice->getPreemptionMode(), false); - auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE); + auto &ssh = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u); EXPECT_LE(pKernel->getKernelInfo().heapInfo.pKernelHeader->SurfaceStateHeapSize, ssh.getMaxAvailableSpace()); diff --git a/unit_tests/execution_model/scheduler_dispatch_tests.cpp b/unit_tests/execution_model/scheduler_dispatch_tests.cpp index 5aa985a2ef..39e4649cb9 100644 --- a/unit_tests/execution_model/scheduler_dispatch_tests.cpp +++ b/unit_tests/execution_model/scheduler_dispatch_tests.cpp @@ -77,7 +77,7 @@ HWTEST_F(ExecutionModelSchedulerFixture, dispatchScheduler) { *pDevQueueHw, pDevice->getPreemptionMode(), scheduler, - &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE), + &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), pDevQueueHw->getIndirectHeap(IndirectHeap::DYNAMIC_STATE)); EXPECT_EQ(0u, *scheduler.globalWorkOffsetX); @@ -195,10 +195,10 @@ HWTEST_F(ExecutionModelSchedulerFixture, dispatchSchedulerDoesNotUseStandardCmdQ *pDevQueueHw, pDevice->getPreemptionMode(), scheduler, - &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE), + &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), pDevQueueHw->getIndirectHeap(IndirectHeap::DYNAMIC_STATE)); - auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT); + auto &ioh = pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 0u); EXPECT_EQ(0u, ioh.getUsed()); } @@ -228,7 +228,7 @@ HWTEST_F(ParentKernelCommandQueueFixture, dispatchSchedulerWithEarlyReturnSetToF mockDevQueue, device->getPreemptionMode(), scheduler, - &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE), + &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), mockDevQueue.getIndirectHeap(IndirectHeap::DYNAMIC_STATE)); HardwareParse hwParser; diff --git a/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp b/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp index 2e30ee0448..97d82575e9 100644 --- a/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp +++ b/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp @@ -400,7 +400,7 @@ HWTEST_F(ParentKernelCommandQueueFixture, givenNotUsedSSHWhenParentKernelIsSubmi pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, sshSize); - void *sshBuffer = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE).getCpuBase(); + void *sshBuffer = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u).getCpuBase(); KernelOperation *blockedCommandData = new KernelOperation(std::unique_ptr(new LinearStream()), std::unique_ptr(dsh), @@ -416,7 +416,7 @@ HWTEST_F(ParentKernelCommandQueueFixture, givenNotUsedSSHWhenParentKernelIsSubmi cmdComputeKernel->submit(0, false); - void *newSshBuffer = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE).getCpuBase(); + void *newSshBuffer = pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u).getCpuBase(); EXPECT_EQ(sshBuffer, newSshBuffer); diff --git a/unit_tests/gen8/scheduler_dispatch_tests.cpp b/unit_tests/gen8/scheduler_dispatch_tests.cpp index a41fc8ab38..683a0ba0a8 100644 --- a/unit_tests/gen8/scheduler_dispatch_tests.cpp +++ b/unit_tests/gen8/scheduler_dispatch_tests.cpp @@ -56,7 +56,7 @@ BDWTEST_F(BdwSchedulerTest, givenCallToDispatchSchedulerWhenPipeControlWithCSSta *pDevQueueHw, pDevice->getPreemptionMode(), scheduler, - &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE), + &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 0u), pDevQueueHw->getIndirectHeap(IndirectHeap::DYNAMIC_STATE)); HardwareParse hwParser;