fix: expose preview L0 API functions from L0 namespace

Related-To: NEO-14560
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

level_zero/api/core/preview_api_entrypoints.h

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "level_zero/ze_intel_gpu.h"
+
+namespace L0 {
+
+ze_context_handle_t zeDriverGetDefaultContext(ze_driver_handle_t hDriver);
+
+ze_result_t zeDeviceSynchronize(ze_device_handle_t hDevice);
+
+ze_result_t zeCommandListAppendLaunchKernelWithParameters(
+    ze_command_list_handle_t hCommandList,
+    ze_kernel_handle_t hKernel,
+    const ze_group_count_t *pGroupCounts,
+    const void *pNext,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents);
+
+ze_result_t zeCommandListAppendLaunchKernelWithArguments(
+    ze_command_list_handle_t hCommandList,
+    ze_kernel_handle_t hKernel,
+    const ze_group_count_t groupCounts,
+    const ze_group_size_t groupSizes,
+    void **pArguments,
+    const void *pNext,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents
+
+);
+
+ze_result_t zerGetLastErrorDescription(const char **ppString);
+
+uint32_t zerTranslateDeviceHandleToIdentifier(ze_device_handle_t device);
+
+ze_device_handle_t zerTranslateIdentifierToDeviceHandle(uint32_t identifier);
+
+ze_context_handle_t zerGetDefaultContext();
+} // namespace L0

level_zero/core/source/driver/extension_function_address.cpp

@@ -7,6 +7,7 @@
 
 #include "level_zero/core/source/driver/extension_function_address.h"
 
+#include "level_zero/api/core/preview_api_entrypoints.h"
 #include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/driver_experimental/mcl_ext/zex_mutable_cmdlist_ext.h"
 #include "level_zero/driver_experimental/zex_api.h"
@@ -27,20 +28,28 @@ void *ExtensionFunctionAddressHelper::getExtensionFunctionAddress(const std::str
         }                                 \
     }
 
+#define RETURN_L0_FUNC_PTR_IF_EXIST(name)     \
+    {                                         \
+        if (functionName == #name) {          \
+            void *ret = ((void *)(L0::name)); \
+            return ret;                       \
+        }                                     \
+    }
+
     RETURN_FUNC_PTR_IF_EXIST(zexDriverImportExternalPointer);
     RETURN_FUNC_PTR_IF_EXIST(zexDriverReleaseImportedPointer);
     RETURN_FUNC_PTR_IF_EXIST(zexDriverGetHostPointerBaseAddress);
-    RETURN_FUNC_PTR_IF_EXIST(zeDriverGetDefaultContext);
-    RETURN_FUNC_PTR_IF_EXIST(zerGetDefaultContext);
-    RETURN_FUNC_PTR_IF_EXIST(zerGetLastErrorDescription);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zeDriverGetDefaultContext);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zerGetDefaultContext);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zerGetLastErrorDescription);
 
-    RETURN_FUNC_PTR_IF_EXIST(zerTranslateDeviceHandleToIdentifier);
-    RETURN_FUNC_PTR_IF_EXIST(zerTranslateIdentifierToDeviceHandle);
-    RETURN_FUNC_PTR_IF_EXIST(zeDeviceSynchronize);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zerTranslateDeviceHandleToIdentifier);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zerTranslateIdentifierToDeviceHandle);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zeDeviceSynchronize);
     RETURN_FUNC_PTR_IF_EXIST(zeDeviceGetPriorityLevels);
 
-    RETURN_FUNC_PTR_IF_EXIST(zeCommandListAppendLaunchKernelWithArguments);
-    RETURN_FUNC_PTR_IF_EXIST(zeCommandListAppendLaunchKernelWithParameters);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zeCommandListAppendLaunchKernelWithArguments);
+    RETURN_L0_FUNC_PTR_IF_EXIST(zeCommandListAppendLaunchKernelWithParameters);
 
     RETURN_FUNC_PTR_IF_EXIST(zexKernelGetBaseAddress);
     RETURN_FUNC_PTR_IF_EXIST(zexKernelGetArgumentSize);
@@ -146,6 +155,7 @@ void *ExtensionFunctionAddressHelper::getExtensionFunctionAddress(const std::str
     RETURN_FUNC_PTR_IF_EXIST(zeGraphDumpContentsExp);
 
 #undef RETURN_FUNC_PTR_IF_EXIST
+#undef RETURN_L0_FUNC_PTR_IF_EXIST
 
     return ExtensionFunctionAddressHelper::getAdditionalExtensionFunctionAddress(functionName);
 }

level_zero/core/test/unit_tests/sources/driver/test_driver.cpp

@@ -32,6 +32,7 @@
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "level_zero/api/core/preview_api_entrypoints.h"
 #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/driver/driver_imp.h"
@@ -835,7 +836,7 @@ TEST(DriverTest, givenDriverWhenGetDefaultContextApiIsCalledThenProperHandleIsRe
     auto driverHandle = whiteboxCast(static_cast<::L0::DriverHandleImp *>(DriverHandle::create(std::move(devices), envVariables, &returnValue)));
     EXPECT_NE(nullptr, driverHandle);
 
-    auto defaultContext = zeDriverGetDefaultContext(driverHandle);
+    auto defaultContext = ::zeDriverGetDefaultContext(driverHandle);
 
     EXPECT_NE(nullptr, defaultContext);
 
@@ -1315,16 +1316,16 @@ TEST_F(DriverExperimentalApiTest, whenRetrievingApiFunctionThenExpectProperPoint
     decltype(&zexDriverImportExternalPointer) expectedImport = zexDriverImportExternalPointer;
     decltype(&zexDriverReleaseImportedPointer) expectedRelease = zexDriverReleaseImportedPointer;
     decltype(&zexDriverGetHostPointerBaseAddress) expectedGet = zexDriverGetHostPointerBaseAddress;
-    decltype(&zeDriverGetDefaultContext) expectedZeDriverGetDefaultContext = zeDriverGetDefaultContext;
-    decltype(&zerGetDefaultContext) expectedZerGetDefaultContext = zerGetDefaultContext;
-    decltype(&zerGetLastErrorDescription) expectedZerGetLastErrorDescription = zerGetLastErrorDescription;
+    decltype(&zeDriverGetDefaultContext) expectedZeDriverGetDefaultContext = L0::zeDriverGetDefaultContext;
+    decltype(&zerGetDefaultContext) expectedZerGetDefaultContext = L0::zerGetDefaultContext;
+    decltype(&zerGetLastErrorDescription) expectedZerGetLastErrorDescription = L0::zerGetLastErrorDescription;
 
-    decltype(&zerTranslateDeviceHandleToIdentifier) expectedZerTranslateDeviceHandleToIdentifier = zerTranslateDeviceHandleToIdentifier;
-    decltype(&zerTranslateIdentifierToDeviceHandle) expectedZerTranslateIdentifierToDeviceHandle = zerTranslateIdentifierToDeviceHandle;
-    decltype(&zeDeviceSynchronize) expectedZeDeviceSynchronize = zeDeviceSynchronize;
+    decltype(&zerTranslateDeviceHandleToIdentifier) expectedZerTranslateDeviceHandleToIdentifier = L0::zerTranslateDeviceHandleToIdentifier;
+    decltype(&zerTranslateIdentifierToDeviceHandle) expectedZerTranslateIdentifierToDeviceHandle = L0::zerTranslateIdentifierToDeviceHandle;
+    decltype(&zeDeviceSynchronize) expectedZeDeviceSynchronize = L0::zeDeviceSynchronize;
 
-    decltype(&zeCommandListAppendLaunchKernelWithArguments) expectedZeCommandListAppendLaunchKernelWithArguments = zeCommandListAppendLaunchKernelWithArguments;
-    decltype(&zeCommandListAppendLaunchKernelWithParameters) expectedZeCommandListAppendLaunchKernelWithParameters = zeCommandListAppendLaunchKernelWithParameters;
+    decltype(&zeCommandListAppendLaunchKernelWithArguments) expectedZeCommandListAppendLaunchKernelWithArguments = L0::zeCommandListAppendLaunchKernelWithArguments;
+    decltype(&zeCommandListAppendLaunchKernelWithParameters) expectedZeCommandListAppendLaunchKernelWithParameters = L0::zeCommandListAppendLaunchKernelWithParameters;
 
     decltype(&zexKernelGetBaseAddress) expectedKernelGetBaseAddress = zexKernelGetBaseAddress;
     decltype(&zeIntelGetDriverVersionString) expectedIntelGetDriverVersionString = zeIntelGetDriverVersionString;