[SYCL][UR] Some minor miscellaneous fixes (#9981)

Signed-off-by: Jaime Arteaga <[email protected]>

Author: Jaime Arteaga

sycl/plugins/unified_runtime/pi2ur.hpp

@@ -616,11 +616,6 @@ inline pi_result piextPluginGetOpaqueData(void *opaque_data_param,
   return PI_ERROR_UNKNOWN;
 }
 
-// Returns plugin specific backend option.
-// Current support is only for optimization options.
-// Return '-ze-opt-disable' for frontend_option = -O0.
-// Return '-ze-opt-level=1' for frontend_option = -O1 or -O2.
-// Return '-ze-opt-level=2' for frontend_option = -O3.
 inline pi_result piPluginGetBackendOption(pi_platform Platform,
                                           const char *FrontendOption,
                                           const char **PlatformOption) {
@@ -1940,11 +1935,11 @@ inline pi_result piKernelSetArg(pi_kernel Kernel, pi_uint32 ArgIndex,
   return PI_SUCCESS;
 }
 
-inline pi_result piKernelSetArgPointer(pi_kernel kernel, pi_uint32 arg_index,
-                                       size_t arg_size, const void *arg_value) {
-  (void)arg_size;
-  auto hKernel = reinterpret_cast<ur_kernel_handle_t>(kernel);
-  HANDLE_ERRORS(urKernelSetArgPointer(hKernel, arg_index, arg_value));
+inline pi_result piKernelSetArgPointer(pi_kernel Kernel, pi_uint32 ArgIndex,
+                                       size_t ArgSize, const void *ArgValue) {
+  std::ignore = ArgSize;
+  ur_kernel_handle_t UrKernel = reinterpret_cast<ur_kernel_handle_t>(Kernel);
+  HANDLE_ERRORS(urKernelSetArgPointer(UrKernel, ArgIndex, ArgValue));
 
   return PI_SUCCESS;
 }
@@ -2809,8 +2804,6 @@ inline pi_result piextMemCreateWithNativeHandle(pi_native_handle NativeHandle,
   ur_context_handle_t UrContext =
       reinterpret_cast<ur_context_handle_t>(Context);
   ur_mem_handle_t *UrMem = reinterpret_cast<ur_mem_handle_t *>(Mem);
-  // TODO: Pass OwnNativeHandle to the output parameter
-  // while we get it in interface
   ur_mem_native_properties_t Properties{};
   Properties.isNativeHandleOwned = OwnNativeHandle;
   HANDLE_ERRORS(urMemBufferCreateWithNativeHandle(UrNativeMem, UrContext,

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_platform.cpp

@@ -545,6 +545,11 @@ ur_result_t ur_platform_handle_t_::populateDeviceCacheIfNeeded() {
   return UR_RESULT_SUCCESS;
 }
 
+// Returns plugin specific backend option.
+// Current support is only for optimization options.
+// Return '-ze-opt-disable' for frontend_option = -O0.
+// Return '-ze-opt-level=1' for frontend_option = -O1 or -O2.
+// Return '-ze-opt-level=2' for frontend_option = -O3.
 UR_APIEXPORT ur_result_t UR_APICALL urPlatformGetBackendOption(
     ur_platform_handle_t Platform, ///< [in] handle of the platform instance.
     const char *FrontendOption, ///< [in] string containing the frontend option.

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_queue.cpp

@@ -618,12 +618,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueCreateWithNativeHandle(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urQueueFinish(
-    ur_queue_handle_t hQueue ///< [in] handle of the queue to be finished.
+    ur_queue_handle_t UrQueue ///< [in] handle of the queue to be finished.
 ) {
-  // _pi_queue *PiQueue = reinterpret_cast<_pi_queue *>(Queue);
-  // ur_queue_handle_t UrQueue = PiQueue->UrQueue;
-  ur_queue_handle_t_ *UrQueue = reinterpret_cast<ur_queue_handle_t_ *>(hQueue);
-
   if (UrQueue->Device->ImmCommandListUsed) {
     // Lock automatically releases when this goes out of scope.
     std::scoped_lock<ur_shared_mutex> Lock(UrQueue->Mutex);