Wrap L0 exported functions to prevent symbol collision

Signed-off-by: Kacper Nowak <[email protected]>

Author: km-nowak

level_zero/api/core/CMakeLists.txt

@@ -1,24 +1,25 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_API
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_context.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_copy.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_context_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_copy_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_all_api_entrypoints.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_device.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_event.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_fence.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_image.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_memory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_module.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_device_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_event_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_fence_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_image_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_memory_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_module_api_entrypoints.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler_api_entrypoints.h
 )
 set_property(GLOBAL PROPERTY L0_SRCS_API ${L0_SRCS_API})

level_zero/api/core/ze_barrier.cpp

@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020-2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include <level_zero/ze_api.h>
+
+namespace L0 {
+ze_result_t zeCommandListAppendBarrier(
+    ze_command_list_handle_t hCommandList,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::CommandList::fromHandle(hCommandList)->appendBarrier(hSignalEvent, numWaitEvents, phWaitEvents);
+}
+
+ze_result_t zeCommandListAppendMemoryRangesBarrier(
+    ze_command_list_handle_t hCommandList,
+    uint32_t numRanges,
+    const size_t *pRangeSizes,
+    const void **pRanges,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::CommandList::fromHandle(hCommandList)->appendMemoryRangesBarrier(numRanges, pRangeSizes, pRanges, hSignalEvent, numWaitEvents, phWaitEvents);
+}
+
+ze_result_t zeDeviceSystemBarrier(
+    ze_device_handle_t hDevice) {
+    return L0::Device::fromHandle(hDevice)->systemBarrier();
+}
+
+} // namespace L0
+
+extern "C" {
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListAppendBarrier(
+    ze_command_list_handle_t hCommandList,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::zeCommandListAppendBarrier(
+        hCommandList,
+        hSignalEvent,
+        numWaitEvents,
+        phWaitEvents);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListAppendMemoryRangesBarrier(
+    ze_command_list_handle_t hCommandList,
+    uint32_t numRanges,
+    const size_t *pRangeSizes,
+    const void **pRanges,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::zeCommandListAppendMemoryRangesBarrier(
+        hCommandList,
+        numRanges,
+        pRangeSizes,
+        pRanges,
+        hSignalEvent,
+        numWaitEvents,
+        phWaitEvents);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceSystemBarrier(
+    ze_device_handle_t hDevice) {
+    return L0::zeDeviceSystemBarrier(
+        hDevice);
+}
+}

level_zero/api/core/ze_barrier_api_entrypoints.h

@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2020-2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/context/context.h"
+#include <level_zero/ze_api.h>
+
+namespace L0 {
+ze_result_t zeCommandListCreate(
+    ze_context_handle_t hContext,
+    ze_device_handle_t hDevice,
+    const ze_command_list_desc_t *desc,
+    ze_command_list_handle_t *phCommandList) {
+    return L0::Context::fromHandle(hContext)->createCommandList(hDevice, desc, phCommandList);
+}
+
+ze_result_t zeCommandListCreateImmediate(
+    ze_context_handle_t hContext,
+    ze_device_handle_t hDevice,
+    const ze_command_queue_desc_t *altdesc,
+    ze_command_list_handle_t *phCommandList) {
+    return L0::Context::fromHandle(hContext)->createCommandListImmediate(hDevice, altdesc, phCommandList);
+}
+
+ze_result_t zeCommandListDestroy(
+    ze_command_list_handle_t hCommandList) {
+    return L0::CommandList::fromHandle(hCommandList)->destroy();
+}
+
+ze_result_t zeCommandListClose(
+    ze_command_list_handle_t hCommandList) {
+    return L0::CommandList::fromHandle(hCommandList)->close();
+}
+
+ze_result_t zeCommandListReset(
+    ze_command_list_handle_t hCommandList) {
+    return L0::CommandList::fromHandle(hCommandList)->reset();
+}
+
+ze_result_t zeCommandListAppendWriteGlobalTimestamp(
+    ze_command_list_handle_t hCommandList,
+    uint64_t *dstptr,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::CommandList::fromHandle(hCommandList)->appendWriteGlobalTimestamp(dstptr, hSignalEvent, numWaitEvents, phWaitEvents);
+}
+
+ze_result_t zeCommandListAppendQueryKernelTimestamps(
+    ze_command_list_handle_t hCommandList,
+    uint32_t numEvents,
+    ze_event_handle_t *phEvents,
+    void *dstptr,
+    const size_t *pOffsets,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::CommandList::fromHandle(hCommandList)->appendQueryKernelTimestamps(numEvents, phEvents, dstptr, pOffsets, hSignalEvent, numWaitEvents, phWaitEvents);
+}
+
+} // namespace L0
+
+extern "C" {
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListCreate(
+    ze_context_handle_t hContext,
+    ze_device_handle_t hDevice,
+    const ze_command_list_desc_t *desc,
+    ze_command_list_handle_t *phCommandList) {
+    return L0::zeCommandListCreate(
+        hContext,
+        hDevice,
+        desc,
+        phCommandList);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListCreateImmediate(
+    ze_context_handle_t hContext,
+    ze_device_handle_t hDevice,
+    const ze_command_queue_desc_t *altdesc,
+    ze_command_list_handle_t *phCommandList) {
+    return L0::zeCommandListCreateImmediate(
+        hContext,
+        hDevice,
+        altdesc,
+        phCommandList);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListDestroy(
+    ze_command_list_handle_t hCommandList) {
+    return L0::zeCommandListDestroy(
+        hCommandList);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListClose(
+    ze_command_list_handle_t hCommandList) {
+    return L0::zeCommandListClose(
+        hCommandList);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListReset(
+    ze_command_list_handle_t hCommandList) {
+    return L0::zeCommandListReset(
+        hCommandList);
+}
+
+ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListAppendWriteGlobalTimestamp(
+    ze_command_list_handle_t hCommandList,
+    uint64_t *dstptr,
+    ze_event_handle_t hSignalEvent,
+    uint32_t numWaitEvents,
+    ze_event_handle_t *phWaitEvents) {
+    return L0::zeCommandListAppendWriteGlobalTimestamp(
+        hCommandList,
+        dstptr,
+        hSignalEvent,
+        numWaitEvents,
+        phWaitEvents);
+}
+}