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

Disable OCL RelaxedOrdering if tag update is required

Browse Source 
Related-To: NEO-7458

Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2023-03-15 12:57:15 +00:00
committed by Compute-Runtime-Automation
parent e62c5e25d5
commit 686790274d
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1487,11 +1487,13 @@ bool CommandQueueHw<GfxFamily>::isBlitAuxTranslationRequired(const MultiDispatch
template <typename GfxFamily>
bool CommandQueueHw<GfxFamily>::relaxedOrderingForGpgpuAllowed(uint32_t numWaitEvents) const {
if (DebugManager.flags.DirectSubmissionRelaxedOrdering.get() != 1) {
auto &gpgpuCsr = getGpgpuCommandStreamReceiver();
if ((DebugManager.flags.DirectSubmissionRelaxedOrdering.get() != 1) || gpgpuCsr.isRecyclingTagForHeapStorageRequired()) {
return false;
}
return RelaxedOrderingHelper::isRelaxedOrderingDispatchAllowed(getGpgpuCommandStreamReceiver(), numWaitEvents);
return RelaxedOrderingHelper::isRelaxedOrderingDispatchAllowed(gpgpuCsr, numWaitEvents);
}
} // namespace NEO

5
opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp
View File

@@ -1236,6 +1236,7 @@ HWTEST_F(CommandQueueHwTest, givenRelaxedOrderingEnabledWhenCheckingIfAllowedByC
MockCommandQueueHw<FamilyType> mockCmdQueueHw{context, pClDevice, nullptr};
auto &ultCsr = mockCmdQueueHw.getUltCommandStreamReceiver();
ultCsr.heapStorageRequiresRecyclingTag = false;
auto directSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(ultCsr);
directSubmission->relaxedOrderingEnabled = true;
@@ -1256,4 +1257,8 @@ HWTEST_F(CommandQueueHwTest, givenRelaxedOrderingEnabledWhenCheckingIfAllowedByC
EXPECT_FALSE(mockCmdQueueHw.relaxedOrderingForGpgpuAllowed(0));
EXPECT_TRUE(mockCmdQueueHw.relaxedOrderingForGpgpuAllowed(1));
ultCsr.heapStorageRequiresRecyclingTag = true;
EXPECT_FALSE(mockCmdQueueHw.relaxedOrderingForGpgpuAllowed(0));
EXPECT_FALSE(mockCmdQueueHw.relaxedOrderingForGpgpuAllowed(1));
}

2
shared/source/command_stream/command_stream_receiver.h
View File

@@ -405,6 +405,8 @@ class CommandStreamReceiver {
return globalStatelessHeap.get();
}
bool isRecyclingTagForHeapStorageRequired() const { return heapStorageRequiresRecyclingTag; }
protected:
void cleanupResources();
void printDeviceIndex();