From c7b7039fc39dfe33b3218b233f970f33bbf1d988 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Thu, 27 Oct 2022 13:34:44 +0000 Subject: [PATCH] Unify naming - hSignalEvent Signed-off-by: Kamil Kopryk --- level_zero/core/source/cmdlist/cmdlist.h | 2 +- level_zero/core/source/cmdlist/cmdlist_hw.h | 2 +- level_zero/core/source/cmdlist/cmdlist_hw.inl | 6 +++--- .../core/source/cmdlist/cmdlist_hw_immediate.h | 4 ++-- .../core/source/cmdlist/cmdlist_hw_immediate.inl | 12 ++++++------ level_zero/core/test/unit_tests/mocks/mock_cmdlist.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h index 3132209e02..d995e97fc0 100644 --- a/level_zero/core/source/cmdlist/cmdlist.h +++ b/level_zero/core/source/cmdlist/cmdlist.h @@ -100,7 +100,7 @@ struct CommandList : _ze_command_list_handle_t { const CmdListKernelLaunchParams &launchParams) = 0; virtual ze_result_t appendLaunchCooperativeKernel(ze_kernel_handle_t kernelHandle, const ze_group_count_t *launchKernelArgs, - ze_event_handle_t signalEvent, + ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *waitEventHandles) = 0; virtual ze_result_t appendLaunchKernelIndirect(ze_kernel_handle_t kernelHandle, diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h index 1d9b41939c..8c52989230 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw.h @@ -98,7 +98,7 @@ struct CommandListCoreFamily : CommandListImp { const CmdListKernelLaunchParams &launchParams) override; ze_result_t appendLaunchCooperativeKernel(ze_kernel_handle_t kernelHandle, const ze_group_count_t *launchKernelArgs, - ze_event_handle_t signalEvent, + ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *waitEventHandles) override; ze_result_t appendLaunchKernelIndirect(ze_kernel_handle_t kernelHandle, diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl index 933382325d..0e8fdd58ac 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -277,7 +277,7 @@ ze_result_t CommandListCoreFamily::appendLaunchKernel(ze_kernel_h template ze_result_t CommandListCoreFamily::appendLaunchCooperativeKernel(ze_kernel_handle_t kernelHandle, const ze_group_count_t *launchKernelArgs, - ze_event_handle_t signalEvent, + ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *waitEventHandles) { @@ -287,8 +287,8 @@ ze_result_t CommandListCoreFamily::appendLaunchCooperativeKernel( } Event *event = nullptr; - if (signalEvent) { - event = Event::fromHandle(signalEvent); + if (hSignalEvent) { + event = Event::fromHandle(hSignalEvent); event->resetKernelCountAndPacketUsedCount(); } diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h index 935ad40050..6b79dceffc 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h @@ -120,7 +120,7 @@ struct CommandListCoreFamilyImmediate : public CommandListCoreFamily::appendMemoryRangesBar template ze_result_t CommandListCoreFamilyImmediate::appendLaunchCooperativeKernel(ze_kernel_handle_t kernelHandle, const ze_group_count_t *launchKernelArgs, - ze_event_handle_t signalEvent, + ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *waitEventHandles) { if (this->isFlushTaskSubmissionEnabled) { checkAvailableSpace(); } - auto ret = CommandListCoreFamily::appendLaunchCooperativeKernel(kernelHandle, launchKernelArgs, signalEvent, numWaitEvents, waitEventHandles); - return flushImmediate(ret, true, signalEvent); + auto ret = CommandListCoreFamily::appendLaunchCooperativeKernel(kernelHandle, launchKernelArgs, hSignalEvent, numWaitEvents, waitEventHandles); + return flushImmediate(ret, true, hSignalEvent); } template -ze_result_t CommandListCoreFamilyImmediate::flushImmediate(ze_result_t inputRet, bool performMigration, ze_event_handle_t signalEvent) { +ze_result_t CommandListCoreFamilyImmediate::flushImmediate(ze_result_t inputRet, bool performMigration, ze_event_handle_t hSignalEvent) { if (inputRet == ZE_RESULT_SUCCESS) { if (this->isFlushTaskSubmissionEnabled) { inputRet = executeCommandListImmediateWithFlushTask(performMigration); @@ -565,8 +565,8 @@ ze_result_t CommandListCoreFamilyImmediate::flushImmediate(ze_res inputRet = executeCommandListImmediate(performMigration); } } - if (signalEvent) { - Event::fromHandle(signalEvent)->setCsr(this->csr); + if (hSignalEvent) { + Event::fromHandle(hSignalEvent)->setCsr(this->csr); } return inputRet; } diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h index 3497fa29b5..a48007667b 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h +++ b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h @@ -206,7 +206,7 @@ struct MockCommandList : public CommandList { ADDMETHOD_NOBASE(appendLaunchCooperativeKernel, ze_result_t, ZE_RESULT_SUCCESS, (ze_kernel_handle_t kernelHandle, const ze_group_count_t *launchKernelArgs, - ze_event_handle_t signalEvent, + ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *waitEventHandles));