[SYCL] Rename Plugin object -> Adapter.

llvm-spirv/CMakeLists.txt

@@ -113,28 +113,28 @@ endif()
 set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # first try locating SPIRV-Tools via pkgconfig (the old way)
-pkg_search_module(SPIRV_TOOLS SPIRV-Tools)
-if (NOT SPIRV_TOOLS_FOUND)
-  # then try locating SPIRV-Tools via cmake (the new way)
-  find_package(SPIRV-Tools)
-  find_package(SPIRV-Tools-tools)
-  if (SPIRV-Tools_FOUND AND SPIRV-Tools-tools_FOUND)
-    set(SPIRV_TOOLS_FOUND TRUE)
-    # check for the existance of library targets in the found packages
-    if(TARGET SPIRV-Tools-shared)
-      # use the shared libary target if present
-      set(SPIRV-Tools-library SPIRV-Tools-shared)
-    elseif(TARGET SPIRV-Tools-static)
-      # otherwise fallback to the static library target
-      set(SPIRV-Tools-library SPIRV-Tools-static)
-    else()
-      message(FATAL_ERROR "Found SPIRV-Tools package but neither "
-              "SPIRV-Tools-shared or SPIRV-Tools-static targets exist.")
-    endif()
-    set(SPIRV_TOOLS_LDFLAGS ${SPIRV-Tools-library})
-    get_target_property(SPIRV_TOOLS_INCLUDE_DIRS ${SPIRV-Tools-library} INTERFACE_INCLUDE_DIRECTORIES)
-  endif()
-endif()
+#pkg_search_module(SPIRV_TOOLS SPIRV-Tools)
+#if (NOT SPIRV_TOOLS_FOUND)
+#  # then try locating SPIRV-Tools via cmake (the new way)
+#  find_package(SPIRV-Tools)
+#  find_package(SPIRV-Tools-tools)
+#  if (SPIRV-Tools_FOUND AND SPIRV-Tools-tools_FOUND)
+#    set(SPIRV_TOOLS_FOUND TRUE)
+#    # check for the existance of library targets in the found packages
+#    if(TARGET SPIRV-Tools-shared)
+#      # use the shared libary target if present
+#      set(SPIRV-Tools-library SPIRV-Tools-shared)
+#    elseif(TARGET SPIRV-Tools-static)
+#      # otherwise fallback to the static library target
+#      set(SPIRV-Tools-library SPIRV-Tools-static)
+#    else()
+#      message(FATAL_ERROR "Found SPIRV-Tools package but neither "
+#              "SPIRV-Tools-shared or SPIRV-Tools-static targets exist.")
+#    endif()
+#    set(SPIRV_TOOLS_LDFLAGS ${SPIRV-Tools-library})
+#    get_target_property(SPIRV_TOOLS_INCLUDE_DIRS ${SPIRV-Tools-library} INTERFACE_INCLUDE_DIRECTORIES)
+#  endif()
+#endif()
 
 if (NOT SPIRV_TOOLS_FOUND)
   message(STATUS "SPIRV-Tools not found; project will be built without "

sycl/include/sycl/detail/ur.hpp

@@ -103,12 +103,12 @@ __SYCL_EXPORT void contextSetExtendedDeleter(const sycl::context &constext,
                                              void *user_data);
 }
 
-class plugin;
-using PluginPtr = std::shared_ptr<plugin>;
+class adapter;
+using AdapterPtr = std::shared_ptr<adapter>;
 
 // TODO: To be removed as this was only introduced for esimd which was removed.
 template <sycl::backend BE>
-__SYCL_EXPORT void *getPluginOpaqueData(void *opaquedata_arg);
+__SYCL_EXPORT void *getAdapterOpaqueData(void *opaquedata_arg);
 
 namespace ur {
 // Function to load a shared library
@@ -126,11 +126,11 @@ void *getOsLibraryFuncAddress(void *Library, const std::string &FunctionName);
 void *getURLoaderLibrary();
 
 // Performs UR one-time initialization.
-std::vector<PluginPtr> &
+std::vector<AdapterPtr> &
 initializeUr(ur_loader_config_handle_t LoaderConfig = nullptr);
 
-// Get the plugin serving given backend.
-template <backend BE> const PluginPtr &getPlugin();
+// Get the adapter serving given backend.
+template <backend BE> const AdapterPtr &getAdapter();
 
 // The SYCL_UR_TRACE sets what we will trace.
 // This is a bit-mask of various things we'd want to trace.

sycl/include/sycl/handler.hpp

@@ -768,16 +768,16 @@ class __SYCL_EXPORT handler {
       int ArgIndex);
 
   /* The kernel passed to StoreLambda can take an id, an item or an nd_item as
-   * its argument. Since esimd plugin directly invokes the kernel (doesn’t use
-   * piKernelSetArg), the kernel argument type must be known to the plugin.
-   * However, passing kernel argument type to the plugin requires changing ABI
+   * its argument. Since esimd adapter directly invokes the kernel (doesn’t use
+   * urKernelSetArg), the kernel argument type must be known to the plugin.
+   * However, passing kernel argument type to the adapter requires changing ABI
    * in HostKernel class. To overcome this problem, helpers below wrap the
    * “original” kernel with a functor that always takes an nd_item as argument.
    * A functor is used instead of a lambda because extractArgsAndReqsFromLambda
    * needs access to the “original” kernel and keeps references to its internal
    * data, i.e. the kernel passed as argument cannot be local in scope. The
    * functor itself is again encapsulated in a std::function since functor’s
-   * type is unknown to the plugin.
+   * type is unknown to the adapter.
    */
 
   // For 'id, item w/wo offset, nd_item' kernel arguments

sycl/source/backend.cpp

@@ -11,7 +11,7 @@
 #include "detail/kernel_bundle_impl.hpp"
 #include "detail/kernel_id_impl.hpp"
 #include "detail/platform_impl.hpp"
-#include "detail/plugin.hpp"
+#include "detail/adapter.hpp"
 #include "detail/queue_impl.hpp"
 #include "sycl/detail/impl_utils.hpp"
 #include <sycl/backend.hpp>
@@ -29,20 +29,20 @@ namespace sycl {
 inline namespace _V1 {
 namespace detail {
 
-static const PluginPtr &getPlugin(backend Backend) {
+static const AdapterPtr &getAdapter(backend Backend) {
   switch (Backend) {
   case backend::opencl:
-    return ur::getPlugin<backend::opencl>();
+    return ur::getAdapter<backend::opencl>();
   case backend::ext_oneapi_level_zero:
-    return ur::getPlugin<backend::ext_oneapi_level_zero>();
+    return ur::getAdapter<backend::ext_oneapi_level_zero>();
   case backend::ext_oneapi_cuda:
-    return ur::getPlugin<backend::ext_oneapi_cuda>();
+    return ur::getAdapter<backend::ext_oneapi_cuda>();
   case backend::ext_oneapi_hip:
-    return ur::getPlugin<backend::ext_oneapi_hip>();
+    return ur::getAdapter<backend::ext_oneapi_hip>();
   default:
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::runtime),
-        "getPlugin: Unsupported backend " +
+        "getAdapter: Unsupported backend " +
             detail::codeToString(UR_RESULT_ERROR_INVALID_OPERATION));
   }
 }
@@ -68,34 +68,34 @@ backend convertUrBackend(ur_platform_backend_t UrBackend) {
 }
 
 platform make_platform(ur_native_handle_t NativeHandle, backend Backend) {
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
 
   // Create UR platform first.
   ur_platform_handle_t UrPlatform = nullptr;
-  Plugin->call<UrApiKind::urPlatformCreateWithNativeHandle>(
-      NativeHandle, Plugin->getUrAdapter(), nullptr, &UrPlatform);
+  Adapter->call<UrApiKind::urPlatformCreateWithNativeHandle>(
+      NativeHandle, Adapter->getUrAdapter(), nullptr, &UrPlatform);
 
   return detail::createSyclObjFromImpl<platform>(
-      platform_impl::getOrMakePlatformImpl(UrPlatform, Plugin));
+      platform_impl::getOrMakePlatformImpl(UrPlatform, Adapter));
 }
 
 __SYCL_EXPORT device make_device(ur_native_handle_t NativeHandle,
                                  backend Backend) {
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
 
   ur_device_handle_t UrDevice = nullptr;
-  Plugin->call<UrApiKind::urDeviceCreateWithNativeHandle>(
-      NativeHandle, Plugin->getUrAdapter(), nullptr, &UrDevice);
+  Adapter->call<UrApiKind::urDeviceCreateWithNativeHandle>(
+      NativeHandle, Adapter->getUrAdapter(), nullptr, &UrDevice);
   // Construct the SYCL device from UR device.
   return detail::createSyclObjFromImpl<device>(
-      std::make_shared<device_impl>(UrDevice, Plugin));
+      std::make_shared<device_impl>(UrDevice, Adapter));
 }
 
 __SYCL_EXPORT context make_context(ur_native_handle_t NativeHandle,
                                    const async_handler &Handler,
                                    backend Backend, bool KeepOwnership,
                                    const std::vector<device> &DeviceList) {
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
 
   ur_context_handle_t UrContext = nullptr;
   ur_context_native_properties_t Properties{};
@@ -105,12 +105,12 @@ __SYCL_EXPORT context make_context(ur_native_handle_t NativeHandle,
   for (const auto &Dev : DeviceList) {
     DeviceHandles.push_back(detail::getSyclObjImpl(Dev)->getHandleRef());
   }
-  Plugin->call<UrApiKind::urContextCreateWithNativeHandle>(
-      NativeHandle, Plugin->getUrAdapter(), DeviceHandles.size(),
+  Adapter->call<UrApiKind::urContextCreateWithNativeHandle>(
+      NativeHandle, Adapter->getUrAdapter(), DeviceHandles.size(),
       DeviceHandles.data(), &Properties, &UrContext);
   // Construct the SYCL context from UR context.
   return detail::createSyclObjFromImpl<context>(std::make_shared<context_impl>(
-      UrContext, Handler, Plugin, DeviceList, !KeepOwnership));
+      UrContext, Handler, Adapter, DeviceList, !KeepOwnership));
 }
 
 __SYCL_EXPORT queue make_queue(ur_native_handle_t NativeHandle,
@@ -120,7 +120,7 @@ __SYCL_EXPORT queue make_queue(ur_native_handle_t NativeHandle,
                                const async_handler &Handler, backend Backend) {
   ur_device_handle_t UrDevice =
       Device ? getSyclObjImpl(*Device)->getHandleRef() : nullptr;
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
   const auto &ContextImpl = getSyclObjImpl(Context);
 
   if (PropList.has_property<ext::intel::property::queue::compute_index>()) {
@@ -150,7 +150,7 @@ __SYCL_EXPORT queue make_queue(ur_native_handle_t NativeHandle,
   // Create UR queue first.
   ur_queue_handle_t UrQueue = nullptr;
 
-  Plugin->call<UrApiKind::urQueueCreateWithNativeHandle>(
+  Adapter->call<UrApiKind::urQueueCreateWithNativeHandle>(
       NativeHandle, ContextImpl->getHandleRef(), UrDevice, &NativeProperties,
       &UrQueue);
   // Construct the SYCL queue from UR queue.
@@ -166,82 +166,82 @@ __SYCL_EXPORT event make_event(ur_native_handle_t NativeHandle,
 __SYCL_EXPORT event make_event(ur_native_handle_t NativeHandle,
                                const context &Context, bool KeepOwnership,
                                backend Backend) {
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
   const auto &ContextImpl = getSyclObjImpl(Context);
 
   ur_event_handle_t UrEvent = nullptr;
   ur_event_native_properties_t Properties{};
   Properties.stype = UR_STRUCTURE_TYPE_EVENT_NATIVE_PROPERTIES;
   Properties.isNativeHandleOwned = !KeepOwnership;
 
-  Plugin->call<UrApiKind::urEventCreateWithNativeHandle>(
+  Adapter->call<UrApiKind::urEventCreateWithNativeHandle>(
       NativeHandle, ContextImpl->getHandleRef(), &Properties, &UrEvent);
   event Event = detail::createSyclObjFromImpl<event>(
       std::make_shared<event_impl>(UrEvent, Context));
 
   if (Backend == backend::opencl)
-    Plugin->call<UrApiKind::urEventRetain>(UrEvent);
+    Adapter->call<UrApiKind::urEventRetain>(UrEvent);
   return Event;
 }
 
 std::shared_ptr<detail::kernel_bundle_impl>
 make_kernel_bundle(ur_native_handle_t NativeHandle,
                    const context &TargetContext, bool KeepOwnership,
                    bundle_state State, backend Backend) {
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
   const auto &ContextImpl = getSyclObjImpl(TargetContext);
 
   ur_program_handle_t UrProgram = nullptr;
   ur_program_native_properties_t Properties{};
   Properties.stype = UR_STRUCTURE_TYPE_PROGRAM_NATIVE_PROPERTIES;
   Properties.isNativeHandleOwned = !KeepOwnership;
 
-  Plugin->call<UrApiKind::urProgramCreateWithNativeHandle>(
+  Adapter->call<UrApiKind::urProgramCreateWithNativeHandle>(
       NativeHandle, ContextImpl->getHandleRef(), &Properties, &UrProgram);
   if (UrProgram == nullptr)
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::invalid),
         "urProgramCreateWithNativeHandle resulted in a null program handle.");
 
   if (ContextImpl->getBackend() == backend::opencl)
-    Plugin->call<UrApiKind::urProgramRetain>(UrProgram);
+    Adapter->call<UrApiKind::urProgramRetain>(UrProgram);
 
   std::vector<ur_device_handle_t> ProgramDevices;
   uint32_t NumDevices = 0;
 
-  Plugin->call<UrApiKind::urProgramGetInfo>(
+  Adapter->call<UrApiKind::urProgramGetInfo>(
       UrProgram, UR_PROGRAM_INFO_NUM_DEVICES, sizeof(NumDevices), &NumDevices,
       nullptr);
   ProgramDevices.resize(NumDevices);
-  Plugin->call<UrApiKind::urProgramGetInfo>(
+  Adapter->call<UrApiKind::urProgramGetInfo>(
       UrProgram, UR_PROGRAM_INFO_DEVICES,
       sizeof(ur_device_handle_t) * NumDevices, ProgramDevices.data(), nullptr);
 
   for (auto &Dev : ProgramDevices) {
     ur_program_binary_type_t BinaryType;
-    Plugin->call<UrApiKind::urProgramGetBuildInfo>(
+    Adapter->call<UrApiKind::urProgramGetBuildInfo>(
         UrProgram, Dev, UR_PROGRAM_BUILD_INFO_BINARY_TYPE,
         sizeof(ur_program_binary_type_t), &BinaryType, nullptr);
     switch (BinaryType) {
     case (UR_PROGRAM_BINARY_TYPE_NONE):
       if (State == bundle_state::object) {
-        auto Res = Plugin->call_nocheck<UrApiKind::urProgramCompileExp>(
+        auto Res = Adapter->call_nocheck<UrApiKind::urProgramCompileExp>(
             UrProgram, 1, &Dev, nullptr);
         if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
-          Res = Plugin->call_nocheck<UrApiKind::urProgramCompile>(
+          Res = Adapter->call_nocheck<UrApiKind::urProgramCompile>(
               ContextImpl->getHandleRef(), UrProgram, nullptr);
         }
-        Plugin->checkUrResult<errc::build>(Res);
+        Adapter->checkUrResult<errc::build>(Res);
       }
 
       else if (State == bundle_state::executable) {
-        auto Res = Plugin->call_nocheck<UrApiKind::urProgramBuildExp>(
+        auto Res = Adapter->call_nocheck<UrApiKind::urProgramBuildExp>(
             UrProgram, 1, &Dev, nullptr);
         if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
-          Res = Plugin->call_nocheck<UrApiKind::urProgramBuild>(
+          Res = Adapter->call_nocheck<UrApiKind::urProgramBuild>(
               ContextImpl->getHandleRef(), UrProgram, nullptr);
         }
-        Plugin->checkUrResult<errc::build>(Res);
+        Adapter->checkUrResult<errc::build>(Res);
       }
 
       break;
@@ -254,15 +254,15 @@ make_kernel_bundle(ur_native_handle_t NativeHandle,
                 detail::codeToString(UR_RESULT_ERROR_INVALID_VALUE));
       if (State == bundle_state::executable) {
         ur_program_handle_t UrLinkedProgram = nullptr;
-        auto Res = Plugin->call_nocheck<UrApiKind::urProgramLinkExp>(
+        auto Res = Adapter->call_nocheck<UrApiKind::urProgramLinkExp>(
             ContextImpl->getHandleRef(), 1, &Dev, 1, &UrProgram, nullptr,
             &UrLinkedProgram);
         if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
-          Res = Plugin->call_nocheck<UrApiKind::urProgramLink>(
+          Res = Adapter->call_nocheck<UrApiKind::urProgramLink>(
               ContextImpl->getHandleRef(), 1, &UrProgram, nullptr,
               &UrLinkedProgram);
         }
-        Plugin->checkUrResult<errc::build>(Res);
+        Adapter->checkUrResult<errc::build>(Res);
         if (UrLinkedProgram != nullptr) {
           UrProgram = UrLinkedProgram;
         }
@@ -284,9 +284,9 @@ make_kernel_bundle(ur_native_handle_t NativeHandle,
   Devices.reserve(ProgramDevices.size());
   std::transform(
       ProgramDevices.begin(), ProgramDevices.end(), std::back_inserter(Devices),
-      [&Plugin](const auto &Dev) {
+      [&Adapter](const auto &Dev) {
         auto Platform =
-            detail::platform_impl::getPlatformFromUrDevice(Dev, Plugin);
+            detail::platform_impl::getPlatformFromUrDevice(Dev, Adapter);
         auto DeviceImpl = Platform->getOrMakeDeviceImpl(Dev, Platform);
         return createSyclObjFromImpl<device>(DeviceImpl);
       });
@@ -316,7 +316,7 @@ kernel make_kernel(const context &TargetContext,
                    const kernel_bundle<bundle_state::executable> &KernelBundle,
                    ur_native_handle_t NativeHandle, bool KeepOwnership,
                    backend Backend) {
-  const auto &Plugin = getPlugin(Backend);
+  const auto &Adapter = getAdapter(Backend);
   const auto &ContextImpl = getSyclObjImpl(TargetContext);
   const auto KernelBundleImpl = getSyclObjImpl(KernelBundle);
 
@@ -346,12 +346,12 @@ kernel make_kernel(const context &TargetContext,
   ur_kernel_native_properties_t Properties{};
   Properties.stype = UR_STRUCTURE_TYPE_KERNEL_NATIVE_PROPERTIES;
   Properties.isNativeHandleOwned = !KeepOwnership;
-  Plugin->call<UrApiKind::urKernelCreateWithNativeHandle>(
+  Adapter->call<UrApiKind::urKernelCreateWithNativeHandle>(
       NativeHandle, ContextImpl->getHandleRef(), UrProgram, &Properties,
       &UrKernel);
 
   if (Backend == backend::opencl)
-    Plugin->call<UrApiKind::urKernelRetain>(UrKernel);
+    Adapter->call<UrApiKind::urKernelRetain>(UrKernel);
 
   // Construct the SYCL queue from UR queue.
   return detail::createSyclObjFromImpl<kernel>(

sycl/source/backend/level_zero.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <detail/platform_impl.hpp>
-#include <detail/plugin.hpp>
+#include <detail/adapter.hpp>
 #include <detail/queue_impl.hpp>
 #include <sycl/backend.hpp>
 #include <sycl/sycl.hpp>
@@ -19,12 +19,12 @@ using namespace sycl::detail;
 
 __SYCL_EXPORT device make_device(const platform &Platform,
                                  ur_native_handle_t NativeHandle) {
-  const auto &Plugin = ur::getPlugin<backend::ext_oneapi_level_zero>();
+  const auto &Adapter = ur::getAdapter<backend::ext_oneapi_level_zero>();
   const auto &PlatformImpl = getSyclObjImpl(Platform);
   // Create UR device first.
   ur_device_handle_t UrDevice;
-  Plugin->call<UrApiKind::urDeviceCreateWithNativeHandle>(
-      NativeHandle, Plugin->getUrAdapter(), nullptr, &UrDevice);
+  Adapter->call<UrApiKind::urDeviceCreateWithNativeHandle>(
+      NativeHandle, Adapter->getUrAdapter(), nullptr, &UrDevice);
 
   return detail::createSyclObjFromImpl<device>(
       PlatformImpl->getOrMakeDeviceImpl(UrDevice, PlatformImpl));