mirror of
https://github.com/intel/compute-runtime.git
synced 2026-01-05 09:09:04 +08:00
Revert "performance: Signal inOrder counter with pipe control, part 5"
This reverts commit 7ee8328c1d.
Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
committed by
Compute-Runtime-Automation
Compute-Runtime-Automation
parent
a3b6c1fa6d
commit
04f1e216a5
@@ -2623,88 +2623,75 @@ void CommandListCoreFamily<gfxCoreFamily>::appendWaitOnInOrderDependency(std::sh
|
||||
NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::programConditionalDataMemBatchBufferStart(*commandContainer.getCommandStream(), 0, gpuAddress, waitValue, NEO::CompareOperation::less, true, isQwordInOrderCounter(), isCopyOnly(copyOffloadOperation));
|
||||
|
||||
} else {
|
||||
auto resolveDependenciesViaPipeControls = !this->asMutable() && implicitDependency && this->dcFlushSupport;
|
||||
using MI_SEMAPHORE_WAIT = typename GfxFamily::MI_SEMAPHORE_WAIT;
|
||||
using MI_LOAD_REGISTER_IMM = typename GfxFamily::MI_LOAD_REGISTER_IMM;
|
||||
|
||||
if (NEO::debugManager.flags.ResolveDependenciesViaPipeControls.get() != -1) {
|
||||
resolveDependenciesViaPipeControls = NEO::debugManager.flags.ResolveDependenciesViaPipeControls.get();
|
||||
}
|
||||
bool indirectMode = false;
|
||||
|
||||
if (resolveDependenciesViaPipeControls) {
|
||||
NEO::PipeControlArgs args;
|
||||
args.csStallOnly = true;
|
||||
NEO::MemorySynchronizationCommands<GfxFamily>::addSingleBarrier(*commandContainer.getCommandStream(), args);
|
||||
break;
|
||||
} else {
|
||||
using MI_SEMAPHORE_WAIT = typename GfxFamily::MI_SEMAPHORE_WAIT;
|
||||
using MI_LOAD_REGISTER_IMM = typename GfxFamily::MI_LOAD_REGISTER_IMM;
|
||||
size_t inOrderPatchListIndex = std::numeric_limits<size_t>::max();
|
||||
if (isQwordInOrderCounter()) {
|
||||
indirectMode = true;
|
||||
|
||||
bool indirectMode = false;
|
||||
constexpr uint32_t firstRegister = RegisterOffsets::csGprR0;
|
||||
constexpr uint32_t secondRegister = RegisterOffsets::csGprR0 + 4;
|
||||
|
||||
size_t inOrderPatchListIndex = std::numeric_limits<size_t>::max();
|
||||
if (isQwordInOrderCounter()) {
|
||||
indirectMode = true;
|
||||
|
||||
constexpr uint32_t firstRegister = RegisterOffsets::csGprR0;
|
||||
constexpr uint32_t secondRegister = RegisterOffsets::csGprR0 + 4;
|
||||
|
||||
auto lri1 = commandContainer.getCommandStream()->template getSpaceForCmd<MI_LOAD_REGISTER_IMM>();
|
||||
auto lri2 = commandContainer.getCommandStream()->template getSpaceForCmd<MI_LOAD_REGISTER_IMM>();
|
||||
|
||||
if (!noopDispatch) {
|
||||
NEO::LriHelper<GfxFamily>::program(lri1, firstRegister, getLowPart(waitValue), true, isCopyOnly(copyOffloadOperation));
|
||||
NEO::LriHelper<GfxFamily>::program(lri2, secondRegister, getHighPart(waitValue), true, isCopyOnly(copyOffloadOperation));
|
||||
} else {
|
||||
memset(lri1, 0, sizeof(MI_LOAD_REGISTER_IMM));
|
||||
memset(lri2, 0, sizeof(MI_LOAD_REGISTER_IMM));
|
||||
}
|
||||
|
||||
if (inOrderExecInfo->isRegularCmdList()) {
|
||||
inOrderPatchListIndex = addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), lri1, lri2, waitValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::lri64b);
|
||||
if (noopDispatch) {
|
||||
disablePatching(inOrderPatchListIndex);
|
||||
}
|
||||
}
|
||||
if (outListCommands != nullptr) {
|
||||
auto &lri1ToPatch = outListCommands->emplace_back();
|
||||
lri1ToPatch.type = CommandToPatch::CbWaitEventLoadRegisterImm;
|
||||
lri1ToPatch.pDestination = lri1;
|
||||
lri1ToPatch.inOrderPatchListIndex = inOrderPatchListIndex;
|
||||
lri1ToPatch.offset = firstRegister;
|
||||
|
||||
auto &lri2ToPatch = outListCommands->emplace_back();
|
||||
lri2ToPatch.type = CommandToPatch::CbWaitEventLoadRegisterImm;
|
||||
lri2ToPatch.pDestination = lri2;
|
||||
lri2ToPatch.inOrderPatchListIndex = inOrderPatchListIndex;
|
||||
lri2ToPatch.offset = secondRegister;
|
||||
}
|
||||
}
|
||||
|
||||
auto semaphoreCommand = reinterpret_cast<MI_SEMAPHORE_WAIT *>(commandContainer.getCommandStream()->getSpace(sizeof(MI_SEMAPHORE_WAIT)));
|
||||
auto lri1 = commandContainer.getCommandStream()->template getSpaceForCmd<MI_LOAD_REGISTER_IMM>();
|
||||
auto lri2 = commandContainer.getCommandStream()->template getSpaceForCmd<MI_LOAD_REGISTER_IMM>();
|
||||
|
||||
if (!noopDispatch) {
|
||||
NEO::EncodeSemaphore<GfxFamily>::programMiSemaphoreWait(semaphoreCommand, gpuAddress, waitValue, COMPARE_OPERATION::COMPARE_OPERATION_SAD_GREATER_THAN_OR_EQUAL_SDD,
|
||||
false, true, isQwordInOrderCounter(), indirectMode, false);
|
||||
NEO::LriHelper<GfxFamily>::program(lri1, firstRegister, getLowPart(waitValue), true, isCopyOnly(copyOffloadOperation));
|
||||
NEO::LriHelper<GfxFamily>::program(lri2, secondRegister, getHighPart(waitValue), true, isCopyOnly(copyOffloadOperation));
|
||||
} else {
|
||||
memset(semaphoreCommand, 0, sizeof(MI_SEMAPHORE_WAIT));
|
||||
memset(lri1, 0, sizeof(MI_LOAD_REGISTER_IMM));
|
||||
memset(lri2, 0, sizeof(MI_LOAD_REGISTER_IMM));
|
||||
}
|
||||
|
||||
if (inOrderExecInfo->isRegularCmdList() && !isQwordInOrderCounter()) {
|
||||
inOrderPatchListIndex = addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), semaphoreCommand, nullptr, waitValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::semaphore);
|
||||
if (inOrderExecInfo->isRegularCmdList()) {
|
||||
inOrderPatchListIndex = addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), lri1, lri2, waitValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::lri64b);
|
||||
if (noopDispatch) {
|
||||
disablePatching(inOrderPatchListIndex);
|
||||
}
|
||||
} else {
|
||||
inOrderPatchListIndex = std::numeric_limits<size_t>::max();
|
||||
}
|
||||
|
||||
if (outListCommands != nullptr) {
|
||||
auto &semaphoreWaitPatch = outListCommands->emplace_back();
|
||||
semaphoreWaitPatch.type = CommandToPatch::CbWaitEventSemaphoreWait;
|
||||
semaphoreWaitPatch.pDestination = semaphoreCommand;
|
||||
semaphoreWaitPatch.offset = i * immWriteOffset;
|
||||
semaphoreWaitPatch.inOrderPatchListIndex = inOrderPatchListIndex;
|
||||
auto &lri1ToPatch = outListCommands->emplace_back();
|
||||
lri1ToPatch.type = CommandToPatch::CbWaitEventLoadRegisterImm;
|
||||
lri1ToPatch.pDestination = lri1;
|
||||
lri1ToPatch.inOrderPatchListIndex = inOrderPatchListIndex;
|
||||
lri1ToPatch.offset = firstRegister;
|
||||
|
||||
auto &lri2ToPatch = outListCommands->emplace_back();
|
||||
lri2ToPatch.type = CommandToPatch::CbWaitEventLoadRegisterImm;
|
||||
lri2ToPatch.pDestination = lri2;
|
||||
lri2ToPatch.inOrderPatchListIndex = inOrderPatchListIndex;
|
||||
lri2ToPatch.offset = secondRegister;
|
||||
}
|
||||
}
|
||||
|
||||
auto semaphoreCommand = reinterpret_cast<MI_SEMAPHORE_WAIT *>(commandContainer.getCommandStream()->getSpace(sizeof(MI_SEMAPHORE_WAIT)));
|
||||
|
||||
if (!noopDispatch) {
|
||||
NEO::EncodeSemaphore<GfxFamily>::programMiSemaphoreWait(semaphoreCommand, gpuAddress, waitValue, COMPARE_OPERATION::COMPARE_OPERATION_SAD_GREATER_THAN_OR_EQUAL_SDD,
|
||||
false, true, isQwordInOrderCounter(), indirectMode, false);
|
||||
} else {
|
||||
memset(semaphoreCommand, 0, sizeof(MI_SEMAPHORE_WAIT));
|
||||
}
|
||||
|
||||
if (inOrderExecInfo->isRegularCmdList() && !isQwordInOrderCounter()) {
|
||||
inOrderPatchListIndex = addCmdForPatching((implicitDependency ? nullptr : &inOrderExecInfo), semaphoreCommand, nullptr, waitValue, NEO::InOrderPatchCommandHelpers::PatchCmdType::semaphore);
|
||||
if (noopDispatch) {
|
||||
disablePatching(inOrderPatchListIndex);
|
||||
}
|
||||
} else {
|
||||
inOrderPatchListIndex = std::numeric_limits<size_t>::max();
|
||||
}
|
||||
|
||||
if (outListCommands != nullptr) {
|
||||
auto &semaphoreWaitPatch = outListCommands->emplace_back();
|
||||
semaphoreWaitPatch.type = CommandToPatch::CbWaitEventSemaphoreWait;
|
||||
semaphoreWaitPatch.pDestination = semaphoreCommand;
|
||||
semaphoreWaitPatch.offset = i * immWriteOffset;
|
||||
semaphoreWaitPatch.inOrderPatchListIndex = inOrderPatchListIndex;
|
||||
}
|
||||
}
|
||||
|
||||
gpuAddress += immWriteOffset;
|
||||
|
||||
Reference in New Issue
Block a user