diff --git a/level_zero/api/core/ze_barrier.cpp b/level_zero/api/core/ze_barrier.cpp index 977fabc216..a6479e0b9c 100644 --- a/level_zero/api/core/ze_barrier.cpp +++ b/level_zero/api/core/ze_barrier.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/cmdlist.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -19,19 +16,7 @@ zeCommandListAppendBarrier( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendBarrier(hSignalEvent, numWaitEvents, phWaitEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendBarrier(hSignalEvent, numWaitEvents, phWaitEvents); } __zedllexport ze_result_t __zecall @@ -43,40 +28,13 @@ zeCommandListAppendMemoryRangesBarrier( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pRangeSizes) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pRanges) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendMemoryRangesBarrier(numRanges, pRangeSizes, pRanges, hSignalEvent, numWaitEvents, phWaitEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendMemoryRangesBarrier(numRanges, pRangeSizes, pRanges, hSignalEvent, numWaitEvents, phWaitEvents); } __zedllexport ze_result_t __zecall zeDeviceSystemBarrier( ze_device_handle_t hDevice) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->systemBarrier(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::Device::fromHandle(hDevice)->systemBarrier(); } + +} // extern "C" diff --git a/level_zero/api/core/ze_cl_interop.cpp b/level_zero/api/core/ze_cl_interop.cpp index eb1f0ac97c..47da2add44 100644 --- a/level_zero/api/core/ze_cl_interop.cpp +++ b/level_zero/api/core/ze_cl_interop.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/device.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -19,21 +16,7 @@ zeDeviceRegisterCLMemory( cl_context context, cl_mem mem, void **ptr) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->registerCLMemory(context, mem, ptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->registerCLMemory(context, mem, ptr); } __zedllexport ze_result_t __zecall @@ -42,21 +25,7 @@ zeDeviceRegisterCLProgram( cl_context context, cl_program program, ze_module_handle_t *phModule) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->registerCLProgram(context, program, phModule); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->registerCLProgram(context, program, phModule); } __zedllexport ze_result_t __zecall @@ -65,20 +34,7 @@ zeDeviceRegisterCLCommandQueue( cl_context context, cl_command_queue commandQueue, ze_command_queue_handle_t *phCommandQueue) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phCommandQueue) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->registerCLCommandQueue(context, commandQueue, phCommandQueue); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::Device::fromHandle(hDevice)->registerCLCommandQueue(context, commandQueue, phCommandQueue); } + +} // extern "C" diff --git a/level_zero/api/core/ze_cmdlist.cpp b/level_zero/api/core/ze_cmdlist.cpp index 4cb0c5e443..854df02d1e 100644 --- a/level_zero/api/core/ze_cmdlist.cpp +++ b/level_zero/api/core/ze_cmdlist.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/cmdlist.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -18,25 +15,7 @@ zeCommandListCreate( ze_device_handle_t hDevice, const ze_command_list_desc_t *desc, ze_command_list_handle_t *phCommandList) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_COMMAND_LIST_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->createCommandList(desc, phCommandList); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->createCommandList(desc, phCommandList); } __zedllexport ze_result_t __zecall @@ -44,78 +23,25 @@ zeCommandListCreateImmediate( ze_device_handle_t hDevice, const ze_command_queue_desc_t *altdesc, ze_command_list_handle_t *phCommandList) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == altdesc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_COMMAND_QUEUE_DESC_VERSION_CURRENT < altdesc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->createCommandListImmediate(altdesc, phCommandList); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->createCommandListImmediate(altdesc, phCommandList); } __zedllexport ze_result_t __zecall zeCommandListDestroy( ze_command_list_handle_t hCommandList) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->destroy(); } __zedllexport ze_result_t __zecall zeCommandListClose( ze_command_list_handle_t hCommandList) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->close(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->close(); } __zedllexport ze_result_t __zecall zeCommandListReset( ze_command_list_handle_t hCommandList) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->reset(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::CommandList::fromHandle(hCommandList)->reset(); } + +} // extern "C" diff --git a/level_zero/api/core/ze_cmdqueue.cpp b/level_zero/api/core/ze_cmdqueue.cpp index 2b8e9ba266..b2247a3738 100644 --- a/level_zero/api/core/ze_cmdqueue.cpp +++ b/level_zero/api/core/ze_cmdqueue.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/cmdqueue.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -18,43 +15,13 @@ zeCommandQueueCreate( ze_device_handle_t hDevice, const ze_command_queue_desc_t *desc, ze_command_queue_handle_t *phCommandQueue) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phCommandQueue) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_COMMAND_QUEUE_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->createCommandQueue(desc, phCommandQueue); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->createCommandQueue(desc, phCommandQueue); } __zedllexport ze_result_t __zecall zeCommandQueueDestroy( ze_command_queue_handle_t hCommandQueue) { - try { - { - if (nullptr == hCommandQueue) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandQueue::fromHandle(hCommandQueue)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandQueue::fromHandle(hCommandQueue)->destroy(); } __zedllexport ze_result_t __zecall @@ -63,39 +30,14 @@ zeCommandQueueExecuteCommandLists( uint32_t numCommandLists, ze_command_list_handle_t *phCommandLists, ze_fence_handle_t hFence) { - try { - { - if (nullptr == hCommandQueue) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phCommandLists) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandQueue::fromHandle(hCommandQueue)->executeCommandLists(numCommandLists, phCommandLists, hFence, true); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandQueue::fromHandle(hCommandQueue)->executeCommandLists(numCommandLists, phCommandLists, hFence, true); } __zedllexport ze_result_t __zecall zeCommandQueueSynchronize( ze_command_queue_handle_t hCommandQueue, uint32_t timeout) { - try { - { - if (nullptr == hCommandQueue) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandQueue::fromHandle(hCommandQueue)->synchronize(timeout); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::CommandQueue::fromHandle(hCommandQueue)->synchronize(timeout); } + +} // extern "C" diff --git a/level_zero/api/core/ze_copy.cpp b/level_zero/api/core/ze_copy.cpp index e05ca7a0ad..9bbd8dc831 100644 --- a/level_zero/api/core/ze_copy.cpp +++ b/level_zero/api/core/ze_copy.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/cmdlist.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -20,23 +17,7 @@ zeCommandListAppendMemoryCopy( const void *srcptr, size_t size, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == dstptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == srcptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendMemoryCopy(dstptr, srcptr, size, hEvent, 0, nullptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendMemoryCopy(dstptr, srcptr, size, hEvent, 0, nullptr); } __zedllexport ze_result_t __zecall @@ -47,21 +28,7 @@ zeCommandListAppendMemoryFill( size_t patternSize, size_t size, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendMemoryFill(ptr, pattern, patternSize, size, hEvent); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendMemoryFill(ptr, pattern, patternSize, size, hEvent); } __zedllexport ze_result_t __zecall @@ -76,27 +43,7 @@ zeCommandListAppendMemoryCopyRegion( uint32_t srcPitch, uint32_t srcSlicePitch, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == dstptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == dstRegion) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == srcptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == srcRegion) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendMemoryCopyRegion(dstptr, dstRegion, dstPitch, dstSlicePitch, srcptr, srcRegion, srcPitch, srcSlicePitch, hEvent); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendMemoryCopyRegion(dstptr, dstRegion, dstPitch, dstSlicePitch, srcptr, srcRegion, srcPitch, srcSlicePitch, hEvent); } __zedllexport ze_result_t __zecall @@ -105,23 +52,7 @@ zeCommandListAppendImageCopy( ze_image_handle_t hDstImage, ze_image_handle_t hSrcImage, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDstImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hSrcImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendImageCopy(hDstImage, hSrcImage, hEvent, 0, nullptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendImageCopy(hDstImage, hSrcImage, hEvent, 0, nullptr); } __zedllexport ze_result_t __zecall @@ -132,23 +63,7 @@ zeCommandListAppendImageCopyRegion( const ze_image_region_t *pDstRegion, const ze_image_region_t *pSrcRegion, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDstImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hSrcImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendImageCopyRegion(hDstImage, hSrcImage, pDstRegion, pSrcRegion, hEvent, 0, nullptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendImageCopyRegion(hDstImage, hSrcImage, pDstRegion, pSrcRegion, hEvent, 0, nullptr); } __zedllexport ze_result_t __zecall @@ -158,23 +73,7 @@ zeCommandListAppendImageCopyToMemory( ze_image_handle_t hSrcImage, const ze_image_region_t *pSrcRegion, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == dstptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hSrcImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendImageCopyToMemory(dstptr, hSrcImage, pSrcRegion, hEvent, 0, nullptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendImageCopyToMemory(dstptr, hSrcImage, pSrcRegion, hEvent, 0, nullptr); } __zedllexport ze_result_t __zecall @@ -184,23 +83,7 @@ zeCommandListAppendImageCopyFromMemory( const void *srcptr, const ze_image_region_t *pDstRegion, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDstImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == srcptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendImageCopyFromMemory(hDstImage, srcptr, pDstRegion, hEvent, 0, nullptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendImageCopyFromMemory(hDstImage, srcptr, pDstRegion, hEvent, 0, nullptr); } __zedllexport ze_result_t __zecall @@ -208,21 +91,7 @@ zeCommandListAppendMemoryPrefetch( ze_command_list_handle_t hCommandList, const void *ptr, size_t size) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendMemoryPrefetch(ptr, size); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendMemoryPrefetch(ptr, size); } __zedllexport ze_result_t __zecall @@ -232,22 +101,7 @@ zeCommandListAppendMemAdvise( const void *ptr, size_t size, ze_memory_advice_t advice) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendMemAdvise(hDevice, ptr, size, advice); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::CommandList::fromHandle(hCommandList)->appendMemAdvise(hDevice, ptr, size, advice); } + +} // extern "C" diff --git a/level_zero/api/core/ze_core_loader.cpp b/level_zero/api/core/ze_core_loader.cpp index 875b2cf545..5bd8275ed2 100644 --- a/level_zero/api/core/ze_core_loader.cpp +++ b/level_zero/api/core/ze_core_loader.cpp @@ -812,4 +812,5 @@ zeGetSamplerProcAddrTable( } return result; } -} \ No newline at end of file + +} // extern "C" diff --git a/level_zero/api/core/ze_device.cpp b/level_zero/api/core/ze_device.cpp index 106f83341e..bf0617ee44 100644 --- a/level_zero/api/core/ze_device.cpp +++ b/level_zero/api/core/ze_device.cpp @@ -11,9 +11,6 @@ #include #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -21,21 +18,7 @@ zeDeviceGet( ze_driver_handle_t hDriver, uint32_t *pCount, ze_device_handle_t *phDevices) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pCount) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getDevice(pCount, phDevices); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getDevice(pCount, phDevices); } __zedllexport ze_result_t __zecall @@ -43,84 +26,28 @@ zeDeviceGetSubDevices( ze_device_handle_t hDevice, uint32_t *pCount, ze_device_handle_t *phSubdevices) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pCount) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getSubDevices(pCount, phSubdevices); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getSubDevices(pCount, phSubdevices); } __zedllexport ze_result_t __zecall zeDeviceGetProperties( ze_device_handle_t hDevice, ze_device_properties_t *pDeviceProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pDeviceProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getProperties(pDeviceProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getProperties(pDeviceProperties); } __zedllexport ze_result_t __zecall zeDeviceGetComputeProperties( ze_device_handle_t hDevice, ze_device_compute_properties_t *pComputeProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pComputeProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getComputeProperties(pComputeProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getComputeProperties(pComputeProperties); } __zedllexport ze_result_t __zecall zeDeviceGetKernelProperties( ze_device_handle_t hDevice, ze_device_kernel_properties_t *pKernelProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pKernelProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getKernelProperties(pKernelProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getKernelProperties(pKernelProperties); } __zedllexport ze_result_t __zecall @@ -128,84 +55,28 @@ zeDeviceGetMemoryProperties( ze_device_handle_t hDevice, uint32_t *pCount, ze_device_memory_properties_t *pMemProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pCount) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getMemoryProperties(pCount, pMemProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getMemoryProperties(pCount, pMemProperties); } __zedllexport ze_result_t __zecall zeDeviceGetMemoryAccessProperties( ze_device_handle_t hDevice, ze_device_memory_access_properties_t *pMemAccessProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pMemAccessProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getMemoryAccessProperties(pMemAccessProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getMemoryAccessProperties(pMemAccessProperties); } __zedllexport ze_result_t __zecall zeDeviceGetCacheProperties( ze_device_handle_t hDevice, ze_device_cache_properties_t *pCacheProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pCacheProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getCacheProperties(pCacheProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getCacheProperties(pCacheProperties); } __zedllexport ze_result_t __zecall zeDeviceGetImageProperties( ze_device_handle_t hDevice, ze_device_image_properties_t *pImageProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pImageProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getDeviceImageProperties(pImageProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getDeviceImageProperties(pImageProperties); } __zedllexport ze_result_t __zecall @@ -213,23 +84,7 @@ zeDeviceGetP2PProperties( ze_device_handle_t hDevice, ze_device_handle_t hPeerDevice, ze_device_p2p_properties_t *pP2PProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hPeerDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pP2PProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->getP2PProperties(hPeerDevice, pP2PProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->getP2PProperties(hPeerDevice, pP2PProperties); } __zedllexport ze_result_t __zecall @@ -237,41 +92,14 @@ zeDeviceCanAccessPeer( ze_device_handle_t hDevice, ze_device_handle_t hPeerDevice, ze_bool_t *value) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hPeerDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == value) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->canAccessPeer(hPeerDevice, value); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->canAccessPeer(hPeerDevice, value); } __zedllexport ze_result_t __zecall zeDeviceSetLastLevelCacheConfig( ze_device_handle_t hDevice, ze_cache_config_t cacheConfig) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->setLastLevelCacheConfig(cacheConfig); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::Device::fromHandle(hDevice)->setLastLevelCacheConfig(cacheConfig); } + +} // extern "C" diff --git a/level_zero/api/core/ze_driver.cpp b/level_zero/api/core/ze_driver.cpp index e6bf00ffd9..5d49dbdda3 100644 --- a/level_zero/api/core/ze_driver.cpp +++ b/level_zero/api/core/ze_driver.cpp @@ -9,107 +9,40 @@ #include "level_zero/core/source/driver_handle.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall zeInit( ze_init_flag_t flags) { - try { - { - } - return L0::init(flags); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::init(flags); } __zedllexport ze_result_t __zecall zeDriverGet( uint32_t *pCount, ze_driver_handle_t *phDrivers) { - try { - { - if (nullptr == pCount) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::driverHandleGet(pCount, phDrivers); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::driverHandleGet(pCount, phDrivers); } __zedllexport ze_result_t __zecall zeDriverGetProperties( ze_driver_handle_t hDriver, ze_driver_properties_t *pProperties) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getProperties(pProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getProperties(pProperties); } __zedllexport ze_result_t __zecall zeDriverGetApiVersion( ze_driver_handle_t hDriver, ze_api_version_t *version) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == version) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getApiVersion(version); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getApiVersion(version); } __zedllexport ze_result_t __zecall zeDriverGetIPCProperties( ze_driver_handle_t hDriver, ze_driver_ipc_properties_t *pIPCProperties) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pIPCProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getIPCProperties(pIPCProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getIPCProperties(pIPCProperties); } __zedllexport ze_result_t __zecall @@ -117,22 +50,7 @@ zeDriverGetExtensionFunctionAddress( ze_driver_handle_t hDriver, const char *pFuncName, void **pfunc) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pFuncName) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pfunc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getExtensionFunctionAddress(pFuncName, pfunc); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::DriverHandle::fromHandle(hDriver)->getExtensionFunctionAddress(pFuncName, pfunc); } + +} // extern "C" diff --git a/level_zero/api/core/ze_event.cpp b/level_zero/api/core/ze_event.cpp index 42249e4457..3d45db9464 100644 --- a/level_zero/api/core/ze_event.cpp +++ b/level_zero/api/core/ze_event.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/event.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -20,43 +17,13 @@ zeEventPoolCreate( uint32_t numDevices, ze_device_handle_t *phDevices, ze_event_pool_handle_t *phEventPool) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phEventPool) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_EVENT_POOL_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::DriverHandle::fromHandle(hDriver)->createEventPool(desc, numDevices, phDevices, phEventPool); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->createEventPool(desc, numDevices, phDevices, phEventPool); } __zedllexport ze_result_t __zecall zeEventPoolDestroy( ze_event_pool_handle_t hEventPool) { - try { - { - if (nullptr == hEventPool) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::EventPool::fromHandle(hEventPool)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::EventPool::fromHandle(hEventPool)->destroy(); } __zedllexport ze_result_t __zecall @@ -64,64 +31,20 @@ zeEventCreate( ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, ze_event_handle_t *phEvent) { - try { - { - if (nullptr == hEventPool) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_EVENT_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::eventCreate(hEventPool, desc, phEvent); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::EventPool::fromHandle(hEventPool)->createEvent(desc, phEvent); } __zedllexport ze_result_t __zecall zeEventDestroy( ze_event_handle_t hEvent) { - try { - { - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::eventDestroy(hEvent); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Event::fromHandle(hEvent)->destroy(); } __zedllexport ze_result_t __zecall zeEventPoolGetIpcHandle( ze_event_pool_handle_t hEventPool, ze_ipc_event_pool_handle_t *phIpc) { - try { - { - if (nullptr == hEventPool) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phIpc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::EventPool::fromHandle(hEventPool)->getIpcHandle(phIpc); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::EventPool::fromHandle(hEventPool)->getIpcHandle(phIpc); } __zedllexport ze_result_t __zecall @@ -129,60 +52,20 @@ zeEventPoolOpenIpcHandle( ze_driver_handle_t hDriver, ze_ipc_event_pool_handle_t hIpc, ze_event_pool_handle_t *phEventPool) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phEventPool) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::eventPoolOpenIpcHandle(hDriver, hIpc, phEventPool); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->openEventPoolIpcHandle(hIpc, phEventPool); } __zedllexport ze_result_t __zecall zeEventPoolCloseIpcHandle( ze_event_pool_handle_t hEventPool) { - try { - { - if (nullptr == hEventPool) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::EventPool::fromHandle(hEventPool)->closeIpcHandle(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::EventPool::fromHandle(hEventPool)->closeIpcHandle(); } __zedllexport ze_result_t __zecall zeCommandListAppendSignalEvent( ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendSignalEvent(hEvent); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendSignalEvent(hEvent); } __zedllexport ze_result_t __zecall @@ -190,115 +73,39 @@ zeCommandListAppendWaitOnEvents( ze_command_list_handle_t hCommandList, uint32_t numEvents, ze_event_handle_t *phEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phEvents) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendWaitOnEvents(numEvents, phEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendWaitOnEvents(numEvents, phEvents); } __zedllexport ze_result_t __zecall zeEventHostSignal( ze_event_handle_t hEvent) { - try { - { - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Event::fromHandle(hEvent)->hostSignal(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Event::fromHandle(hEvent)->hostSignal(); } __zedllexport ze_result_t __zecall zeEventHostSynchronize( ze_event_handle_t hEvent, uint32_t timeout) { - try { - { - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Event::fromHandle(hEvent)->hostSynchronize(timeout); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Event::fromHandle(hEvent)->hostSynchronize(timeout); } __zedllexport ze_result_t __zecall zeEventQueryStatus( ze_event_handle_t hEvent) { - try { - { - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Event::fromHandle(hEvent)->queryStatus(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Event::fromHandle(hEvent)->queryStatus(); } __zedllexport ze_result_t __zecall zeCommandListAppendEventReset( ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendEventReset(hEvent); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendEventReset(hEvent); } __zedllexport ze_result_t __zecall zeEventHostReset( ze_event_handle_t hEvent) { - try { - { - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Event::fromHandle(hEvent)->reset(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Event::fromHandle(hEvent)->reset(); } __zedllexport ze_result_t __zecall @@ -306,20 +113,7 @@ zeEventGetTimestamp( ze_event_handle_t hEvent, ze_event_timestamp_type_t timestampType, void *dstptr) { - try { - { - if (nullptr == hEvent) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == dstptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Event::fromHandle(hEvent)->getTimestamp(timestampType, dstptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Event::fromHandle(hEvent)->getTimestamp(timestampType, dstptr); } -} \ No newline at end of file + +} // extern "C" \ No newline at end of file diff --git a/level_zero/api/core/ze_fence.cpp b/level_zero/api/core/ze_fence.cpp index 2abebe4a22..300f03b865 100644 --- a/level_zero/api/core/ze_fence.cpp +++ b/level_zero/api/core/ze_fence.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/fence.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -18,97 +15,32 @@ zeFenceCreate( ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, ze_fence_handle_t *phFence) { - try { - { - if (nullptr == hCommandQueue) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phFence) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_FENCE_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::fenceCreate(hCommandQueue, desc, phFence); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandQueue::fromHandle(hCommandQueue)->createFence(desc, phFence); } __zedllexport ze_result_t __zecall zeFenceDestroy( ze_fence_handle_t hFence) { - try { - { - if (nullptr == hFence) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::fenceDestroy(hFence); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Fence::fromHandle(hFence)->destroy(); } __zedllexport ze_result_t __zecall zeFenceHostSynchronize( ze_fence_handle_t hFence, uint32_t timeout) { - try { - { - if (nullptr == hFence) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Fence::fromHandle(hFence)->hostSynchronize(timeout); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Fence::fromHandle(hFence)->hostSynchronize(timeout); } __zedllexport ze_result_t __zecall zeFenceQueryStatus( ze_fence_handle_t hFence) { - try { - { - if (nullptr == hFence) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Fence::fromHandle(hFence)->queryStatus(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Fence::fromHandle(hFence)->queryStatus(); } __zedllexport ze_result_t __zecall zeFenceReset( ze_fence_handle_t hFence) { - try { - { - if (nullptr == hFence) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Fence::fromHandle(hFence)->reset(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::Fence::fromHandle(hFence)->reset(); } + +} // extern "C" diff --git a/level_zero/api/core/ze_image.cpp b/level_zero/api/core/ze_image.cpp index e46f0ea2ac..95340b6d34 100644 --- a/level_zero/api/core/ze_image.cpp +++ b/level_zero/api/core/ze_image.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/image.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -18,25 +15,7 @@ zeImageGetProperties( ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_properties_t *pImageProperties) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pImageProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_IMAGE_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->imageGetProperties(desc, pImageProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->imageGetProperties(desc, pImageProperties); } __zedllexport ze_result_t __zecall @@ -44,42 +23,13 @@ zeImageCreate( ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_handle_t *phImage) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_IMAGE_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->createImage(desc, phImage); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->createImage(desc, phImage); } __zedllexport ze_result_t __zecall zeImageDestroy( ze_image_handle_t hImage) { - try { - { - if (nullptr == hImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Image::fromHandle(hImage)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::Image::fromHandle(hImage)->destroy(); } + +} // extern "C" diff --git a/level_zero/api/core/ze_memory.cpp b/level_zero/api/core/ze_memory.cpp index fca8014b13..85779fea4e 100644 --- a/level_zero/api/core/ze_memory.cpp +++ b/level_zero/api/core/ze_memory.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/driver_handle.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -22,23 +19,7 @@ zeDriverAllocSharedMem( size_t alignment, ze_device_handle_t hDevice, void **pptr) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->allocSharedMem(hDevice, deviceDesc->flags, hostDesc->flags, size, alignment, pptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->allocSharedMem(hDevice, deviceDesc->flags, hostDesc->flags, size, alignment, pptr); } __zedllexport ze_result_t __zecall @@ -49,23 +30,7 @@ zeDriverAllocDeviceMem( size_t alignment, ze_device_handle_t hDevice, void **pptr) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->allocDeviceMem(hDevice, deviceDesc->flags, size, alignment, pptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->allocDeviceMem(hDevice, deviceDesc->flags, size, alignment, pptr); } __zedllexport ze_result_t __zecall @@ -75,42 +40,14 @@ zeDriverAllocHostMem( size_t size, size_t alignment, void **pptr) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->allocHostMem(hostDesc->flags, size, alignment, pptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->allocHostMem(hostDesc->flags, size, alignment, pptr); } __zedllexport ze_result_t __zecall zeDriverFreeMem( ze_driver_handle_t hDriver, void *ptr) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->freeMem(ptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->freeMem(ptr); } __zedllexport ze_result_t __zecall @@ -119,23 +56,7 @@ zeDriverGetMemAllocProperties( const void *ptr, ze_memory_allocation_properties_t *pMemAllocProperties, ze_device_handle_t *phDevice) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pMemAllocProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getMemAllocProperties(ptr, pMemAllocProperties, phDevice); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getMemAllocProperties(ptr, pMemAllocProperties, phDevice); } __zedllexport ze_result_t __zecall @@ -144,21 +65,7 @@ zeDriverGetMemAddressRange( const void *ptr, void **pBase, size_t *pSize) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getMemAddressRange(ptr, pBase, pSize); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getMemAddressRange(ptr, pBase, pSize); } __zedllexport ze_result_t __zecall @@ -166,23 +73,7 @@ zeDriverGetMemIpcHandle( ze_driver_handle_t hDriver, const void *ptr, ze_ipc_mem_handle_t *pIpcHandle) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pIpcHandle) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->getIpcMemHandle(ptr, pIpcHandle); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->getIpcMemHandle(ptr, pIpcHandle); } __zedllexport ze_result_t __zecall @@ -192,43 +83,14 @@ zeDriverOpenMemIpcHandle( ze_ipc_mem_handle_t handle, ze_ipc_memory_flag_t flags, void **pptr) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->openIpcMemHandle(hDevice, handle, flags, pptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::DriverHandle::fromHandle(hDriver)->openIpcMemHandle(hDevice, handle, flags, pptr); } __zedllexport ze_result_t __zecall zeDriverCloseMemIpcHandle( ze_driver_handle_t hDriver, const void *ptr) { - try { - { - if (nullptr == hDriver) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::DriverHandle::fromHandle(hDriver)->closeIpcMemHandle(ptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::DriverHandle::fromHandle(hDriver)->closeIpcMemHandle(ptr); } + +} // extern "C" diff --git a/level_zero/api/core/ze_module.cpp b/level_zero/api/core/ze_module.cpp index 62544ef03e..82a32306a1 100644 --- a/level_zero/api/core/ze_module.cpp +++ b/level_zero/api/core/ze_module.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/module.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -19,61 +16,19 @@ zeModuleCreate( const ze_module_desc_t *desc, ze_module_handle_t *phModule, ze_module_build_log_handle_t *phBuildLog) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MODULE_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->createModule(desc, phModule, phBuildLog); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->createModule(desc, phModule, phBuildLog); } __zedllexport ze_result_t __zecall zeModuleDestroy( ze_module_handle_t hModule) { - try { - { - if (nullptr == hModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Module::fromHandle(hModule)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Module::fromHandle(hModule)->destroy(); } __zedllexport ze_result_t __zecall zeModuleBuildLogDestroy( ze_module_build_log_handle_t hModuleBuildLog) { - try { - { - if (nullptr == hModuleBuildLog) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::moduleBuildLogDestroy(hModuleBuildLog); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::ModuleBuildLog::fromHandle(hModuleBuildLog)->destroy(); } __zedllexport ze_result_t __zecall @@ -81,21 +36,7 @@ zeModuleBuildLogGetString( ze_module_build_log_handle_t hModuleBuildLog, size_t *pSize, char *pBuildLog) { - try { - { - if (nullptr == hModuleBuildLog) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pSize) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::ModuleBuildLog::fromHandle(hModuleBuildLog)->getString(pSize, pBuildLog); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::ModuleBuildLog::fromHandle(hModuleBuildLog)->getString(pSize, pBuildLog); } __zedllexport ze_result_t __zecall @@ -103,21 +44,7 @@ zeModuleGetNativeBinary( ze_module_handle_t hModule, size_t *pSize, uint8_t *pModuleNativeBinary) { - try { - { - if (nullptr == hModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pSize) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Module::fromHandle(hModule)->getNativeBinary(pSize, pModuleNativeBinary); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Module::fromHandle(hModule)->getNativeBinary(pSize, pModuleNativeBinary); } __zedllexport ze_result_t __zecall @@ -125,23 +52,7 @@ zeModuleGetGlobalPointer( ze_module_handle_t hModule, const char *pGlobalName, void **pptr) { - try { - { - if (nullptr == hModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pGlobalName) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Module::fromHandle(hModule)->getGlobalPointer(pGlobalName, pptr); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Module::fromHandle(hModule)->getGlobalPointer(pGlobalName, pptr); } __zedllexport ze_result_t __zecall @@ -149,12 +60,6 @@ zeModuleGetKernelNames( ze_module_handle_t hModule, uint32_t *pCount, const char **pNames) { - if (nullptr == hModule) { - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - if (nullptr == pCount) { - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } return L0::Module::fromHandle(hModule)->getKernelNames(pCount, pNames); } @@ -163,43 +68,13 @@ zeKernelCreate( ze_module_handle_t hModule, const ze_kernel_desc_t *desc, ze_kernel_handle_t *phFunction) { - try { - { - if (nullptr == hModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_KERNEL_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Module::fromHandle(hModule)->createKernel(desc, phFunction); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Module::fromHandle(hModule)->createKernel(desc, phFunction); } __zedllexport ze_result_t __zecall zeKernelDestroy( ze_kernel_handle_t hKernel) { - try { - { - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hKernel)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hKernel)->destroy(); } __zedllexport ze_result_t __zecall @@ -207,23 +82,7 @@ zeModuleGetFunctionPointer( ze_module_handle_t hModule, const char *pKernelName, void **pfnFunction) { - try { - { - if (nullptr == hModule) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pKernelName) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pfnFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Module::fromHandle(hModule)->getFunctionPointer(pKernelName, pfnFunction); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Module::fromHandle(hModule)->getFunctionPointer(pKernelName, pfnFunction); } __zedllexport ze_result_t __zecall @@ -232,19 +91,7 @@ zeKernelSetGroupSize( uint32_t groupSizeX, uint32_t groupSizeY, uint32_t groupSizeZ) { - try { - { - if (nullptr == hFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hFunction)->setGroupSize(groupSizeX, groupSizeY, groupSizeZ); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hFunction)->setGroupSize(groupSizeX, groupSizeY, groupSizeZ); } __zedllexport ze_result_t __zecall @@ -256,75 +103,23 @@ zeKernelSuggestGroupSize( uint32_t *groupSizeX, uint32_t *groupSizeY, uint32_t *groupSizeZ) { - try { - { - if (nullptr == hFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == groupSizeX) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == groupSizeY) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == groupSizeZ) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hFunction)->suggestGroupSize(globalSizeX, globalSizeY, globalSizeZ, groupSizeX, groupSizeY, groupSizeZ); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hFunction)->suggestGroupSize(globalSizeX, globalSizeY, globalSizeZ, groupSizeX, groupSizeY, groupSizeZ); } __zedllexport ze_result_t __zecall zeKernelSuggestMaxCooperativeGroupCount( ze_kernel_handle_t hKernel, uint32_t *totalGroupCount) { - try { - { - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == totalGroupCount) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - (*totalGroupCount) = L0::Kernel::fromHandle(hKernel)->suggestMaxCooperativeGroupCount(); - return ZE_RESULT_SUCCESS; - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hKernel)->suggestMaxCooperativeGroupCount(totalGroupCount); } -__zedllexport ze_result_t __zecall -zeFunctionSuggestMaxCooperativeGroupCount( - ze_kernel_handle_t hFunction, - uint32_t *groupCountX, - uint32_t *groupCountY, - uint32_t *groupCountZ); - __zedllexport ze_result_t __zecall zeKernelSetArgumentValue( ze_kernel_handle_t hFunction, uint32_t argIndex, size_t argSize, const void *pArgValue) { - try { - { - if (nullptr == hFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hFunction)->setArgumentValue(argIndex, argSize, pArgValue); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hFunction)->setArgumentValue(argIndex, argSize, pArgValue); } __zedllexport ze_result_t __zecall @@ -333,19 +128,7 @@ zeKernelSetAttribute( ze_kernel_attribute_t attr, uint32_t size, const void *pValue) { - try { - { - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hKernel)->setAttribute(attr, size, pValue); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hKernel)->setAttribute(attr, size, pValue); } __zedllexport ze_result_t __zecall @@ -354,59 +137,21 @@ zeKernelGetAttribute( ze_kernel_attribute_t attr, uint32_t *pSize, void *pValue) { - try { - { - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hKernel)->getAttribute(attr, pSize, pValue); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hKernel)->getAttribute(attr, pSize, pValue); } __zedllexport ze_result_t __zecall zeKernelSetIntermediateCacheConfig( ze_kernel_handle_t hKernel, ze_cache_config_t cacheConfig) { - try { - { - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hKernel)->setIntermediateCacheConfig(cacheConfig); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hKernel)->setIntermediateCacheConfig(cacheConfig); } __zedllexport ze_result_t __zecall zeKernelGetProperties( ze_kernel_handle_t hKernel, ze_kernel_properties_t *pKernelProperties) { - try { - { - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pKernelProperties) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Kernel::fromHandle(hKernel)->getProperties(pKernelProperties); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Kernel::fromHandle(hKernel)->getProperties(pKernelProperties); } __zedllexport ze_result_t __zecall @@ -417,23 +162,7 @@ zeCommandListAppendLaunchKernel( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pLaunchFuncArgs) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendLaunchFunction(hFunction, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendLaunchFunction(hFunction, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents); } __zedllexport ze_result_t __zecall @@ -444,23 +173,7 @@ zeCommandListAppendLaunchCooperativeKernel( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hKernel) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pLaunchFuncArgs) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendLaunchCooperativeKernel(hKernel, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendLaunchCooperativeKernel(hKernel, pLaunchFuncArgs, hSignalEvent, numWaitEvents, phWaitEvents); } __zedllexport ze_result_t __zecall @@ -471,21 +184,7 @@ zeCommandListAppendLaunchKernelIndirect( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hFunction) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendLaunchFunctionIndirect(hFunction, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::CommandList::fromHandle(hCommandList)->appendLaunchFunctionIndirect(hFunction, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents); } __zedllexport ze_result_t __zecall @@ -498,24 +197,7 @@ zeCommandListAppendLaunchMultipleKernelsIndirect( ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - try { - { - if (nullptr == hCommandList) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phFunctions) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pCountBuffer) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == pLaunchArgumentsBuffer) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::CommandList::fromHandle(hCommandList)->appendLaunchMultipleFunctionsIndirect(numFunctions, phFunctions, pCountBuffer, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::CommandList::fromHandle(hCommandList)->appendLaunchMultipleFunctionsIndirect(numFunctions, phFunctions, pCountBuffer, pLaunchArgumentsBuffer, hSignalEvent, numWaitEvents, phWaitEvents); } + +} // extern "C" diff --git a/level_zero/api/core/ze_residency.cpp b/level_zero/api/core/ze_residency.cpp index c8e30bd70e..12839766eb 100644 --- a/level_zero/api/core/ze_residency.cpp +++ b/level_zero/api/core/ze_residency.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/device.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -18,21 +15,7 @@ zeDeviceMakeMemoryResident( ze_device_handle_t hDevice, void *ptr, size_t size) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->makeMemoryResident(ptr, size); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->makeMemoryResident(ptr, size); } __zedllexport ze_result_t __zecall @@ -40,62 +23,21 @@ zeDeviceEvictMemory( ze_device_handle_t hDevice, void *ptr, size_t size) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == ptr) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->evictMemory(ptr, size); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->evictMemory(ptr, size); } __zedllexport ze_result_t __zecall zeDeviceMakeImageResident( ze_device_handle_t hDevice, ze_image_handle_t hImage) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->makeImageResident(hImage); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->makeImageResident(hImage); } __zedllexport ze_result_t __zecall zeDeviceEvictImage( ze_device_handle_t hDevice, ze_image_handle_t hImage) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == hImage) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Device::fromHandle(hDevice)->evictImage(hImage); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } -} + return L0::Device::fromHandle(hDevice)->evictImage(hImage); } + +} // extern "C" diff --git a/level_zero/api/core/ze_sampler.cpp b/level_zero/api/core/ze_sampler.cpp index 87beea21b1..fdfe611ab7 100644 --- a/level_zero/api/core/ze_sampler.cpp +++ b/level_zero/api/core/ze_sampler.cpp @@ -8,9 +8,6 @@ #include "level_zero/core/source/sampler.h" #include -#include -#include - extern "C" { __zedllexport ze_result_t __zecall @@ -18,42 +15,13 @@ zeSamplerCreate( ze_device_handle_t hDevice, const ze_sampler_desc_t *desc, ze_sampler_handle_t *phSampler) { - try { - { - if (nullptr == hDevice) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == desc) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (nullptr == phSampler) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_SAMPLER_DESC_VERSION_CURRENT < desc->version) - return ZE_RESULT_ERROR_UNKNOWN; - } - return L0::Device::fromHandle(hDevice)->createSampler(desc, phSampler); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Device::fromHandle(hDevice)->createSampler(desc, phSampler); } __zedllexport ze_result_t __zecall zeSamplerDestroy( ze_sampler_handle_t hSampler) { - try { - { - if (nullptr == hSampler) - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - return L0::Sampler::fromHandle(hSampler)->destroy(); - } catch (ze_result_t &result) { - return result; - } catch (std::bad_alloc &) { - return ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } catch (std::exception &) { - return ZE_RESULT_ERROR_UNKNOWN; - } + return L0::Sampler::fromHandle(hSampler)->destroy(); } -} \ No newline at end of file + +} // extern "C" diff --git a/level_zero/core/source/cmdqueue.cpp b/level_zero/core/source/cmdqueue.cpp index 3344942522..512aae08d9 100644 --- a/level_zero/core/source/cmdqueue.cpp +++ b/level_zero/core/source/cmdqueue.cpp @@ -106,12 +106,6 @@ CommandQueue *CommandQueue::create(uint32_t productFamily, Device *device, NEO:: return commandQueue; } -ze_result_t fenceCreate(ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, - ze_fence_handle_t *phFence) { - auto commandQueue = static_cast(CommandQueue::fromHandle(hCommandQueue)); - return commandQueue->createFence(desc, phFence); -} - ze_command_queue_mode_t CommandQueueImp::getSynchronousMode() { return desc.mode; } diff --git a/level_zero/core/source/cmdqueue.h b/level_zero/core/source/cmdqueue.h index 7c49176fbb..f5812fa008 100644 --- a/level_zero/core/source/cmdqueue.h +++ b/level_zero/core/source/cmdqueue.h @@ -70,9 +70,4 @@ struct CommandQueuePopulateFactory { } }; -ze_result_t fenceCreate(ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, - ze_fence_handle_t *phFence); - -ze_result_t fenceDestroy(ze_fence_handle_t hFence); - } // namespace L0 diff --git a/level_zero/core/source/driver_handle.h b/level_zero/core/source/driver_handle.h index 2784383fa3..2712793d4b 100644 --- a/level_zero/core/source/driver_handle.h +++ b/level_zero/core/source/driver_handle.h @@ -49,6 +49,7 @@ struct DriverHandle : _ze_driver_handle_t { uint32_t numDevices, ze_device_handle_t *phDevices, ze_event_pool_handle_t *phEventPool) = 0; + virtual ze_result_t openEventPoolIpcHandle(ze_ipc_event_pool_handle_t hIpc, ze_event_pool_handle_t *phEventPool) = 0; virtual ze_result_t checkMemoryAccessFromDevice(Device *device, const void *ptr) = 0; virtual NEO::GraphicsAllocation *allocateManagedMemoryFromHostPtr(Device *device, void *buffer, size_t size, struct CommandList *commandList) = 0; diff --git a/level_zero/core/source/driver_handle_imp.cpp b/level_zero/core/source/driver_handle_imp.cpp index 7ca76a07a1..91b3619ec2 100644 --- a/level_zero/core/source/driver_handle_imp.cpp +++ b/level_zero/core/source/driver_handle_imp.cpp @@ -291,4 +291,9 @@ ze_result_t DriverHandleImp::createEventPool(const ze_event_pool_desc_t *desc, return device->createEventPool(desc, phEventPool); } +ze_result_t DriverHandleImp::openEventPoolIpcHandle(ze_ipc_event_pool_handle_t hIpc, + ze_event_pool_handle_t *phEventPool) { + return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; +} + } // namespace L0 diff --git a/level_zero/core/source/driver_handle_imp.h b/level_zero/core/source/driver_handle_imp.h index 9d6b54b5ed..297e3872c8 100644 --- a/level_zero/core/source/driver_handle_imp.h +++ b/level_zero/core/source/driver_handle_imp.h @@ -46,6 +46,7 @@ struct DriverHandleImp : public DriverHandle { uint32_t numDevices, ze_device_handle_t *phDevices, ze_event_pool_handle_t *phEventPool) override; + ze_result_t openEventPoolIpcHandle(ze_ipc_event_pool_handle_t hIpc, ze_event_pool_handle_t *phEventPool) override; ze_result_t checkMemoryAccessFromDevice(Device *device, const void *ptr) override; NEO::SVMAllocsManager *getSvmAllocsManager() override; ze_result_t initialize(std::vector> devices); diff --git a/level_zero/core/source/event.cpp b/level_zero/core/source/event.cpp index 194b6e675e..75bbef698d 100644 --- a/level_zero/core/source/event.cpp +++ b/level_zero/core/source/event.cpp @@ -110,6 +110,14 @@ struct EventPoolImp : public EventPool { ze_result_t closeIpcHandle() override; ze_result_t createEvent(const ze_event_desc_t *desc, ze_event_handle_t *phEvent) override { + if (desc->index > (this->getPoolSize() - 1)) { + return ZE_RESULT_ERROR_INVALID_ARGUMENT; + } + + if ((this->getPoolUsedCount() + 1) > this->getPoolSize()) { + return ZE_RESULT_ERROR_INVALID_ARGUMENT; + } + *phEvent = Event::create(this, desc, this->getDevice()); return ZE_RESULT_SUCCESS; @@ -368,27 +376,4 @@ ze_result_t EventPoolImp::destroy() { return ZE_RESULT_SUCCESS; } -ze_result_t eventPoolOpenIpcHandle(ze_driver_handle_t hDriver, ze_ipc_event_pool_handle_t hIpc, - ze_event_pool_handle_t *phEventPool) { - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; -} - -ze_result_t eventCreate(ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, - ze_event_handle_t *phEvent) { - EventPool *eventPool = EventPool::fromHandle(hEventPool); - UNRECOVERABLE_IF(eventPool == nullptr); - - if (desc->index > (eventPool->getPoolSize() - 1)) { - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - - if ((eventPool->getPoolUsedCount() + 1) > eventPool->getPoolSize()) { - return ZE_RESULT_ERROR_INVALID_ARGUMENT; - } - - return eventPool->createEvent(desc, phEvent); -} - -ze_result_t eventDestroy(ze_event_handle_t hEvent) { return Event::fromHandle(hEvent)->destroy(); } - } // namespace L0 diff --git a/level_zero/core/source/event.h b/level_zero/core/source/event.h index 755db5a9fe..60f677252e 100644 --- a/level_zero/core/source/event.h +++ b/level_zero/core/source/event.h @@ -100,12 +100,4 @@ struct EventPool : _ze_event_pool_handle_t { NEO::GraphicsAllocation *eventPoolAllocation = nullptr; }; -ze_result_t eventPoolOpenIpcHandle(ze_driver_handle_t hDriver, ze_ipc_event_pool_handle_t hIpc, - ze_event_pool_handle_t *phEventPool); - -ze_result_t eventCreate(ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, - ze_event_handle_t *phEvent); - -ze_result_t eventDestroy(ze_event_handle_t hEvent); - } // namespace L0 diff --git a/level_zero/core/source/fence.cpp b/level_zero/core/source/fence.cpp index dd92192169..718af7d0c7 100644 --- a/level_zero/core/source/fence.cpp +++ b/level_zero/core/source/fence.cpp @@ -118,8 +118,4 @@ ze_result_t FenceImp::hostSynchronize(uint32_t timeout) { return ret; } -ze_result_t fenceDestroy(ze_fence_handle_t phFence) { - return Fence::fromHandle(phFence)->destroy(); -} - } // namespace L0 diff --git a/level_zero/core/source/fence.h b/level_zero/core/source/fence.h index 9318e7ec38..0e22b63c34 100644 --- a/level_zero/core/source/fence.h +++ b/level_zero/core/source/fence.h @@ -51,6 +51,4 @@ struct Fence : _ze_fence_handle_t { NEO::GraphicsAllocation *allocation = nullptr; }; -ze_result_t fenceDestroy(ze_fence_handle_t *phFence); - } // namespace L0 diff --git a/level_zero/core/source/kernel.h b/level_zero/core/source/kernel.h index 0929796cd3..801441c005 100644 --- a/level_zero/core/source/kernel.h +++ b/level_zero/core/source/kernel.h @@ -106,7 +106,7 @@ struct Kernel : _ze_kernel_handle_t, virtual NEO::DispatchKernelEncoderI { uint32_t globalSizeZ, uint32_t *groupSizeX, uint32_t *groupSizeY, uint32_t *groupSizeZ) = 0; - virtual uint32_t suggestMaxCooperativeGroupCount() = 0; + virtual ze_result_t suggestMaxCooperativeGroupCount(uint32_t *totalGroupCount) = 0; virtual const KernelImmutableData *getImmutableData() const = 0; virtual std::unique_ptr clone() const = 0; diff --git a/level_zero/core/source/kernel_imp.cpp b/level_zero/core/source/kernel_imp.cpp index 320ea8b017..e85f86cd84 100644 --- a/level_zero/core/source/kernel_imp.cpp +++ b/level_zero/core/source/kernel_imp.cpp @@ -318,7 +318,7 @@ ze_result_t KernelImp::suggestGroupSize(uint32_t globalSizeX, uint32_t globalSiz return ZE_RESULT_SUCCESS; } -uint32_t KernelImp::suggestMaxCooperativeGroupCount() { +ze_result_t KernelImp::suggestMaxCooperativeGroupCount(uint32_t *totalGroupCount) { UNRECOVERABLE_IF(0 == groupSize[0]); UNRECOVERABLE_IF(0 == groupSize[1]); UNRECOVERABLE_IF(0 == groupSize[2]); @@ -339,15 +339,16 @@ uint32_t KernelImp::suggestMaxCooperativeGroupCount() { auto usesBarriers = descriptor.kernelAttributes.flags.usesBarriers; const uint32_t workDim = 3; const size_t localWorkSize[] = {groupSize[0], groupSize[1], groupSize[2]}; - return NEO::KernelHelper::getMaxWorkGroupCount(descriptor.kernelAttributes.simdSize, - availableThreadCount, - dssCount, - dssCount * KB * hardwareInfo.capabilityTable.slmSize, - hwHelper.alignSlmSize(slmArgsTotalSize + descriptor.kernelAttributes.slmInlineSize), - static_cast(hwHelper.getMaxBarrierRegisterPerSlice()), - hwHelper.getBarriersCountFromHasBarriers(usesBarriers), - workDim, - localWorkSize); + *totalGroupCount = NEO::KernelHelper::getMaxWorkGroupCount(descriptor.kernelAttributes.simdSize, + availableThreadCount, + dssCount, + dssCount * KB * hardwareInfo.capabilityTable.slmSize, + hwHelper.alignSlmSize(slmArgsTotalSize + descriptor.kernelAttributes.slmInlineSize), + static_cast(hwHelper.getMaxBarrierRegisterPerSlice()), + hwHelper.getBarriersCountFromHasBarriers(usesBarriers), + workDim, + localWorkSize); + return ZE_RESULT_SUCCESS; } ze_result_t KernelImp::setAttribute(ze_kernel_attribute_t attr, uint32_t size, const void *pValue) { diff --git a/level_zero/core/source/kernel_imp.h b/level_zero/core/source/kernel_imp.h index 1d57acb282..47773181c3 100644 --- a/level_zero/core/source/kernel_imp.h +++ b/level_zero/core/source/kernel_imp.h @@ -53,7 +53,7 @@ struct KernelImp : Kernel { uint32_t *groupSizeX, uint32_t *groupSizeY, uint32_t *groupSizeZ) override; - uint32_t suggestMaxCooperativeGroupCount() override; + ze_result_t suggestMaxCooperativeGroupCount(uint32_t *totalGroupCount) override; const uint8_t *getCrossThreadData() const override { return crossThreadData.get(); } uint32_t getCrossThreadDataSize() const override { return crossThreadDataSize; } diff --git a/level_zero/core/source/module_build_log.cpp b/level_zero/core/source/module_build_log.cpp index 7cddec98c9..96bb809865 100644 --- a/level_zero/core/source/module_build_log.cpp +++ b/level_zero/core/source/module_build_log.cpp @@ -65,8 +65,4 @@ ModuleBuildLog *ModuleBuildLog::create() { return moduleBuildLog; } -ze_result_t moduleBuildLogDestroy(ze_module_build_log_handle_t hModuleBuildLog) { - return ModuleBuildLog::fromHandle(hModuleBuildLog)->destroy(); -} - } // namespace L0 diff --git a/level_zero/core/source/module_build_log.h b/level_zero/core/source/module_build_log.h index 744934d1cb..66aa974b9b 100644 --- a/level_zero/core/source/module_build_log.h +++ b/level_zero/core/source/module_build_log.h @@ -36,6 +36,4 @@ struct ModuleBuildLog : _ze_module_build_log_handle_t { inline ze_module_build_log_handle_t toHandle() { return this; } }; -ze_result_t moduleBuildLogDestroy(ze_module_build_log_handle_t hModuleBuildLog); - } // namespace L0 \ No newline at end of file