-engineGroupTyp to engineGroupType
-remove gap between commits to use same desc.ordinal in createCommandQueue

Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
This commit is contained in:
Katarzyna Cencelewska 2022-05-24 11:20:09 +00:00 committed by Compute-Runtime-Automation
parent f26164776e
commit 8ff34fea29
2 changed files with 5 additions and 5 deletions

View File

@ -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<aub_stream::EngineType>(nodeOrdinal), NEO::EngineUsage::Regular, hwInfo);
auto engineGroupType = hwHelper.getEngineGroupType(static_cast<aub_stream::EngineType>(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;
}

View File

@ -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<aub_stream::EngineType>(nodeOrdinal), EngineUsage::Regular, hwInfo);
selectedQueueFamilyIndex = static_cast<cl_uint>(getDevice().getEngineGroupIndexFromEngineGroupType(engineGroupTyp));
auto engineGroupType = hwHelper.getEngineGroupType(static_cast<aub_stream::EngineType>(nodeOrdinal), EngineUsage::Regular, hwInfo);
selectedQueueFamilyIndex = static_cast<cl_uint>(getDevice().getEngineGroupIndexFromEngineGroupType(engineGroupType));
const auto &engines = getDevice().getRegularEngineGroups()[selectedQueueFamilyIndex].engines;
for (const auto &engine : engines) {
if (engine.getEngineType() == static_cast<aub_stream::EngineType>(nodeOrdinal)) {