intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-25 13:33:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: serialize constructBcsEngine"

Browse Source 
This reverts commit 9c92733829.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-08-20 02:46:49 +02:00
committed by Compute-Runtime-Automation
parent 8602de7864
commit f763974ec5
3 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
opencl/source/command_queue/command_queue.cpp
View File

@@ -348,47 +348,40 @@ CommandStreamReceiver &CommandQueue::selectCsrForBuiltinOperation(const CsrSelec
}
void CommandQueue::constructBcsEngine(bool internalUsage) {
if (!bcsAllowed) {
return;
}
if (!bcsInitialized) {
const std::lock_guard lock{bcsInitMutex};
if (bcsAllowed && !bcsInitialized) {
auto &gfxCoreHelper = device->getGfxCoreHelper();
auto &neoDevice = device->getNearestGenericSubDevice(0)->getDevice();
auto &selectorCopyEngine = neoDevice.getSelectorCopyEngine();
auto bcsEngineType = EngineHelpers::getBcsEngineType(device->getRootDeviceEnvironment(), device->getDeviceBitfield(), selectorCopyEngine, internalUsage);
auto bcsIndex = EngineHelpers::getBcsIndex(bcsEngineType);
auto engineUsage = (internalUsage && gfxCoreHelper.preferInternalBcsEngine()) ? EngineUsage::internal : EngineUsage::regular;
if (!bcsInitialized) {
auto &gfxCoreHelper = device->getGfxCoreHelper();
auto &neoDevice = device->getNearestGenericSubDevice(0)->getDevice();
auto &selectorCopyEngine = neoDevice.getSelectorCopyEngine();
auto bcsEngineType = EngineHelpers::getBcsEngineType(device->getRootDeviceEnvironment(), device->getDeviceBitfield(), selectorCopyEngine, internalUsage);
auto bcsIndex = EngineHelpers::getBcsIndex(bcsEngineType);
auto engineUsage = (internalUsage && gfxCoreHelper.preferInternalBcsEngine()) ? EngineUsage::internal : EngineUsage::regular;
if (priority == QueuePriority::high) {
auto hpBcs = neoDevice.getHpCopyEngine();
if (priority == QueuePriority::high) {
auto hpBcs = neoDevice.getHpCopyEngine();
if (hpBcs) {
bcsEngineType = hpBcs->getEngineType();
engineUsage = EngineUsage::highPriority;
bcsIndex = EngineHelpers::getBcsIndex(bcsEngineType);
bcsEngines[bcsIndex] = hpBcs;
}
if (hpBcs) {
bcsEngineType = hpBcs->getEngineType();
engineUsage = EngineUsage::highPriority;
bcsIndex = EngineHelpers::getBcsIndex(bcsEngineType);
bcsEngines[bcsIndex] = hpBcs;
}
if (bcsEngines[bcsIndex] == nullptr) {
bcsEngines[bcsIndex] = neoDevice.tryGetEngine(bcsEngineType, engineUsage);
}
if (bcsEngines[bcsIndex]) {
bcsQueueEngineType = bcsEngineType;
if (gfxCoreHelper.areSecondaryContextsSupported() && !internalUsage) {
tryAssignSecondaryEngine(device->getDevice(), bcsEngines[bcsIndex], {bcsEngineType, engineUsage});
}
bcsEngines[bcsIndex]->osContext->ensureContextInitialized(false);
bcsEngines[bcsIndex]->commandStreamReceiver->initDirectSubmission();
}
bcsInitialized = true;
}
if (bcsEngines[bcsIndex] == nullptr) {
bcsEngines[bcsIndex] = neoDevice.tryGetEngine(bcsEngineType, engineUsage);
}
if (bcsEngines[bcsIndex]) {
bcsQueueEngineType = bcsEngineType;
if (gfxCoreHelper.areSecondaryContextsSupported() && !internalUsage) {
tryAssignSecondaryEngine(device->getDevice(), bcsEngines[bcsIndex], {bcsEngineType, engineUsage});
}
bcsEngines[bcsIndex]->osContext->ensureContextInitialized(false);
bcsEngines[bcsIndex]->commandStreamReceiver->initDirectSubmission();
}
bcsInitialized = true;
}
}