From 8ff34fea294bd8aad8c3d3c56e2aac5c357b78b8 Mon Sep 17 00:00:00 2001 From: Katarzyna Cencelewska Date: Tue, 24 May 2022 11:20:09 +0000 Subject: [PATCH] Fix typo -engineGroupTyp to engineGroupType -remove gap between commits to use same desc.ordinal in createCommandQueue Signed-off-by: Katarzyna Cencelewska --- level_zero/core/source/device/device_imp.cpp | 6 +++--- opencl/source/command_queue/command_queue.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp index c8453f1a7e..1e7c8150f9 100644 --- a/level_zero/core/source/device/device_imp.cpp +++ b/level_zero/core/source/device/device_imp.cpp @@ -205,10 +205,10 @@ void DeviceImp::adjustCommandQueueDesc(ze_command_queue_desc_t &desc) { const NEO::HwHelper &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily); auto &engineGroups = getActiveDevice()->getRegularEngineGroups(); - auto engineGroupTyp = hwHelper.getEngineGroupType(static_cast(nodeOrdinal), NEO::EngineUsage::Regular, hwInfo); + auto engineGroupType = hwHelper.getEngineGroupType(static_cast(nodeOrdinal), NEO::EngineUsage::Regular, hwInfo); uint32_t currentEngineIndex = 0u; for (const auto &engine : engineGroups) { - if (engine.engineGroupType == engineGroupTyp) { + if (engine.engineGroupType == engineGroupType) { desc.ordinal = currentEngineIndex; break; } @@ -229,7 +229,7 @@ ze_result_t DeviceImp::createCommandQueue(const ze_command_queue_desc_t *desc, ze_command_queue_desc_t commandQueueDesc = *desc; adjustCommandQueueDesc(commandQueueDesc); - if (!this->isQueueGroupOrdinalValid(desc->ordinal)) { + if (!this->isQueueGroupOrdinalValid(commandQueueDesc.ordinal)) { return ZE_RESULT_ERROR_INVALID_ARGUMENT; } diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp index e921c0e533..e6130a8c14 100644 --- a/opencl/source/command_queue/command_queue.cpp +++ b/opencl/source/command_queue/command_queue.cpp @@ -1007,8 +1007,8 @@ void CommandQueue::processProperties(const cl_queue_properties *properties) { const HardwareInfo &hwInfo = getDevice().getHardwareInfo(); const HwHelper &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily); - auto engineGroupTyp = hwHelper.getEngineGroupType(static_cast(nodeOrdinal), EngineUsage::Regular, hwInfo); - selectedQueueFamilyIndex = static_cast(getDevice().getEngineGroupIndexFromEngineGroupType(engineGroupTyp)); + auto engineGroupType = hwHelper.getEngineGroupType(static_cast(nodeOrdinal), EngineUsage::Regular, hwInfo); + selectedQueueFamilyIndex = static_cast(getDevice().getEngineGroupIndexFromEngineGroupType(engineGroupType)); const auto &engines = getDevice().getRegularEngineGroups()[selectedQueueFamilyIndex].engines; for (const auto &engine : engines) { if (engine.getEngineType() == static_cast(nodeOrdinal)) {