Remove checking result of plugin calls for get info commands so excep…

…tion isn't thrown.
intel · Apr 5, 2024 · c9c70e2 · c9c70e2
1 parent cec923e
commit c9c70e2
Show file tree

Hide file tree

Showing 24 changed files with 20 additions and 117 deletions.
diff --git a/sycl/source/backend.cpp b/sycl/source/backend.cpp
@@ -234,8 +234,6 @@ make_kernel_bundle(pi_native_handle NativeHandle, const context &TargetContext,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
   ProgramDevices.resize(NumDevices);
 
@@ -246,8 +244,6 @@ make_kernel_bundle(pi_native_handle NativeHandle, const context &TargetContext,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   for (const auto &Dev : ProgramDevices) {
@@ -259,8 +255,6 @@ make_kernel_bundle(pi_native_handle NativeHandle, const context &TargetContext,
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Program get build info command not supported by backend.");
-    } else {
-      Plugin->checkPiResult(Result);
     }
 
     switch (BinaryType) {

diff --git a/sycl/source/backend/opencl.cpp b/sycl/source/backend/opencl.cpp
@@ -75,8 +75,6 @@ __SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Platform get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
   if (ResultSize == 0)
     return false;
@@ -89,8 +87,6 @@ __SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Platform get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   std::string_view ExtensionsString(Result.get());

diff --git a/sycl/source/detail/buffer_impl.cpp b/sycl/source/detail/buffer_impl.cpp
@@ -88,8 +88,8 @@ buffer_impl::getNativeVector(backend BackendName) const {
     // resident on, so pass nullptr for Device param. Buffer interop may not be
     // supported by all backends.
     sycl::detail::pi::PiResult Result =
-        Plugin->call_nocheck<PiApiKind::piextMemGetNativeHandle>(NativeMem,
-                                                                 &Handle);
+        Plugin->call_nocheck<PiApiKind::piextMemGetNativeHandle>(
+            NativeMem, /*Dev*/ nullptr, &Handle);
     if (Result == PI_ERROR_INVALID_OPERATION) {
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),

diff --git a/sycl/source/detail/error_handling/error_handling.cpp b/sycl/source/detail/error_handling/error_handling.cpp
@@ -210,8 +210,6 @@ void handleInvalidWorkGroupSize(const device_impl &DeviceImpl, pi_kernel Kernel,
             throw sycl::exception(
                 sycl::make_error_code(sycl::errc::feature_not_supported),
                 "Kernel get info command not supported by backend.");
-          } else {
-            Plugin->checkPiResult(Result);
           }
           size_t OptsSize = 0;
 
@@ -222,8 +220,6 @@ void handleInvalidWorkGroupSize(const device_impl &DeviceImpl, pi_kernel Kernel,
             throw sycl::exception(
                 sycl::make_error_code(sycl::errc::feature_not_supported),
                 "Program get build info command not supported by backend.");
-          } else {
-            Plugin->checkPiResult(Result);
           }
 
           std::string Opts(OptsSize, '\0');
@@ -234,8 +230,6 @@ void handleInvalidWorkGroupSize(const device_impl &DeviceImpl, pi_kernel Kernel,
             throw sycl::exception(
                 sycl::make_error_code(sycl::errc::feature_not_supported),
                 "Program get build info command not supported by backend.");
-          } else {
-            Plugin->checkPiResult(Result);
           }
 
           const bool HasStd20 = Opts.find("-cl-std=CL2.0") != std::string::npos;

diff --git a/sycl/source/detail/event_impl.cpp b/sycl/source/detail/event_impl.cpp
@@ -77,7 +77,7 @@ void event_impl::waitInternal(bool *Success) {
         (Error == PI_ERROR_UNKNOWN ||
          Error == PI_ERROR_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST)) {
       *Success = false;
-    } else if (Success == PI_ERROR_INVALID_OPERATION) {
+    } else if (Error == PI_ERROR_INVALID_OPERATION) {
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Event wait command not supported by backend.");

diff --git a/sycl/source/detail/image_impl.cpp b/sycl/source/detail/image_impl.cpp
@@ -273,8 +273,6 @@ static void getImageInfo(const ContextImplPtr Context,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Mem image get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 }
 
@@ -296,8 +294,6 @@ image_impl::image_impl(cl_mem MemObject, const context &SyclContext,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Mem get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   sycl::detail::pi::PiMemImageFormat Format;

diff --git a/sycl/source/detail/kernel_bundle_impl.hpp b/sycl/source/detail/kernel_bundle_impl.hpp
@@ -421,8 +421,6 @@ class kernel_bundle_impl {
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Program get info command not supported by backend.");
-    } else {
-      Plugin->checkPiResult(Result);
     }
 
     // Get the kernel names.
@@ -433,8 +431,6 @@ class kernel_bundle_impl {
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Program get info command not supported by backend.");
-    } else {
-      Plugin->checkPiResult(Result);
     }
 
     // semi-colon delimited list of kernel names.
@@ -446,8 +442,6 @@ class kernel_bundle_impl {
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Program get info command not supported by backend.");
-    } else {
-      Plugin->checkPiResult(Result);
     }
     std::vector<std::string> KernelNames =
         detail::split_string(KernelNamesStr, ';');

diff --git a/sycl/source/detail/kernel_impl.cpp b/sycl/source/detail/kernel_impl.cpp
@@ -55,8 +55,6 @@ kernel_impl::kernel_impl(sycl::detail::pi::PiKernel Kernel,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get info command not supported by backend.");
-  } else {
-    getPlugin()->checkPiResult(Result);
   }
 
   if (ContextImpl->getHandleRef() != Context) {

diff --git a/sycl/source/detail/kernel_info.hpp b/sycl/source/detail/kernel_info.hpp
@@ -38,8 +38,6 @@ get_kernel_info(sycl::detail::pi::PiKernel Kernel, const PluginPtr &Plugin) {
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
   if (ResultSize == 0) {
     return "";
@@ -52,8 +50,6 @@ get_kernel_info(sycl::detail::pi::PiKernel Kernel, const PluginPtr &Plugin) {
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
   return std::string(Result.data());
 }
@@ -72,8 +68,6 @@ get_kernel_info(sycl::detail::pi::PiKernel Kernel, const PluginPtr &Plugin) {
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
   return Result;
 }
@@ -93,8 +87,6 @@ get_kernel_device_specific_info_helper(sycl::detail::pi::PiKernel Kernel,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get sub group info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 }
 
@@ -169,8 +161,6 @@ uint32_t get_kernel_device_specific_info_with_input(
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get sub group info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   return Result;

diff --git a/sycl/source/detail/persistent_device_code_cache.cpp b/sycl/source/detail/persistent_device_code_cache.cpp
@@ -114,8 +114,6 @@ void PersistentDeviceCodeCache::putItemToDisc(
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   std::vector<size_t> BinarySizes(DeviceNum);
@@ -126,8 +124,6 @@ void PersistentDeviceCodeCache::putItemToDisc(
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   std::vector<std::vector<char>> Result;
@@ -137,15 +133,13 @@ void PersistentDeviceCodeCache::putItemToDisc(
     Pointers.push_back(Result[I].data());
   }
 
-  PiResult = Plugin->call<PiApiKind::piProgramGetInfo>(
+  PiResult = Plugin->call_nocheck<PiApiKind::piProgramGetInfo>(
       NativePrg, PI_PROGRAM_INFO_BINARIES, sizeof(char *) * Pointers.size(),
       Pointers.data(), nullptr);
   if (PiResult == PI_ERROR_INVALID_OPERATION) {
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   size_t i = 0;

diff --git a/sycl/source/detail/platform_impl.cpp b/sycl/source/detail/platform_impl.cpp
@@ -258,8 +258,6 @@ std::vector<int> platform_impl::filterDeviceFilter(
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Platform get info command not supported by backend.");
-  } else {
-    MPlugin->checkPiResult(Result);
   }
   backend Backend = convertBackend(PiBackend);
 

diff --git a/sycl/source/detail/platform_impl.hpp b/sycl/source/detail/platform_impl.hpp
@@ -54,8 +54,6 @@ class platform_impl {
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Platform get info command not supported by backend.");
-    } else {
-      APlugin->checkPiResult(Result);
     }
     MBackend = convertBackend(PiBackend);
   }

diff --git a/sycl/source/detail/platform_info.hpp b/sycl/source/detail/platform_info.hpp
@@ -32,8 +32,6 @@ get_platform_info_string_impl(sycl::detail::pi::PiPlatform Plt,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Platform get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
   if (ResultSize == 0) {
     return "";
@@ -47,8 +45,6 @@ get_platform_info_string_impl(sycl::detail::pi::PiPlatform Plt,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Platform get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
   return Result.get();
 }

diff --git a/sycl/source/detail/program_impl.cpp b/sycl/source/detail/program_impl.cpp
@@ -156,8 +156,6 @@ program_impl::program_impl(ContextImplPtr Context,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   std::vector<sycl::detail::pi::PiDevice> PiDevices(NumDevices);
@@ -169,8 +167,6 @@ program_impl::program_impl(ContextImplPtr Context,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   std::vector<device> PlatformDevices =
@@ -199,8 +195,6 @@ program_impl::program_impl(ContextImplPtr Context,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get build info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
   if (BinaryType == PI_PROGRAM_BINARY_TYPE_NONE) {
     throw invalid_object_error(
@@ -216,8 +210,6 @@ program_impl::program_impl(ContextImplPtr Context,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get build info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   std::vector<char> OptionsVector(Size);
@@ -228,8 +220,6 @@ program_impl::program_impl(ContextImplPtr Context,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get build info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   std::string Options(OptionsVector.begin(), OptionsVector.end());
@@ -389,8 +379,6 @@ std::vector<std::vector<char>> program_impl::get_binaries() const {
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   std::vector<char *> Pointers;
@@ -406,8 +394,6 @@ std::vector<std::vector<char>> program_impl::get_binaries() const {
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(PiResult);
   }
 
   return Result;
@@ -480,10 +466,10 @@ program_impl::get_pi_kernel_arg_mask_pair(const std::string &KernelName) const {
   // Some PI Plugins (like OpenCL) require this call to enable USM
   // For others, PI will turn this into a NOP.
   if (getContextImplPtr()->getPlatformImpl()->supports_usm()) {
-  Plugin->call<PiApiKind::piKernelSetExecInfo>(
-      Result.first, PI_USM_INDIRECT_ACCESS, sizeof(pi_bool), &PI_TRUE);
+    Plugin->call<PiApiKind::piKernelSetExecInfo>(
+        Result.first, PI_USM_INDIRECT_ACCESS, sizeof(pi_bool), &PI_TRUE);
   }
-  
+
   return Result;
 }
 

diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
@@ -768,8 +768,6 @@ ProgramManager::getPiProgramFromPiKernel(sycl::detail::pi::PiKernel Kernel,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Kernel get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   return Program;
@@ -787,8 +785,6 @@ ProgramManager::getProgramBuildLog(const sycl::detail::pi::PiProgram &Program,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   std::vector<sycl::detail::pi::PiDevice> PIDevices(
@@ -800,8 +796,6 @@ ProgramManager::getProgramBuildLog(const sycl::detail::pi::PiProgram &Program,
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Program get info command not supported by backend.");
-  } else {
-    Plugin->checkPiResult(Result);
   }
 
   std::string Log = "The program was built for " +
@@ -818,8 +812,6 @@ ProgramManager::getProgramBuildLog(const sycl::detail::pi::PiProgram &Program,
       throw sycl::exception(
           sycl::make_error_code(sycl::errc::feature_not_supported),
           "Program get build info command not supported by backend.");
-    } else {
-      Plugin->checkPiResult(Result);
     }
 
     if (DeviceBuildInfoStrSize > 0) {
@@ -833,8 +825,6 @@ ProgramManager::getProgramBuildLog(const sycl::detail::pi::PiProgram &Program,
         throw sycl::exception(
             sycl::make_error_code(sycl::errc::feature_not_supported),
             "Program get build info command not supported by backend.");
-      } else {
-        Plugin->checkPiResult(Result);
       }
       DeviceBuildInfoString = std::string(DeviceBuildInfo.data());
     }