clean code

Author: AllanZyne

source/adapters/level_zero/kernel.cpp

@@ -802,57 +802,3 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSetSpecializationConstants(
   urPrint("[UR][L0] %s function not implemented!\n", __FUNCTION__);
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
-
-UR_APIEXPORT ur_result_t UR_APICALL urGetKernelSuggestedLocalWorkSize(
-    ur_queue_handle_t Queue, ur_kernel_handle_t Kernel, uint32_t workDim,
-    const size_t *GlobalWorkOffset, const size_t *GlobalWorkSize,
-    size_t *SuggestedLocalWorkSize) {
-  std::ignore = workDim;
-  std::ignore = GlobalWorkOffset;
-
-  uint32_t WG[3];
-  auto Device = Queue->Device;
-
-  // We can't call to zeKernelSuggestGroupSize if 64-bit GlobalWorkSize
-  // values do not fit to 32-bit that the API only supports currently.
-  bool SuggestGroupSize = true;
-  for (int I : {0, 1, 2}) {
-    if (GlobalWorkSize[I] > UINT32_MAX) {
-      SuggestGroupSize = false;
-    }
-  }
-
-  if (SuggestGroupSize) {
-    ZE2UR_CALL(zeKernelSuggestGroupSize,
-               (Kernel->ZeKernel, GlobalWorkSize[0], GlobalWorkSize[1],
-                GlobalWorkSize[2], &WG[0], &WG[1], &WG[2]));
-  } else {
-    for (int I : {0, 1, 2}) {
-      // Try to find a I-dimension WG size that the GlobalWorkSize[I] is
-      // fully divisable with. Start with the max possible size in
-      // each dimension.
-      uint32_t GroupSize[] = {Device->ZeDeviceComputeProperties->maxGroupSizeX,
-                              Device->ZeDeviceComputeProperties->maxGroupSizeY,
-                              Device->ZeDeviceComputeProperties->maxGroupSizeZ};
-      GroupSize[I] = (std::min)(size_t(GroupSize[I]), GlobalWorkSize[I]);
-      while (GlobalWorkSize[I] % GroupSize[I]) {
-        --GroupSize[I];
-      }
-      if (GlobalWorkSize[I] / GroupSize[I] > UINT32_MAX) {
-        urPrint("urGetKernelSuggestedLocalWorkSize: can't find a WG size "
-                "suitable for global work size > UINT32_MAX\n");
-        return UR_RESULT_ERROR_INVALID_WORK_GROUP_SIZE;
-      }
-      WG[I] = GroupSize[I];
-    }
-    urPrint("urGetKernelSuggestedLocalWorkSize: using computed WG size = {%d, "
-            "%d, %d}\n",
-            WG[0], WG[1], WG[2]);
-  }
-
-  SuggestedLocalWorkSize[0] = WG[0];
-  SuggestedLocalWorkSize[1] = WG[1];
-  SuggestedLocalWorkSize[2] = WG[2];
-
-  return UR_RESULT_SUCCESS;
-}

source/loader/ur_ldrddi.cpp

@@ -352,14 +352,6 @@ __urdlllocal ur_result_t UR_APICALL urPlatformGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativePlatform = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativePlatform, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -718,14 +710,6 @@ __urdlllocal ur_result_t UR_APICALL urDeviceGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeDevice = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeDevice, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -744,17 +728,13 @@ __urdlllocal ur_result_t UR_APICALL urDeviceCreateWithNativeHandle(
 
     // extract platform's function pointer table
     auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeDevice)->dditable;
+        reinterpret_cast<ur_platform_object_t *>(hPlatform)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Device.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeDevice =
-        reinterpret_cast<ur_native_object_t *>(hNativeDevice)->handle;
-
     // convert loader handle to platform handle
     hPlatform = reinterpret_cast<ur_platform_object_t *>(hPlatform)->handle;
 
@@ -994,14 +974,6 @@ __urdlllocal ur_result_t UR_APICALL urContextGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeContext = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeContext, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -1022,17 +994,13 @@ __urdlllocal ur_result_t UR_APICALL urContextCreateWithNativeHandle(
 
     // extract platform's function pointer table
     auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeContext)->dditable;
+        reinterpret_cast<ur_device_object_t *>(*phDevices)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Context.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeContext =
-        reinterpret_cast<ur_native_object_t *>(hNativeContext)->handle;
-
     // convert loader handles to platform handles
     auto phDevicesLocal = std::vector<ur_device_handle_t>(numDevices);
     for (size_t i = 0; i < numDevices; ++i) {
@@ -1285,14 +1253,6 @@ __urdlllocal ur_result_t UR_APICALL urMemGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeMem = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeMem, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -1310,17 +1270,13 @@ __urdlllocal ur_result_t UR_APICALL urMemBufferCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeMem)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnBufferCreateWithNativeHandle =
         dditable->ur.Mem.pfnBufferCreateWithNativeHandle;
     if (nullptr == pfnBufferCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeMem = reinterpret_cast<ur_native_object_t *>(hNativeMem)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -1360,17 +1316,13 @@ __urdlllocal ur_result_t UR_APICALL urMemImageCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeMem)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnImageCreateWithNativeHandle =
         dditable->ur.Mem.pfnImageCreateWithNativeHandle;
     if (nullptr == pfnImageCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeMem = reinterpret_cast<ur_native_object_t *>(hNativeMem)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -1672,14 +1624,6 @@ __urdlllocal ur_result_t UR_APICALL urSamplerGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeSampler = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeSampler, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -1697,18 +1641,13 @@ __urdlllocal ur_result_t UR_APICALL urSamplerCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeSampler)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Sampler.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeSampler =
-        reinterpret_cast<ur_native_object_t *>(hNativeSampler)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -2871,14 +2810,6 @@ __urdlllocal ur_result_t UR_APICALL urProgramGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeProgram = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeProgram, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -2896,18 +2827,13 @@ __urdlllocal ur_result_t UR_APICALL urProgramCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeProgram)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Program.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeProgram =
-        reinterpret_cast<ur_native_object_t *>(hNativeProgram)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -3400,14 +3326,6 @@ __urdlllocal ur_result_t UR_APICALL urKernelGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeKernel = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeKernel, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -3427,18 +3345,13 @@ __urdlllocal ur_result_t UR_APICALL urKernelCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeKernel)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Kernel.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeKernel =
-        reinterpret_cast<ur_native_object_t *>(hNativeKernel)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -3668,14 +3581,6 @@ __urdlllocal ur_result_t UR_APICALL urQueueGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeQueue = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeQueue, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -3694,17 +3599,13 @@ __urdlllocal ur_result_t UR_APICALL urQueueCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeQueue)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Queue.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeQueue = reinterpret_cast<ur_native_object_t *>(hNativeQueue)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -3985,14 +3886,6 @@ __urdlllocal ur_result_t UR_APICALL urEventGetNativeHandle(
         return result;
     }
 
-    try {
-        // convert platform handle to loader handle
-        *phNativeEvent = reinterpret_cast<ur_native_handle_t>(
-            ur_native_factory.getInstance(*phNativeEvent, dditable));
-    } catch (std::bad_alloc &) {
-        result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     return result;
 }
 
@@ -4010,17 +3903,13 @@ __urdlllocal ur_result_t UR_APICALL urEventCreateWithNativeHandle(
     ur_result_t result = UR_RESULT_SUCCESS;
 
     // extract platform's function pointer table
-    auto dditable =
-        reinterpret_cast<ur_native_object_t *>(hNativeEvent)->dditable;
+    auto dditable = reinterpret_cast<ur_context_object_t *>(hContext)->dditable;
     auto pfnCreateWithNativeHandle =
         dditable->ur.Event.pfnCreateWithNativeHandle;
     if (nullptr == pfnCreateWithNativeHandle) {
         return UR_RESULT_ERROR_UNINITIALIZED;
     }
 
-    // convert loader handle to platform handle
-    hNativeEvent = reinterpret_cast<ur_native_object_t *>(hNativeEvent)->handle;
-
     // convert loader handle to platform handle
     hContext = reinterpret_cast<ur_context_object_t *>(hContext)->handle;
 
@@ -9099,4 +8988,4 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetDeviceProcAddrTable(
 
 #if defined(__cplusplus)
 }
-#endif
+#endif