Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-06-28 17:58:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Unrecoverable to RelaxedOrdering path

Browse Source 
Related-To: NEO-7458

Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2023-03-20 11:48:15 +00:00
committed by Compute-Runtime-Automation
parent 4919c7c9fb
commit 43cc747843
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/source/command_queue/enqueue_common.h
View File

@ -224,6 +224,7 @@ cl_int CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
auto commandStreamStart = commandStream.getUsed();
if (canUsePipeControlInsteadOfSemaphoresForOnCsrDependencies) {
UNRECOVERABLE_IF(relaxedOrderingForGpgpuAllowed(1)); // IOQ has >=1 dependencies
PipeControlArgs args;
args.csStallOnly = true;
MemorySynchronizationCommands<GfxFamily>::addSingleBarrier(commandStream, args);

28
opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp
View File

@ -1069,6 +1069,7 @@ struct RelaxedOrderingEnqueueKernelTests : public EnqueueKernelTest {
DebugManager.flags.DirectSubmissionRelaxedOrdering.set(1);
DebugManager.flags.UpdateTaskCountFromWait.set(1);
DebugManager.flags.CsrDispatchMode.set(static_cast<int32_t>(DispatchMode::ImmediateDispatch));
ultHwConfig.csrBaseCallDirectSubmissionAvailable = true;
@ -1099,7 +1100,6 @@ HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenEnqueueKernelWhenProgrammingDe
MockKernelWithInternals mockKernel(*pClDevice);
mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, &outEvent);
mockCmdQueueHw.flush();
EXPECT_FALSE(ultCsr.recordedDispatchFlags.hasStallingCmds);
EXPECT_FALSE(ultCsr.recordedDispatchFlags.hasRelaxedOrderingDependencies);
@ -1107,7 +1107,6 @@ HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenEnqueueKernelWhenProgrammingDe
auto cmdsOffset = mockCmdQueueHw.getCS(0).getUsed();
mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 1, &outEvent, nullptr);
mockCmdQueueHw.flush();
EXPECT_FALSE(ultCsr.recordedDispatchFlags.hasStallingCmds);
EXPECT_TRUE(ultCsr.recordedDispatchFlags.hasRelaxedOrderingDependencies);
@ -1126,7 +1125,6 @@ HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenEnqueueKernelWhenProgrammingDe
EXPECT_TRUE(RelaxedOrderingCommandsHelper::verifyConditionalDataMemBbStart<FamilyType>(++lrrCmd, 0, compareAddress, 1, CompareOperation::Equal, true));
mockCmdQueueHw.enqueueBarrierWithWaitList(1, &outEvent, nullptr);
mockCmdQueueHw.flush();
EXPECT_TRUE(ultCsr.recordedDispatchFlags.hasStallingCmds);
EXPECT_FALSE(ultCsr.recordedDispatchFlags.hasRelaxedOrderingDependencies);
@ -1134,6 +1132,27 @@ HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenEnqueueKernelWhenProgrammingDe
clReleaseEvent(outEvent);
}
HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenPipeControlForIoqDependencyResolvingEnabledWhenDispatchingRelaxedOrderingThenThrow, IsAtLeastXeHpcCore) {
DebugManager.flags.ResolveDependenciesViaPipeControls.set(1);
auto &ultCsr = pDevice->getUltCommandStreamReceiver<FamilyType>();
auto directSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(ultCsr);
ultCsr.directSubmission.reset(directSubmission);
ultCsr.registerClient();
ultCsr.registerClient();
MockKernelWithInternals mockKernel(*pClDevice);
MockCommandQueueHw<FamilyType> mockCmdQueueHw{context, pClDevice, nullptr};
// First dispatch without dependencies
mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr);
EXPECT_FALSE(ultCsr.recordedDispatchFlags.hasRelaxedOrderingDependencies);
EXPECT_ANY_THROW(mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr));
}
HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenEnqueueWithPipeControlWhenSendingBbThenMarkAsStallingDispatch, IsAtLeastXeHpcCore) {
auto &ultCsr = pDevice->getUltCommandStreamReceiver<FamilyType>();
@ -1149,16 +1168,13 @@ HWTEST2_F(RelaxedOrderingEnqueueKernelTests, givenEnqueueWithPipeControlWhenSend
// warmup
mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr);
mockCmdQueueHw.flush();
mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr);
mockCmdQueueHw.flush();
EXPECT_FALSE(ultCsr.latestFlushedBatchBuffer.hasStallingCmds);
ultCsr.heapStorageRequiresRecyclingTag = true;
mockCmdQueueHw.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr);
mockCmdQueueHw.flush();
EXPECT_TRUE(ultCsr.latestFlushedBatchBuffer.hasStallingCmds);
}