[SYCL][WIP] Remove devicelib jit link

sycl/doc/design/PropertySets.md

@@ -72,20 +72,6 @@ constant.
 
 See also [SYCL2020-SpecializationConstants.md](./SYCL2020-SpecializationConstants.md).
 
-
-### [SYCL/devicelib req mask]
-
-__Key:__ At most one entry with "DeviceLibReqMask".
-
-__Value type:__ 32 bit integer. ("1")
-
-__Value:__ A bitmask of which device libraries the binary uses.
-
-__Notes:__
-
-1. If this property set is missing, no device libraries are used by the binary.
-
-
 ### [SYCL/kernel param opt]
 
 __Key:__ Kernel name.

sycl/source/detail/compiler.hpp

@@ -44,9 +44,6 @@
 /// PropertySetIO.h
 #define __SYCL_PROPERTY_SET_SPEC_CONST_DEFAULT_VALUES_MAP                      \
   "SYCL/specialization constants default values"
-/// TODO: remove req mask when sycl devicelib online linking path is removed.
-/// PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK defined in PropertySetIO.h
-#define __SYCL_PROPERTY_SET_DEVICELIB_REQ_MASK "SYCL/devicelib req mask"
 /// PropertySetRegistry::SYCL_DEVICELIB_METADATA defined in PropertySetIO.h
 #define __SYCL_PROPERTY_SET_DEVICELIB_METADATA "SYCL/devicelib metadata"
 /// PropertySetRegistry::SYCL_KERNEL_PARAM_OPT_INFO defined in PropertySetIO.h

sycl/source/detail/context_impl.cpp

@@ -128,7 +128,6 @@ context_impl::~context_impl() {
       if (DGEntry != nullptr)
         DGEntry->removeAssociatedResources(this);
     }
-    MCachedLibPrograms.clear();
     // TODO catch an exception and put it to list of asynchronous exceptions
     getAdapter().call_nocheck<UrApiKind::urContextRelease>(MContext);
   } catch (std::exception &e) {

sycl/source/detail/context_impl.hpp

@@ -130,27 +130,6 @@ class context_impl : public std::enable_shared_from_this<context_impl> {
 
   devices_range getDevices() const { return MDevices; }
 
-  using CachedLibProgramsT =
-      std::map<std::pair<DeviceLibExt, ur_device_handle_t>,
-               Managed<ur_program_handle_t>>;
-
-  /// In contrast to user programs, which are compiled from user code, library
-  /// programs come from the SYCL runtime. They are identified by the
-  /// corresponding extension:
-  ///
-  ///  cl_intel_devicelib_assert -> #<ur program with assert functions>
-  ///  cl_intel_devicelib_complex -> #<ur program with complex functions>
-  ///  etc.
-  ///
-  /// See `doc/design/DeviceLibExtensions.rst' for
-  /// more details.
-  ///
-  /// \returns an instance of sycl::detail::Locked which wraps a map with device
-  /// library programs and the corresponding lock for synchronized access.
-  Locked<CachedLibProgramsT> acquireCachedLibPrograms() {
-    return {MCachedLibPrograms, MCachedLibProgramsMutex};
-  }
-
   KernelProgramCache &getKernelProgramCache() const {
     return MKernelProgramCache;
   }
@@ -266,8 +245,6 @@ class context_impl : public std::enable_shared_from_this<context_impl> {
   ur_context_handle_t MContext;
   platform_impl &MPlatform;
   property_list MPropList;
-  CachedLibProgramsT MCachedLibPrograms;
-  std::mutex MCachedLibProgramsMutex;
   mutable KernelProgramCache MKernelProgramCache;
   mutable PropertySupport MSupportBufferLocationByDevices;
 

sycl/source/detail/device_binary_image.cpp

@@ -188,7 +188,6 @@ RTDeviceBinaryImage::RTDeviceBinaryImage(sycl_device_binary Bin) {
   SpecConstIDMap.init(Bin, __SYCL_PROPERTY_SET_SPEC_CONST_MAP);
   SpecConstDefaultValuesMap.init(
       Bin, __SYCL_PROPERTY_SET_SPEC_CONST_DEFAULT_VALUES_MAP);
-  DeviceLibReqMask.init(Bin, __SYCL_PROPERTY_SET_DEVICELIB_REQ_MASK);
   DeviceLibMetadata.init(Bin, __SYCL_PROPERTY_SET_DEVICELIB_METADATA);
   KernelParamOptInfo.init(Bin, __SYCL_PROPERTY_SET_KERNEL_PARAM_OPT_INFO);
   ImplicitLocalArg.init(Bin, __SYCL_PROPERTY_SET_SYCL_IMPLICIT_LOCAL_ARG);
@@ -551,10 +550,6 @@ DynRTDeviceBinaryImage::DynRTDeviceBinaryImage(
       &MergedExportedSymbols,    &MergedRegisteredKernels};
 
   // Exclusive merges.
-  auto MergedDeviceLibReqMask =
-      exclusiveMergeBinaryProperties(Imgs, [](const RTDeviceBinaryImage &Img) {
-        return Img.getDeviceLibReqMask();
-      });
   auto MergedProgramMetadata =
       exclusiveMergeBinaryProperties(Imgs, [](const RTDeviceBinaryImage &Img) {
         return Img.getProgramMetadata();
@@ -571,9 +566,8 @@ DynRTDeviceBinaryImage::DynRTDeviceBinaryImage(
 
   std::array<const std::unordered_map<std::string_view,
                                       const sycl_device_binary_property> *,
-             4>
-      MergedMaps{&MergedDeviceLibReqMask, &MergedProgramMetadata,
-                 &MergedImportedSymbols, &MergedMisc};
+             3>
+      MergedMaps{&MergedProgramMetadata, &MergedImportedSymbols, &MergedMisc};
 
   // When merging exported and imported, the exported symbols may cancel out
   // some of the imported symbols.
@@ -676,7 +670,6 @@ DynRTDeviceBinaryImage::DynRTDeviceBinaryImage(
   CopyPropertiesVec(MergedExportedSymbols, ExportedSymbols);
   CopyPropertiesVec(MergedRegisteredKernels, RegisteredKernels);
 
-  CopyPropertiesMap(MergedDeviceLibReqMask, DeviceLibReqMask);
   CopyPropertiesMap(MergedProgramMetadata, ProgramMetadata);
   CopyPropertiesMap(MergedImportedSymbols, ImportedSymbols);
   CopyPropertiesMap(MergedMisc, Misc);

sycl/source/detail/device_binary_image.hpp

@@ -216,7 +216,6 @@ class RTDeviceBinaryImage {
   const PropertyRange &getSpecConstantsDefaultValues() const {
     return SpecConstDefaultValuesMap;
   }
-  const PropertyRange &getDeviceLibReqMask() const { return DeviceLibReqMask; }
   const PropertyRange &getDeviceLibMetadata() const {
     return DeviceLibMetadata;
   }
@@ -255,7 +254,6 @@ class RTDeviceBinaryImage {
   ur::DeviceBinaryType Format = SYCL_DEVICE_BINARY_TYPE_NONE;
   RTDeviceBinaryImage::PropertyRange SpecConstIDMap;
   RTDeviceBinaryImage::PropertyRange SpecConstDefaultValuesMap;
-  RTDeviceBinaryImage::PropertyRange DeviceLibReqMask;
   RTDeviceBinaryImage::PropertyRange DeviceLibMetadata;
   RTDeviceBinaryImage::PropertyRange KernelParamOptInfo;
   RTDeviceBinaryImage::PropertyRange ProgramMetadata;