diff --git a/level_zero/api/driver_experimental/public/zex_cmdlist.cpp b/level_zero/api/driver_experimental/public/zex_cmdlist.cpp index d047fc45c6..52147257b4 100644 --- a/level_zero/api/driver_experimental/public/zex_cmdlist.cpp +++ b/level_zero/api/driver_experimental/public/zex_cmdlist.cpp @@ -77,7 +77,7 @@ zexCommandListAppendWriteToMemory( } ze_result_t ZE_APICALL -zexCommandListAppendHostFunction( +zeCommandListAppendHostFunction( ze_command_list_handle_t hCommandList, void *pHostFunction, void *pUserData, @@ -183,7 +183,7 @@ zexCommandListAppendWriteToMemory( } ZE_APIEXPORT ze_result_t ZE_APICALL -zexCommandListAppendHostFunction( +zeCommandListAppendHostFunction( ze_command_list_handle_t hCommandList, void *pHostFunction, void *pUserData, @@ -191,7 +191,7 @@ zexCommandListAppendHostFunction( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - return L0::zexCommandListAppendHostFunction(hCommandList, pHostFunction, pUserData, pNext, hSignalEvent, numWaitEvents, phWaitEvents); + return L0::zeCommandListAppendHostFunction(hCommandList, pHostFunction, pUserData, pNext, hSignalEvent, numWaitEvents, phWaitEvents); } ZE_APIEXPORT ze_result_t ZE_APICALL diff --git a/level_zero/core/source/driver/extension_function_address.cpp b/level_zero/core/source/driver/extension_function_address.cpp index 86b6a53926..a6c8b3a6fa 100644 --- a/level_zero/core/source/driver/extension_function_address.cpp +++ b/level_zero/core/source/driver/extension_function_address.cpp @@ -87,7 +87,7 @@ void *ExtensionFunctionAddressHelper::getExtensionFunctionAddress(const std::str RETURN_FUNC_PTR_IF_EXIST(zetIntelCommandListAppendMarkerExp); RETURN_FUNC_PTR_IF_EXIST(zetDeviceEnableMetricsExp); RETURN_FUNC_PTR_IF_EXIST(zetDeviceDisableMetricsExp); - RETURN_FUNC_PTR_IF_EXIST(zexCommandListAppendHostFunction); + RETURN_FUNC_PTR_IF_EXIST(zeCommandListAppendHostFunction); RETURN_FUNC_PTR_IF_EXIST(zexCommandListAppendMemoryCopyWithParameters); RETURN_FUNC_PTR_IF_EXIST(zexCommandListAppendMemoryFillWithParameters); diff --git a/level_zero/core/test/black_box_tests/zello_host_function.cpp b/level_zero/core/test/black_box_tests/zello_host_function.cpp index 2a5c86bd4a..5e6a2a8cba 100644 --- a/level_zero/core/test/black_box_tests/zello_host_function.cpp +++ b/level_zero/core/test/black_box_tests/zello_host_function.cpp @@ -30,7 +30,7 @@ extern "C" void ZE_APICALL hostFunction2(void *pUserData) { } } -decltype(&zexCommandListAppendHostFunction) zexCommandListAppendHostFunctionFunc = nullptr; +decltype(&zeCommandListAppendHostFunction) zeCommandListAppendHostFunctionFunc = nullptr; void testHostFunction(ze_driver_handle_t &driver, ze_context_handle_t &context, ze_device_handle_t &device, bool useImmediate) { @@ -77,8 +77,8 @@ void testHostFunction(ze_driver_handle_t &driver, ze_context_handle_t &context, callbackData.array = static_cast(hostBuffer); callbackData.nElements = numElements; - SUCCESS_OR_TERMINATE(zexCommandListAppendHostFunctionFunc(cmdList, reinterpret_cast(hostFunction1), static_cast(&callbackData), nullptr, events[2], 1, &events[1])); - SUCCESS_OR_TERMINATE(zexCommandListAppendHostFunctionFunc(cmdList, reinterpret_cast(hostFunction2), static_cast(&callbackData), nullptr, events[3], 1, &events[2])); + SUCCESS_OR_TERMINATE(zeCommandListAppendHostFunctionFunc(cmdList, reinterpret_cast(hostFunction1), static_cast(&callbackData), nullptr, events[2], 1, &events[1])); + SUCCESS_OR_TERMINATE(zeCommandListAppendHostFunctionFunc(cmdList, reinterpret_cast(hostFunction2), static_cast(&callbackData), nullptr, events[3], 1, &events[2])); SUCCESS_OR_TERMINATE(zeCommandListAppendMemoryCopy(cmdList, buffer, hostBuffer, bufferSize, events[4], 1, &events[3])); void *resultHostBuffer = nullptr; @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) { auto devices = LevelZeroBlackBoxTests::zelloInitContextAndGetDevices(context, driverHandle); auto device = devices[0]; - SUCCESS_OR_TERMINATE(zeDriverGetExtensionFunctionAddress(driverHandle, "zexCommandListAppendHostFunction", reinterpret_cast(&zexCommandListAppendHostFunctionFunc))); + SUCCESS_OR_TERMINATE(zeDriverGetExtensionFunctionAddress(driverHandle, "zeCommandListAppendHostFunction", reinterpret_cast(&zeCommandListAppendHostFunctionFunc))); int testCase = LevelZeroBlackBoxTests::getParamValue(argc, argv, "", "--test-case", -1); uint32_t nTest = 2; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_host_functions.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_host_functions.cpp index bd90da73d3..910444bdf9 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_host_functions.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_host_functions.cpp @@ -30,7 +30,7 @@ HWTEST_F(HostFunctionTests, givenRegularCommandListWhenZexCommandListAppendHostF std::unique_ptr commandList(CommandList::create(productFamily, device, NEO::EngineGroupType::renderCompute, 0u, returnValue, false)); void *pHostFunction = reinterpret_cast(0xa'0000); void *pUserData = reinterpret_cast(0xd'0000); - auto result = zexCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); + auto result = zeCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); } @@ -40,7 +40,7 @@ HWTEST_F(HostFunctionTests, givenCopyCommandListWhenZexCommandListAppendHostFunc std::unique_ptr commandList(CommandList::create(productFamily, device, NEO::EngineGroupType::copy, 0u, returnValue, false)); void *pHostFunction = reinterpret_cast(0xa'0000); void *pUserData = reinterpret_cast(0xd'0000); - auto result = zexCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); + auto result = zeCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); } @@ -52,7 +52,7 @@ HWTEST_F(HostFunctionTests, givenSynchronousImmediateCommandListWhenZexCommandLi std::unique_ptr commandList(CommandList::createImmediate(productFamily, device, &queueDesc, false, NEO::EngineGroupType::renderCompute, returnValue)); void *pHostFunction = reinterpret_cast(0xa'0000); void *pUserData = reinterpret_cast(0xd'0000); - auto result = zexCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); + auto result = zeCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); } @@ -64,7 +64,7 @@ HWTEST_F(HostFunctionTests, givenAsynchronousImmediateCommandListWhenZexCommandL std::unique_ptr commandList(CommandList::createImmediate(productFamily, device, &queueDesc, false, NEO::EngineGroupType::renderCompute, returnValue)); void *pHostFunction = reinterpret_cast(0xa'0000); void *pUserData = reinterpret_cast(0xd'0000); - auto result = zexCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); + auto result = zeCommandListAppendHostFunction(commandList->toHandle(), pHostFunction, pUserData, nullptr, nullptr, 0, nullptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); } diff --git a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp index d416403acc..644c686c79 100644 --- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp @@ -1369,7 +1369,7 @@ TEST_F(DriverExperimentalApiTest, whenRetrievingApiFunctionThenExpectProperPoint decltype(&zexCounterBasedEventCloseIpcHandle) expectedCounterBasedEventCloseIpcHandle = zexCounterBasedEventCloseIpcHandle; decltype(&zexDeviceGetAggregatedCopyOffloadIncrementValue) expectedZexDeviceGetAggregatedCopyOffloadIncrementValueHandle = zexDeviceGetAggregatedCopyOffloadIncrementValue; - decltype(&zexCommandListAppendHostFunction) expectedCommandListAppendHostFunction = zexCommandListAppendHostFunction; + decltype(&zeCommandListAppendHostFunction) expectedCommandListAppendHostFunction = zeCommandListAppendHostFunction; pfnCommandListAppendMemoryCopyWithParameters expectedCommandListAppendMemoryCopyWithParameters = zexCommandListAppendMemoryCopyWithParameters; pfnCommandListAppendMemoryFillWithParameters expectedCommandListAppendMemoryFillWithParameters = zexCommandListAppendMemoryFillWithParameters; @@ -1469,8 +1469,8 @@ TEST_F(DriverExperimentalApiTest, whenRetrievingApiFunctionThenExpectProperPoint EXPECT_EQ(ZE_RESULT_SUCCESS, zeDriverGetExtensionFunctionAddress(driverHandle, "zexDeviceGetAggregatedCopyOffloadIncrementValue", &funPtr)); EXPECT_EQ(expectedZexDeviceGetAggregatedCopyOffloadIncrementValueHandle, reinterpret_cast(funPtr)); - EXPECT_EQ(ZE_RESULT_SUCCESS, zeDriverGetExtensionFunctionAddress(driverHandle, "zexCommandListAppendHostFunction", &funPtr)); - EXPECT_EQ(expectedCommandListAppendHostFunction, reinterpret_cast(funPtr)); + EXPECT_EQ(ZE_RESULT_SUCCESS, zeDriverGetExtensionFunctionAddress(driverHandle, "zeCommandListAppendHostFunction", &funPtr)); + EXPECT_EQ(expectedCommandListAppendHostFunction, reinterpret_cast(funPtr)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeDriverGetExtensionFunctionAddress(driverHandle, "zexCommandListAppendMemoryCopyWithParameters", &funPtr)); EXPECT_EQ(expectedCommandListAppendMemoryCopyWithParameters, reinterpret_cast(funPtr)); diff --git a/level_zero/include/level_zero/driver_experimental/zex_cmdlist.h b/level_zero/include/level_zero/driver_experimental/zex_cmdlist.h index 3a5c26c501..586769f8b0 100644 --- a/level_zero/include/level_zero/driver_experimental/zex_cmdlist.h +++ b/level_zero/include/level_zero/driver_experimental/zex_cmdlist.h @@ -43,7 +43,7 @@ zexCommandListAppendWriteToMemory( uint64_t data); ZE_APIEXPORT ze_result_t ZE_APICALL -zexCommandListAppendHostFunction( +zeCommandListAppendHostFunction( ze_command_list_handle_t hCommandList, void *pHostFunction, void *pUserData,