From 863d2303ab7cf96c0178fd167b3990424885c434 Mon Sep 17 00:00:00 2001 From: Omar Ahmed Date: Fri, 10 Nov 2023 18:11:49 +0000 Subject: [PATCH] Add more merge fixes --- examples/codegen/codegen.cpp | 6 +-- source/adapters/cuda/adapter.cpp | 9 ----- source/adapters/cuda/command_buffer.cpp | 14 +++---- source/adapters/cuda/common.cpp | 2 +- source/adapters/cuda/ur_interface_loader.cpp | 24 ++++++------ source/adapters/hip/adapter.cpp | 9 ----- source/adapters/hip/command_buffer.cpp | 14 +++---- source/adapters/hip/ur_interface_loader.cpp | 25 ++++++------ source/adapters/level_zero/adapter.cpp | 18 --------- source/adapters/level_zero/command_buffer.cpp | 14 +++---- .../level_zero/ur_interface_loader.cpp | 25 ++++++------ source/adapters/null/ur_null.cpp | 38 +++++++++---------- source/adapters/opencl/adapter.cpp | 9 ----- source/adapters/opencl/command_buffer.cpp | 29 ++++++++++---- .../adapters/opencl/ur_interface_loader.cpp | 24 ++++++------ ..._cuda.match => adapter_adapter_cuda.match} | 0 ...er_hip.match => adapter_adapter_hip.match} | 0 ...match => adapter_adapter_level_zero.match} | 0 .../device/device_adapter_cuda.match | 4 -- .../event/event_adapter_cuda.match | 1 - .../conformance/event/event_adapter_hip.match | 1 - .../memory/memory_adapter_cuda.match | 4 -- .../platform/platform_adapter_hip.match | 1 - .../queue/queue_adapter_cuda.match | 1 - .../conformance/queue/queue_adapter_hip.match | 1 - test/conformance/queue/urQueueCreate.cpp | 5 +-- test/fuzz/README.md | 2 +- test/fuzz/urFuzz.cpp | 7 +++- test/loader/platforms/platforms.cpp | 2 +- tools/urinfo/urinfo.cpp | 4 +- 30 files changed, 120 insertions(+), 173 deletions(-) rename test/conformance/adapter/{runtime_adapter_cuda.match => adapter_adapter_cuda.match} (100%) rename test/conformance/adapter/{runtime_adapter_hip.match => adapter_adapter_hip.match} (100%) rename test/conformance/adapter/{runtime_adapter_level_zero.match => adapter_adapter_level_zero.match} (100%) diff --git a/examples/codegen/codegen.cpp b/examples/codegen/codegen.cpp index 203043d86d..82834688fb 100644 --- a/examples/codegen/codegen.cpp +++ b/examples/codegen/codegen.cpp @@ -24,7 +24,7 @@ constexpr unsigned PAGE_SIZE = 4096; void ur_check(const ur_result_t r) { if (r != UR_RESULT_SUCCESS) { - urTearDown(nullptr); + urLoaderTearDown(); throw std::runtime_error("Unified runtime error: " + std::to_string(r)); } } @@ -95,7 +95,7 @@ template struct alignas(PAGE_SIZE) AlignedArray { int main() { ur_loader_config_handle_t loader_config = nullptr; - ur_check(urInit(UR_DEVICE_INIT_FLAG_GPU, loader_config)); + ur_check(urLoaderInit(UR_DEVICE_INIT_FLAG_GPU, loader_config)); auto adapters = get_adapters(); auto supported_adapters = get_supported_adapters(adapters); @@ -172,5 +172,5 @@ int main() { std::cout << "Results are incorrect." << std::endl; } - return urTearDown(nullptr) == UR_RESULT_SUCCESS && expectedResult ? 0 : 1; + return urLoaderTearDown() == UR_RESULT_SUCCESS && expectedResult ? 0 : 1; } diff --git a/source/adapters/cuda/adapter.cpp b/source/adapters/cuda/adapter.cpp index ca80a99f68..5b897a8768 100644 --- a/source/adapters/cuda/adapter.cpp +++ b/source/adapters/cuda/adapter.cpp @@ -22,15 +22,6 @@ struct ur_adapter_handle_t_ { ur_adapter_handle_t_ adapter{}; -UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t, - ur_loader_config_handle_t) { - return UR_RESULT_SUCCESS; -} - -UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) { - return UR_RESULT_SUCCESS; -} - UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) { diff --git a/source/adapters/cuda/command_buffer.cpp b/source/adapters/cuda/command_buffer.cpp index ad46884bf1..317304f9c6 100644 --- a/source/adapters/cuda/command_buffer.cpp +++ b/source/adapters/cuda/command_buffer.cpp @@ -236,7 +236,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp( return Result; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp( ur_exp_command_buffer_handle_t hCommandBuffer, void *pDst, const void *pSrc, size_t size, uint32_t numSyncPointsInWaitList, const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList, @@ -270,7 +270,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( return Result; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp( ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem, ur_mem_handle_t hDstMem, size_t srcOffset, size_t dstOffset, size_t size, uint32_t numSyncPointsInWaitList, @@ -314,7 +314,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( return Result; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp( ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem, ur_mem_handle_t hDstMem, ur_rect_offset_t srcOrigin, ur_rect_offset_t dstOrigin, ur_rect_region_t region, size_t srcRowPitch, @@ -356,7 +356,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp( ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer, size_t offset, size_t size, const void *pSrc, uint32_t numSyncPointsInWaitList, @@ -394,7 +394,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp( ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer, size_t offset, size_t size, void *pDst, uint32_t numSyncPointsInWaitList, const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList, @@ -431,7 +431,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp( ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer, ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset, ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch, @@ -473,7 +473,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp( ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer, ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset, ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch, diff --git a/source/adapters/cuda/common.cpp b/source/adapters/cuda/common.cpp index 492b6f7dc6..9f2a330262 100644 --- a/source/adapters/cuda/common.cpp +++ b/source/adapters/cuda/common.cpp @@ -111,7 +111,7 @@ void detail::ur::assertion(bool Condition, const char *Message) { } void detail::ur::cuPrint(const char *Message) { - std::fprintf(stderr, "ur_print: %s\n", Message); + std::cerr << "ur_print: " << Message << std::endl; } // Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR diff --git a/source/adapters/cuda/ur_interface_loader.cpp b/source/adapters/cuda/ur_interface_loader.cpp index f0e8192cf3..67576d9552 100644 --- a/source/adapters/cuda/ur_interface_loader.cpp +++ b/source/adapters/cuda/ur_interface_loader.cpp @@ -202,8 +202,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable( if (UR_RESULT_SUCCESS != result) { return result; } - pDdiTable->pfnInit = urInit; - pDdiTable->pfnTearDown = urTearDown; pDdiTable->pfnAdapterGet = urAdapterGet; pDdiTable->pfnAdapterRelease = urAdapterRelease; pDdiTable->pfnAdapterRetain = urAdapterRetain; @@ -280,17 +278,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable( pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp; pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp; pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp; - pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp; - pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp; - pDdiTable->pfnAppendMembufferCopyRectExp = - urCommandBufferAppendMembufferCopyRectExp; - pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp; - pDdiTable->pfnAppendMembufferReadRectExp = - urCommandBufferAppendMembufferReadRectExp; - pDdiTable->pfnAppendMembufferWriteExp = - urCommandBufferAppendMembufferWriteExp; - pDdiTable->pfnAppendMembufferWriteRectExp = - urCommandBufferAppendMembufferWriteRectExp; + pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp; + pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp; + pDdiTable->pfnAppendMemBufferCopyRectExp = + urCommandBufferAppendMemBufferCopyRectExp; + pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp; + pDdiTable->pfnAppendMemBufferReadRectExp = + urCommandBufferAppendMemBufferReadRectExp; + pDdiTable->pfnAppendMemBufferWriteExp = + urCommandBufferAppendMemBufferWriteExp; + pDdiTable->pfnAppendMemBufferWriteRectExp = + urCommandBufferAppendMemBufferWriteRectExp; pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp; return retVal; diff --git a/source/adapters/hip/adapter.cpp b/source/adapters/hip/adapter.cpp index 662717f1bd..4691d78913 100644 --- a/source/adapters/hip/adapter.cpp +++ b/source/adapters/hip/adapter.cpp @@ -20,15 +20,6 @@ struct ur_adapter_handle_t_ { ur_adapter_handle_t_ adapter{}; -UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t, - ur_loader_config_handle_t) { - return UR_RESULT_SUCCESS; -} - -UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) { - return UR_RESULT_SUCCESS; -} - UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet( uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) { if (phAdapters) { diff --git a/source/adapters/hip/command_buffer.cpp b/source/adapters/hip/command_buffer.cpp index 3f68b88d8d..d2cd156719 100644 --- a/source/adapters/hip/command_buffer.cpp +++ b/source/adapters/hip/command_buffer.cpp @@ -52,7 +52,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp( return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp( ur_exp_command_buffer_handle_t, void *, const void *, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *, ur_exp_command_buffer_sync_point_t *) { @@ -61,7 +61,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp( ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, size_t, size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *, ur_exp_command_buffer_sync_point_t *) { @@ -70,7 +70,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp( ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *, @@ -81,7 +81,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp( ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, const void *, uint32_t, const ur_exp_command_buffer_sync_point_t *, ur_exp_command_buffer_sync_point_t *) { @@ -91,7 +91,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp( ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, void *, uint32_t, const ur_exp_command_buffer_sync_point_t *, ur_exp_command_buffer_sync_point_t *) { @@ -101,7 +101,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp( ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *, uint32_t, const ur_exp_command_buffer_sync_point_t *, @@ -112,7 +112,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp( ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *, uint32_t, const ur_exp_command_buffer_sync_point_t *, diff --git a/source/adapters/hip/ur_interface_loader.cpp b/source/adapters/hip/ur_interface_loader.cpp index f97f8f379c..af8b0f1fd1 100644 --- a/source/adapters/hip/ur_interface_loader.cpp +++ b/source/adapters/hip/ur_interface_loader.cpp @@ -202,9 +202,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable( if (UR_RESULT_SUCCESS != result) { return result; } - - pDdiTable->pfnInit = urInit; - pDdiTable->pfnTearDown = urTearDown; pDdiTable->pfnAdapterGet = urAdapterGet; pDdiTable->pfnAdapterGetInfo = urAdapterGetInfo; pDdiTable->pfnAdapterGetLastError = urAdapterGetLastError; @@ -278,17 +275,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable( pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp; pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp; pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp; - pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp; - pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp; - pDdiTable->pfnAppendMembufferCopyRectExp = - urCommandBufferAppendMembufferCopyRectExp; - pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp; - pDdiTable->pfnAppendMembufferReadRectExp = - urCommandBufferAppendMembufferReadRectExp; - pDdiTable->pfnAppendMembufferWriteExp = - urCommandBufferAppendMembufferWriteExp; - pDdiTable->pfnAppendMembufferWriteRectExp = - urCommandBufferAppendMembufferWriteRectExp; + pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp; + pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp; + pDdiTable->pfnAppendMemBufferCopyRectExp = + urCommandBufferAppendMemBufferCopyRectExp; + pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp; + pDdiTable->pfnAppendMemBufferReadRectExp = + urCommandBufferAppendMemBufferReadRectExp; + pDdiTable->pfnAppendMemBufferWriteExp = + urCommandBufferAppendMemBufferWriteExp; + pDdiTable->pfnAppendMemBufferWriteRectExp = + urCommandBufferAppendMemBufferWriteRectExp; pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp; return retVal; diff --git a/source/adapters/level_zero/adapter.cpp b/source/adapters/level_zero/adapter.cpp index 0a4b71a773..c511d5c8eb 100644 --- a/source/adapters/level_zero/adapter.cpp +++ b/source/adapters/level_zero/adapter.cpp @@ -13,17 +13,6 @@ ur_adapter_handle_t_ Adapter{}; -UR_APIEXPORT ur_result_t UR_APICALL -urInit(ur_device_init_flags_t - DeviceFlags, ///< [in] device initialization flags. - ///< must be 0 (default) or a combination of - ///< ::ur_device_init_flag_t. - ur_loader_config_handle_t) { - std::ignore = DeviceFlags; - - return UR_RESULT_SUCCESS; -} - ur_result_t adapterStateTeardown() { // reclaim ur_platform_handle_t objects here since we don't have // urPlatformRelease. @@ -122,13 +111,6 @@ ur_result_t adapterStateTeardown() { return UR_RESULT_SUCCESS; } -UR_APIEXPORT ur_result_t UR_APICALL urTearDown( - void *Params ///< [in] pointer to tear down parameters -) { - std::ignore = Params; - return UR_RESULT_SUCCESS; -} - UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet( uint32_t NumEntries, ///< [in] the number of platforms to be added to ///< phAdapters. If phAdapters is not NULL, then diff --git a/source/adapters/level_zero/command_buffer.cpp b/source/adapters/level_zero/command_buffer.cpp index 7ba3cfae4d..e8f3b061f9 100644 --- a/source/adapters/level_zero/command_buffer.cpp +++ b/source/adapters/level_zero/command_buffer.cpp @@ -545,7 +545,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp( return UR_RESULT_SUCCESS; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp( ur_exp_command_buffer_handle_t CommandBuffer, void *Dst, const void *Src, size_t Size, uint32_t NumSyncPointsInWaitList, const ur_exp_command_buffer_sync_point_t *SyncPointWaitList, @@ -555,7 +555,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint); } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp( ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t SrcMem, ur_mem_handle_t DstMem, size_t SrcOffset, size_t DstOffset, size_t Size, uint32_t NumSyncPointsInWaitList, @@ -581,7 +581,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( SyncPoint); } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp( ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t SrcMem, ur_mem_handle_t DstMem, ur_rect_offset_t SrcOrigin, ur_rect_offset_t DstOrigin, ur_rect_region_t Region, size_t SrcRowPitch, @@ -609,7 +609,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( DstSlicePitch, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint); } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp( ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer, size_t Offset, size_t Size, const void *Src, uint32_t NumSyncPointsInWaitList, @@ -628,7 +628,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( Size, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint); } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp( ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer, ur_rect_offset_t BufferOffset, ur_rect_offset_t HostOffset, ur_rect_region_t Region, size_t BufferRowPitch, size_t BufferSlicePitch, @@ -648,7 +648,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( BufferSlicePitch, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint); } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp( ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer, size_t Offset, size_t Size, void *Dst, uint32_t NumSyncPointsInWaitList, const ur_exp_command_buffer_sync_point_t *SyncPointWaitList, @@ -663,7 +663,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( Size, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint); } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp( ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer, ur_rect_offset_t BufferOffset, ur_rect_offset_t HostOffset, ur_rect_region_t Region, size_t BufferRowPitch, size_t BufferSlicePitch, diff --git a/source/adapters/level_zero/ur_interface_loader.cpp b/source/adapters/level_zero/ur_interface_loader.cpp index b9b5461e75..e2d2b0ea4b 100644 --- a/source/adapters/level_zero/ur_interface_loader.cpp +++ b/source/adapters/level_zero/ur_interface_loader.cpp @@ -32,9 +32,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable( if (UR_RESULT_SUCCESS != retVal) { return retVal; } - - pDdiTable->pfnInit = urInit; - pDdiTable->pfnTearDown = urTearDown; pDdiTable->pfnAdapterGet = urAdapterGet; pDdiTable->pfnAdapterRelease = urAdapterRelease; pDdiTable->pfnAdapterRetain = urAdapterRetain; @@ -321,17 +318,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable( pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp; pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp; pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp; - pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp; - pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp; - pDdiTable->pfnAppendMembufferCopyRectExp = - urCommandBufferAppendMembufferCopyRectExp; - pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp; - pDdiTable->pfnAppendMembufferReadRectExp = - urCommandBufferAppendMembufferReadRectExp; - pDdiTable->pfnAppendMembufferWriteExp = - urCommandBufferAppendMembufferWriteExp; - pDdiTable->pfnAppendMembufferWriteRectExp = - urCommandBufferAppendMembufferWriteRectExp; + pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp; + pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp; + pDdiTable->pfnAppendMemBufferCopyRectExp = + urCommandBufferAppendMemBufferCopyRectExp; + pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp; + pDdiTable->pfnAppendMemBufferReadRectExp = + urCommandBufferAppendMemBufferReadRectExp; + pDdiTable->pfnAppendMemBufferWriteExp = + urCommandBufferAppendMemBufferWriteExp; + pDdiTable->pfnAppendMemBufferWriteRectExp = + urCommandBufferAppendMemBufferWriteRectExp; pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp; return retVal; diff --git a/source/adapters/null/ur_null.cpp b/source/adapters/null/ur_null.cpp index 1a5d0aa373..d79b607ed1 100644 --- a/source/adapters/null/ur_null.cpp +++ b/source/adapters/null/ur_null.cpp @@ -164,25 +164,24 @@ context_t::context_t() { }; ////////////////////////////////////////////////////////////////////////// - urDdiTable.USM.pfnHostAlloc = - [](ur_context_handle_t hContext, const ur_usm_desc_t *pUSMDesc, - ur_usm_pool_handle_t pool, size_t size, void **ppMem) { - if (size == 0) { - *ppMem = nullptr; - return UR_RESULT_ERROR_UNSUPPORTED_SIZE; - } - *ppMem = malloc(size); - if (ppMem == nullptr) { - return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY; - } - return UR_RESULT_SUCCESS; - }; + urDdiTable.USM.pfnHostAlloc = [](ur_context_handle_t, const ur_usm_desc_t *, + ur_usm_pool_handle_t, size_t size, + void **ppMem) { + if (size == 0) { + *ppMem = nullptr; + return UR_RESULT_ERROR_UNSUPPORTED_SIZE; + } + *ppMem = malloc(size); + if (ppMem == nullptr) { + return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY; + } + return UR_RESULT_SUCCESS; + }; ////////////////////////////////////////////////////////////////////////// urDdiTable.USM.pfnDeviceAlloc = - [](ur_context_handle_t hContext, ur_device_handle_t hDevice, - const ur_usm_desc_t *pUSMDesc, ur_usm_pool_handle_t pool, - size_t size, void **ppMem) { + [](ur_context_handle_t, ur_device_handle_t, const ur_usm_desc_t *, + ur_usm_pool_handle_t, size_t size, void **ppMem) { if (size == 0) { *ppMem = nullptr; return UR_RESULT_ERROR_UNSUPPORTED_SIZE; @@ -195,16 +194,15 @@ context_t::context_t() { }; ////////////////////////////////////////////////////////////////////////// - urDdiTable.USM.pfnFree = [](ur_context_handle_t hContext, void *pMem) { + urDdiTable.USM.pfnFree = [](ur_context_handle_t, void *pMem) { free(pMem); return UR_RESULT_SUCCESS; }; ////////////////////////////////////////////////////////////////////////// urDdiTable.USM.pfnGetMemAllocInfo = - [](ur_context_handle_t hContext, const void *pMem, - ur_usm_alloc_info_t propName, size_t propSize, void *pPropValue, - size_t *pPropSizeRet) { + [](ur_context_handle_t, const void *pMem, ur_usm_alloc_info_t propName, + size_t, void *pPropValue, size_t *pPropSizeRet) { switch (propName) { case UR_USM_ALLOC_INFO_TYPE: *reinterpret_cast(pPropValue) = diff --git a/source/adapters/opencl/adapter.cpp b/source/adapters/opencl/adapter.cpp index 65c5676bf9..f1d710ebb4 100644 --- a/source/adapters/opencl/adapter.cpp +++ b/source/adapters/opencl/adapter.cpp @@ -17,15 +17,6 @@ struct ur_adapter_handle_t_ { ur_adapter_handle_t_ adapter{}; -UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t, - ur_loader_config_handle_t) { - return UR_RESULT_SUCCESS; -} - -UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) { - return UR_RESULT_SUCCESS; -} - UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) { diff --git a/source/adapters/opencl/command_buffer.cpp b/source/adapters/opencl/command_buffer.cpp index 121a991cbd..6313841121 100644 --- a/source/adapters/opencl/command_buffer.cpp +++ b/source/adapters/opencl/command_buffer.cpp @@ -65,7 +65,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp( return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] void *pDst, [[maybe_unused]] const void *pSrc, [[maybe_unused]] size_t size, @@ -79,7 +79,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp( return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] ur_mem_handle_t hSrcMem, [[maybe_unused]] ur_mem_handle_t hDstMem, [[maybe_unused]] size_t srcOffset, @@ -94,7 +94,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp( return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } -UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( +UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] ur_mem_handle_t hSrcMem, [[maybe_unused]] ur_mem_handle_t hDstMem, @@ -114,7 +114,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset, [[maybe_unused]] size_t size, [[maybe_unused]] const void *pSrc, @@ -129,7 +129,22 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp( + [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, + [[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset, + [[maybe_unused]] size_t size, [[maybe_unused]] const void *pSrc, + [[maybe_unused]] uint32_t numSyncPointsInWaitList, + [[maybe_unused]] const ur_exp_command_buffer_sync_point_t + *pSyncPointWaitList, + [[maybe_unused]] ur_exp_command_buffer_sync_point_t *pSyncPoint) { + + cl_adapter::die("Experimental Command-buffer feature is not " + "implemented for OpenCL adapter."); + return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; +} + +UR_APIEXPORT +ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset, [[maybe_unused]] size_t size, [[maybe_unused]] void *pDst, @@ -144,7 +159,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] ur_rect_offset_t bufferOffset, @@ -165,7 +180,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp( } UR_APIEXPORT -ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp( +ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp( [[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer, [[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] ur_rect_offset_t bufferOffset, diff --git a/source/adapters/opencl/ur_interface_loader.cpp b/source/adapters/opencl/ur_interface_loader.cpp index dfd6ef309c..6959f57ce1 100644 --- a/source/adapters/opencl/ur_interface_loader.cpp +++ b/source/adapters/opencl/ur_interface_loader.cpp @@ -201,8 +201,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable( if (UR_RESULT_SUCCESS != Result) { return Result; } - pDdiTable->pfnInit = urInit; - pDdiTable->pfnTearDown = urTearDown; pDdiTable->pfnAdapterGet = urAdapterGet; pDdiTable->pfnAdapterRelease = urAdapterRelease; pDdiTable->pfnAdapterRetain = urAdapterRetain; @@ -287,17 +285,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable( pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp; pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp; pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp; - pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp; - pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp; - pDdiTable->pfnAppendMembufferCopyRectExp = - urCommandBufferAppendMembufferCopyRectExp; - pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp; - pDdiTable->pfnAppendMembufferReadRectExp = - urCommandBufferAppendMembufferReadRectExp; - pDdiTable->pfnAppendMembufferWriteExp = - urCommandBufferAppendMembufferWriteExp; - pDdiTable->pfnAppendMembufferWriteRectExp = - urCommandBufferAppendMembufferWriteRectExp; + pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp; + pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp; + pDdiTable->pfnAppendMemBufferCopyRectExp = + urCommandBufferAppendMemBufferCopyRectExp; + pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp; + pDdiTable->pfnAppendMemBufferReadRectExp = + urCommandBufferAppendMemBufferReadRectExp; + pDdiTable->pfnAppendMemBufferWriteExp = + urCommandBufferAppendMemBufferWriteExp; + pDdiTable->pfnAppendMemBufferWriteRectExp = + urCommandBufferAppendMemBufferWriteRectExp; pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp; return retVal; diff --git a/test/conformance/adapter/runtime_adapter_cuda.match b/test/conformance/adapter/adapter_adapter_cuda.match similarity index 100% rename from test/conformance/adapter/runtime_adapter_cuda.match rename to test/conformance/adapter/adapter_adapter_cuda.match diff --git a/test/conformance/adapter/runtime_adapter_hip.match b/test/conformance/adapter/adapter_adapter_hip.match similarity index 100% rename from test/conformance/adapter/runtime_adapter_hip.match rename to test/conformance/adapter/adapter_adapter_hip.match diff --git a/test/conformance/adapter/runtime_adapter_level_zero.match b/test/conformance/adapter/adapter_adapter_level_zero.match similarity index 100% rename from test/conformance/adapter/runtime_adapter_level_zero.match rename to test/conformance/adapter/adapter_adapter_level_zero.match diff --git a/test/conformance/device/device_adapter_cuda.match b/test/conformance/device/device_adapter_cuda.match index 961e7f591d..e69de29bb2 100644 --- a/test/conformance/device/device_adapter_cuda.match +++ b/test/conformance/device/device_adapter_cuda.match @@ -1,4 +0,0 @@ -urDeviceGetTest.InvalidValueNumEntries -{{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_SUPPORTED_PARTITIONS -{{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_PARTITION_TYPE -{{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT diff --git a/test/conformance/event/event_adapter_cuda.match b/test/conformance/event/event_adapter_cuda.match index 19f3ddeba0..e40ea36db6 100644 --- a/test/conformance/event/event_adapter_cuda.match +++ b/test/conformance/event/event_adapter_cuda.match @@ -2,4 +2,3 @@ urEventSetCallbackTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_ urEventSetCallbackTest.ValidateParameters/NVIDIA_CUDA_BACKEND___{{.*}}_ urEventSetCallbackTest.AllStates/NVIDIA_CUDA_BACKEND___{{.*}}_ urEventSetCallbackTest.EventAlreadyCompleted/NVIDIA_CUDA_BACKEND___{{.*}}_ -urEventSetCallbackNegativeTest.InvalidNullHandle/NVIDIA_CUDA_BACKEND___{{.*}}_ diff --git a/test/conformance/event/event_adapter_hip.match b/test/conformance/event/event_adapter_hip.match index 21532dac49..8682cdf4a6 100644 --- a/test/conformance/event/event_adapter_hip.match +++ b/test/conformance/event/event_adapter_hip.match @@ -2,4 +2,3 @@ urEventSetCallbackTest.Success/AMD_HIP_BACKEND___{{.*}}_ urEventSetCallbackTest.ValidateParameters/AMD_HIP_BACKEND___{{.*}}_ urEventSetCallbackTest.AllStates/AMD_HIP_BACKEND___{{.*}}_ urEventSetCallbackTest.EventAlreadyCompleted/AMD_HIP_BACKEND___{{.*}}_ -urEventSetCallbackNegativeTest.InvalidNullHandle/AMD_HIP_BACKEND___{{.*}}_ diff --git a/test/conformance/memory/memory_adapter_cuda.match b/test/conformance/memory/memory_adapter_cuda.match index 35c3504444..34989bdb3b 100644 --- a/test/conformance/memory/memory_adapter_cuda.match +++ b/test/conformance/memory/memory_adapter_cuda.match @@ -1,8 +1,4 @@ urMemBufferCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_ -urMemGetInfoTest.InvalidNullPointerParamValue/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_INFO_SIZE -urMemGetInfoTest.InvalidNullPointerParamValue/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_INFO_CONTEXT -urMemGetInfoTest.InvalidNullPointerPropSizeRet/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_INFO_SIZE -urMemGetInfoTest.InvalidNullPointerPropSizeRet/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MEM_INFO_CONTEXT {{OPT}}urMemImageGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_IMAGE_INFO_FORMAT {{OPT}}urMemImageGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_IMAGE_INFO_ELEMENT_SIZE {{OPT}}urMemImageGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_IMAGE_INFO_ROW_PITCH diff --git a/test/conformance/platform/platform_adapter_hip.match b/test/conformance/platform/platform_adapter_hip.match index efd19f8b27..052cc6555c 100644 --- a/test/conformance/platform/platform_adapter_hip.match +++ b/test/conformance/platform/platform_adapter_hip.match @@ -1,4 +1,3 @@ -urPlatformGetTest.InvalidNumEntries urPlatformGetNativeHandleTest.Success urPlatformGetNativeHandleTest.InvalidNullHandlePlatform urPlatformGetNativeHandleTest.InvalidNullPointerNativePlatform diff --git a/test/conformance/queue/queue_adapter_cuda.match b/test/conformance/queue/queue_adapter_cuda.match index f7967fb388..a95ec21e85 100644 --- a/test/conformance/queue/queue_adapter_cuda.match +++ b/test/conformance/queue/queue_adapter_cuda.match @@ -1,4 +1,3 @@ -urQueueCreateTest.InvalidQueueProperties/NVIDIA_CUDA_BACKEND___{{.*}}_ urQueueCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_ urQueueGetInfoTestWithInfoParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_QUEUE_INFO_DEVICE_DEFAULT urQueueGetInfoTestWithInfoParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_QUEUE_INFO_SIZE diff --git a/test/conformance/queue/queue_adapter_hip.match b/test/conformance/queue/queue_adapter_hip.match index 16166a827c..da80fb871d 100644 --- a/test/conformance/queue/queue_adapter_hip.match +++ b/test/conformance/queue/queue_adapter_hip.match @@ -1,4 +1,3 @@ -urQueueCreateTest.InvalidQueueProperties/AMD_HIP_BACKEND___{{.*}}_ urQueueCreateWithParamTest.SuccessWithProperties/AMD_HIP_BACKEND___{{.*}}___UR_QUEUE_FLAG_OUT_OF_ORDER_EXEC_MODE_ENABLE urQueueCreateWithParamTest.SuccessWithProperties/AMD_HIP_BACKEND___{{.*}}___UR_QUEUE_FLAG_PROFILING_ENABLE urQueueGetInfoTestWithInfoParam.Success/AMD_HIP_BACKEND___{{.*}}___UR_QUEUE_INFO_DEVICE_DEFAULT diff --git a/test/conformance/queue/urQueueCreate.cpp b/test/conformance/queue/urQueueCreate.cpp index ea7026f0b5..1c5ca6e614 100644 --- a/test/conformance/queue/urQueueCreate.cpp +++ b/test/conformance/queue/urQueueCreate.cpp @@ -71,14 +71,11 @@ TEST_P(urQueueCreateTest, InvalidQueueProperties) { /*.pNext =*/nullptr, /*.flags =*/UR_QUEUE_FLAG_FORCE_UINT32, }; - ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_ENUMERATION, - urQueueCreate(context, device, &props, &queue)); -} // Initial value is just not a valid enum { ur_queue_handle_t queue = nullptr; - ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_QUEUE_PROPERTIES, + ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_ENUMERATION, urQueueCreate(context, device, &props, &queue)); } // It should be an error to specify both low/high priorities diff --git a/test/fuzz/README.md b/test/fuzz/README.md index 22213b4dbf..9acc3f57ac 100644 --- a/test/fuzz/README.md +++ b/test/fuzz/README.md @@ -1,6 +1,6 @@ # Corpora for fuzz tests with fixed API calls scenarios Corpora in 'corpus' directory contain UR API calls in a predefined order described below. -All such scenarios begin with single calls to urInit() and urAdapterGet(). +All such scenarios begin with single calls to urLoaderInit() and urAdapterGet(). Corpus files are binary files containing ASCII characters which are interpreted by the test backwards, meaning that bytes are read from the end of the file to the beginning of the file. diff --git a/test/fuzz/urFuzz.cpp b/test/fuzz/urFuzz.cpp index cab9a44dd2..0d24f47516 100644 --- a/test/fuzz/urFuzz.cpp +++ b/test/fuzz/urFuzz.cpp @@ -419,7 +419,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t *data, size_t size) { } LoaderConfig config; - ur_result_t res = urInit(0, config.handle); + ur_result_t res = urLoaderInit(0, config.handle); if (res != UR_RESULT_SUCCESS) { return -1; } @@ -438,6 +438,11 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t *data, size_t size) { } } + res = urLoaderTearDown(); + if (res != UR_RESULT_SUCCESS) { + return -1; + } + return 0; } } // namespace fuzz diff --git a/test/loader/platforms/platforms.cpp b/test/loader/platforms/platforms.cpp index 4bb487b12b..01938288a0 100644 --- a/test/loader/platforms/platforms.cpp +++ b/test/loader/platforms/platforms.cpp @@ -18,7 +18,7 @@ using namespace logger; ////////////////////////////////////////////////////////////////////////// -int main(int argc, char *argv[]) { +int main(int, char *[]) { auto out = create_logger("TEST"); ur_result_t status; diff --git a/tools/urinfo/urinfo.cpp b/tools/urinfo/urinfo.cpp index 8002cf186b..d1463ea4fa 100644 --- a/tools/urinfo/urinfo.cpp +++ b/tools/urinfo/urinfo.cpp @@ -26,7 +26,7 @@ struct app { UR_CHECK(urLoaderConfigCreate(&loaderConfig)); UR_CHECK(urLoaderConfigEnableLayer(loaderConfig, "UR_LAYER_FULL_VALIDATION")); - UR_CHECK(urInit(0, loaderConfig)); + UR_CHECK(urLoaderInit(0, loaderConfig)); enumerateDevices(); } @@ -174,7 +174,7 @@ devices which are currently visible in the local execution environment. ~app() { urLoaderConfigRelease(loaderConfig); - urTearDown(nullptr); + urLoaderTearDown(); } }; } // namespace urinfo