From ecc96a9ab4c7f2aea1bc8662069eca20085f2281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Zwoli=C5=84ski?= Date: Fri, 28 Mar 2025 13:37:35 +0000 Subject: [PATCH] refactor: Switch EventDescriptor initialization to designated initializers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related-To: NEO-12287 Signed-off-by: Fabian Zwoliński --- .../driver_experimental/public/zex_event.cpp | 26 +++++++++---------- level_zero/core/source/event/event.cpp | 26 +++++++++---------- level_zero/core/source/event/event_impl.inl | 26 +++++++++---------- .../fixtures/in_order_cmd_list_fixture.h | 26 +++++++++---------- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/level_zero/api/driver_experimental/public/zex_event.cpp b/level_zero/api/driver_experimental/public/zex_event.cpp index be69f3fdd4..e03e9f8be8 100644 --- a/level_zero/api/driver_experimental/public/zex_event.cpp +++ b/level_zero/api/driver_experimental/public/zex_event.cpp @@ -73,19 +73,19 @@ zexCounterBasedEventCreate2(ze_context_handle_t hContext, ze_device_handle_t hDe } EventDescriptor eventDescriptor = { - nullptr, // eventPoolAllocation - desc->pNext, // extensions - 0, // totalEventSize - EventPacketsCount::maxKernelSplit, // maxKernelCount - 1, // maxPacketsCount - inputCbFlags, // counterBasedFlags - 0, // index - signalScope, // signalScope - desc->waitScope, // waitScope - timestampFlag, // timestampPool - mappedTimestampFlag, // kernelMappedTsPoolFlag - false, // importedIpcPool - ipcFlag, // ipcPool + .eventPoolAllocation = nullptr, + .extensions = desc->pNext, + .totalEventSize = 0, + .maxKernelCount = EventPacketsCount::maxKernelSplit, + .maxPacketsCount = 1, + .counterBasedFlags = inputCbFlags, + .index = 0, + .signalScope = signalScope, + .waitScope = desc->waitScope, + .timestampPool = timestampFlag, + .kernelMappedTsPoolFlag = mappedTimestampFlag, + .importedIpcPool = false, + .ipcPool = ipcFlag, }; ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/core/source/event/event.cpp b/level_zero/core/source/event/event.cpp index a2c9299117..5ba3c23944 100644 --- a/level_zero/core/source/event/event.cpp +++ b/level_zero/core/source/event/event.cpp @@ -308,19 +308,19 @@ ze_result_t Event::openCounterBasedIpcHandle(const IpcCounterBasedEventData &ipc ipcData.counterValue, ipcData.devicePartitions, ipcData.hostPartitions); const EventDescriptor eventDescriptor = { - nullptr, // eventPoolAllocation - nullptr, // extensions - 0, // totalEventSize - EventPacketsCount::maxKernelSplit, // maxKernelCount - 1, // maxPacketsCount - ipcData.counterBasedFlags, // counterBasedFlags - 0, // index - ipcData.signalScopeFlags, // signalScope - ipcData.waitScopeFlags, // waitScope - false, // timestampPool - false, // kernelMappedTsPoolFlag - true, // importedIpcPool - false, // ipcPool + .eventPoolAllocation = nullptr, + .extensions = nullptr, + .totalEventSize = 0, + .maxKernelCount = EventPacketsCount::maxKernelSplit, + .maxPacketsCount = 1, + .counterBasedFlags = ipcData.counterBasedFlags, + .index = 0, + .signalScope = ipcData.signalScopeFlags, + .waitScope = ipcData.waitScopeFlags, + .timestampPool = false, + .kernelMappedTsPoolFlag = false, + .importedIpcPool = true, + .ipcPool = false, }; ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/core/source/event/event_impl.inl b/level_zero/core/source/event/event_impl.inl index 6435f208ba..902c3949c8 100644 --- a/level_zero/core/source/event/event_impl.inl +++ b/level_zero/core/source/event/event_impl.inl @@ -119,19 +119,19 @@ Event *Event::create(const EventDescriptor &eventDescriptor, Device *device, ze_ template Event *Event::create(EventPool *eventPool, const ze_event_desc_t *desc, Device *device) { EventDescriptor eventDescriptor = { - &eventPool->getAllocation(), // eventPoolAllocation - desc->pNext, // extensions - eventPool->getEventSize(), // totalEventSize - eventPool->getMaxKernelCount(), // maxKernelCount - eventPool->getEventMaxPackets(), // maxPacketsCount - eventPool->getCounterBasedFlags(), // counterBasedFlags - desc->index, // index - desc->signal, // signalScope - desc->wait, // waitScope - eventPool->isEventPoolTimestampFlagSet(), // timestampPool - eventPool->isEventPoolKernelMappedTsFlagSet(), // kernelMappedTsPoolFlag - eventPool->getImportedIpcPool(), // importedIpcPool - eventPool->isIpcPoolFlagSet(), // ipcPool + .eventPoolAllocation = &eventPool->getAllocation(), + .extensions = desc->pNext, + .totalEventSize = eventPool->getEventSize(), + .maxKernelCount = eventPool->getMaxKernelCount(), + .maxPacketsCount = eventPool->getEventMaxPackets(), + .counterBasedFlags = eventPool->getCounterBasedFlags(), + .index = desc->index, + .signalScope = desc->signal, + .waitScope = desc->wait, + .timestampPool = eventPool->isEventPoolTimestampFlagSet(), + .kernelMappedTsPoolFlag = eventPool->isEventPoolKernelMappedTsFlagSet(), + .importedIpcPool = eventPool->getImportedIpcPool(), + .ipcPool = eventPool->isIpcPoolFlagSet(), }; if (eventPool->getCounterBasedFlags() != 0 && standaloneInOrderTimestampAllocationEnabled()) { diff --git a/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h b/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h index d8e9a98d26..97b3656cf5 100644 --- a/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h @@ -109,19 +109,19 @@ struct InOrderCmdListFixture : public ::Test { constexpr uint32_t counterBasedFlags = (ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_IMMEDIATE | ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_NON_IMMEDIATE); const EventDescriptor eventDescriptor = { - nullptr, // eventPoolAllocation - pNext, // extension - 0, // totalEventSize - EventPacketsCount::maxKernelSplit, // maxKernelCount - 0, // maxPacketsCount - counterBasedFlags, // counterBasedFlags - 0, // index - 0, // signalScope - 0, // waitScope - false, // timestampPool - false, // kernelMappedTsPoolFlag - false, // importedIpcPool - false, // ipcPool + .eventPoolAllocation = nullptr, + .extensions = pNext, + .totalEventSize = 0, + .maxKernelCount = EventPacketsCount::maxKernelSplit, + .maxPacketsCount = 0, + .counterBasedFlags = counterBasedFlags, + .index = 0, + .signalScope = 0, + .waitScope = 0, + .timestampPool = false, + .kernelMappedTsPoolFlag = false, + .importedIpcPool = false, + .ipcPool = false, }; standaloneCbEventStorage.push_back(1);