Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "performance: Signal inOrder counter with pipe control, part 2" 

This reverts commit 136e5b4f6c.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2024-12-20 04:11:47 +01:00 committed by Compute-Runtime-Automation
parent f35d620e06
commit 61aa75d6a9
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl
View File

@ -284,7 +284,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
std::list<void *> additionalCommands; std::list<void *> additionalCommands;
if (compactEvent && !this->isImmediateType()) { if (compactEvent) {
appendEventForProfilingAllWalkers(compactEvent, nullptr, launchParams.outListCommands, true, true, launchParams.omitAddingEventResidency, false); appendEventForProfilingAllWalkers(compactEvent, nullptr, launchParams.outListCommands, true, true, launchParams.omitAddingEventResidency, false);
} }
@ -299,20 +299,12 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec); inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec);
if (inOrderExecSignalRequired) { if (inOrderExecSignalRequired) {
if (!compactEvent || !this->isImmediateType() || !compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset()) { if (!compactEvent || !this->isImmediateType() || (!compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset())) {
if (inOrderNonWalkerSignalling) { if (inOrderNonWalkerSignalling) {
if (!eventForInOrderExec->getAllocation(this->device) && Event::standaloneInOrderTimestampAllocationEnabled()) { if (!eventForInOrderExec->getAllocation(this->device) && Event::standaloneInOrderTimestampAllocationEnabled()) {
eventForInOrderExec->resetInOrderTimestampNode(device->getInOrderTimestampAllocator()->getTag()); eventForInOrderExec->resetInOrderTimestampNode(device->getInOrderTimestampAllocator()->getTag());
} }
if (!compactEvent || !this->isImmediateType() || !compactEvent->isCounterBased()) { dispatchEventPostSyncOperation(eventForInOrderExec, nullptr, launchParams.outListCommands, Event::STATE_CLEARED, false, false, false, false, false);
dispatchEventPostSyncOperation(eventForInOrderExec, nullptr, launchParams.outListCommands, Event::STATE_CLEARED, false, false, false, false, false);
} else {
eventAddress = eventForInOrderExec->getPacketAddress(this->device);
isTimestampEvent = true;
if (!launchParams.omitAddingEventResidency) {
commandContainer.addToResidencyContainer(eventForInOrderExec->getAllocation(this->device));
}
}
} else { } else {
inOrderCounterValue = this->inOrderExecInfo->getCounterValue() + getInOrderIncrementValue(); inOrderCounterValue = this->inOrderExecInfo->getCounterValue() + getInOrderIncrementValue();
inOrderExecInfo = this->inOrderExecInfo.get(); inOrderExecInfo = this->inOrderExecInfo.get();
@ -392,7 +384,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
} }
if (!launchParams.makeKernelCommandView) { if (!launchParams.makeKernelCommandView) {
if ((compactEvent && (!compactEvent->isCounterBased() || !this->isImmediateType()))) { if ((compactEvent && (!compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset() || !this->isImmediateType()))) {
void **syncCmdBuffer = nullptr; void **syncCmdBuffer = nullptr;
if (launchParams.outSyncCommand != nullptr) { if (launchParams.outSyncCommand != nullptr) {
launchParams.outSyncCommand->type = CommandToPatch::SignalEventPostSyncPipeControl; launchParams.outSyncCommand->type = CommandToPatch::SignalEventPostSyncPipeControl;
@ -416,7 +408,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
if (inOrderExecSignalRequired) { if (inOrderExecSignalRequired) {
if (inOrderNonWalkerSignalling) { if (inOrderNonWalkerSignalling) {
if (!launchParams.skipInOrderNonWalkerSignaling) { if (!launchParams.skipInOrderNonWalkerSignaling) {
if ((compactEvent && (compactEvent->isCounterBased() && this->isImmediateType()))) { if ((compactEvent && (compactEvent->isCounterBased() && !compactEvent->isUsingContextEndOffset() && this->isImmediateType()))) {
appendSignalInOrderDependencyCounter(eventForInOrderExec, false, true); appendSignalInOrderDependencyCounter(eventForInOrderExec, false, true);
} else { } else {
appendWaitOnSingleEvent(eventForInOrderExec, launchParams.outListCommands, false, false, CommandToPatch::CbEventTimestampPostSyncSemaphoreWait); appendWaitOnSingleEvent(eventForInOrderExec, launchParams.outListCommands, false, false, CommandToPatch::CbEventTimestampPostSyncSemaphoreWait);