[SYCL] Link fallback device libraries on demand (#1787)

Signed-off-by: gejin <[email protected]>

Author: jinge90

libdevice/fallback-cmath-fp64.cpp

@@ -10,6 +10,9 @@
 
 #ifdef __SPIR__
 
+// To support fallback device libraries on-demand loading, please update the
+// DeviceLibFuncMap in llvm/tools/sycl-post-link/sycl-post-link.cpp if you add
+// or remove any item in this file.
 DEVICE_EXTERN_C
 double __devicelib_log(double x) { return __spirv_ocl_log(x); }
 

libdevice/fallback-cmath.cpp

@@ -10,6 +10,11 @@
 
 #ifdef __SPIR__
 
+// To support fallback device libraries on-demand loading, please update the
+// DeviceLibFuncMap in llvm/tools/sycl-post-link/sycl-post-link.cpp if you add
+// or remove any item in this file.
+// TODO: generate the DeviceLibFuncMap in sycl-post-link.cpp automatically
+// during the build based on libdevice to avoid manually sync.
 DEVICE_EXTERN_C
 float __devicelib_scalbnf(float x, int n) { return __spirv_ocl_ldexp(x, n); }
 

libdevice/fallback-complex-fp64.cpp

@@ -12,6 +12,9 @@
 #ifdef __SPIR__
 #include <cmath>
 
+// To support fallback device libraries on-demand loading, please update the
+// DeviceLibFuncMap in llvm/tools/sycl-post-link/sycl-post-link.cpp if you add
+// or remove any item in this file.
 DEVICE_EXTERN_C
 double __devicelib_creal(double __complex__ z) { return __real__(z); }
 

libdevice/fallback-complex.cpp

@@ -12,6 +12,9 @@
 #ifdef __SPIR__
 #include <cmath>
 
+// To support fallback device libraries on-demand loading, please update the
+// DeviceLibFuncMap in llvm/tools/sycl-post-link/sycl-post-link.cpp if you add
+// or remove any item in this file.
 DEVICE_EXTERN_C
 float __devicelib_crealf(float __complex__ z) { return __real__(z); }
 

llvm/include/llvm/Support/PropertySetIO.h

@@ -123,6 +123,7 @@ class PropertySetRegistry {
   // Specific property category names used by tools.
   static constexpr char SYCL_SPECIALIZATION_CONSTANTS[] =
       "SYCL/specialization constants";
+  static constexpr char SYCL_DEVICELIB_REQ_MASK[] = "SYCL/devicelib req mask";
 
   // Function for bulk addition of an entire property set under given category
   // (property set name).
@@ -160,4 +161,4 @@ class PropertySetRegistry {
 } // namespace util
 } // namespace llvm
 
-#endif // #define LLVM_SUPPORT_PROPERTYSETIO_H
+#endif // #define LLVM_SUPPORT_PROPERTYSETIO_H

llvm/lib/Support/PropertySetIO.cpp

@@ -113,5 +113,6 @@ template <> PropertyValue::Type PropertyValue::getTypeTag<uint32_t>() {
 }
 
 constexpr char PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS[];
+constexpr char PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK[];
 } // namespace util
 } // namespace llvm

llvm/lib/Support/SimpleTable.cpp

@@ -64,7 +64,7 @@ int SimpleTable::getColumnId(StringRef ColName) const {
 
 Error SimpleTable::addColumnName(StringRef ColName) {
   if (ColumnName2Num.find(ColName) != ColumnName2Num.end())
-    return makeError("column already exists" + ColName);
+    return makeError("column already exists " + ColName);
   ColumnNames.emplace_back(ColName.str());
   ColumnName2Num[ColumnNames.back()] = static_cast<int>(ColumnNames.size()) - 1;
   ColumnNum2Name.push_back(std::prev(ColumnNames.end()));

llvm/tools/sycl-post-link/sycl-post-link.cpp

@@ -15,6 +15,7 @@
 
 #include "SpecConstants.h"
 #include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/Triple.h"
 #include "llvm/Bitcode/BitcodeWriterPass.h"
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/IR/InstIterator.h"
@@ -47,6 +48,18 @@ cl::OptionCategory PostLinkCat{"sycl-post-link options"};
 static constexpr char COL_CODE[] = "Code";
 static constexpr char COL_SYM[] = "Symbols";
 static constexpr char COL_PROPS[] = "Properties";
+static constexpr char DEVICELIB_FUNC_PREFIX[] = "__devicelib_";
+
+// DeviceLibExt is shared between sycl-post-link tool and sycl runtime.
+// If any change is made here, need to sync with DeviceLibExt definition
+// in sycl/source/detail/program_manager/program_manager.hpp
+enum class DeviceLibExt : std::uint32_t {
+  cl_intel_devicelib_assert,
+  cl_intel_devicelib_math,
+  cl_intel_devicelib_math_fp64,
+  cl_intel_devicelib_complex,
+  cl_intel_devicelib_complex_fp64
+};
 
 // InputFilename - The filename to read from.
 static cl::opt<std::string> InputFilename{
@@ -104,6 +117,143 @@ static cl::opt<SpecConstMode> SpecConstLower{
                    "set spec constants to C++ defaults")),
     cl::cat(PostLinkCat)};
 
+struct ImagePropSaveInfo {
+  bool NeedDeviceLibReqMask;
+  bool DoSpecConst;
+  bool SetSpecConstAtRT;
+  bool SpecConstsMet;
+};
+// Please update DeviceLibFuncMap if any item is added to or removed from
+// fallback device libraries in libdevice.
+static std::unordered_map<std::string, DeviceLibExt> DeviceLibFuncMap = {
+    {"__devicelib_acosf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_acoshf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_asinf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_asinhf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_atan2f", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_atanf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_atanhf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_cbrtf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_cosf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_coshf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_erfcf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_erff", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_exp2f", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_expf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_expm1f", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_fdimf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_fmaf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_fmodf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_frexpf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_hypotf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_ilogbf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_ldexpf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_lgammaf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_log10f", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_log1pf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_log2f", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_logbf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_logf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_modff", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_nextafterf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_powf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_remainderf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_remquof", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_sinf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_sinhf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_sqrtf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_tanf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_tanhf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_tgammaf", DeviceLibExt::cl_intel_devicelib_math},
+    {"__devicelib_acos", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_acosh", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_asin", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_asinh", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_atan", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_atan2", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_atanh", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_cbrt", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_cos", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_cosh", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_erf", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_erfc", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_exp", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_exp2", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_expm1", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_fdim", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_fma", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_fmod", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_frexp", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_hypot", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_ilogb", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_ldexp", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_lgamma", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_log", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_log10", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_log1p", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_log2", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_logb", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_modf", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_nextafter", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_pow", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_remainder", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_remquo", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_sin", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_sinh", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_sqrt", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_tan", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_tanh", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib_tgamma", DeviceLibExt::cl_intel_devicelib_math_fp64},
+    {"__devicelib___divsc3", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib___mulsc3", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cabsf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cacosf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cacoshf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cargf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_casinf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_casinhf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_catanf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_catanhf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_ccosf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_ccoshf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cexpf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cimagf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_clogf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cpolarf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cpowf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_cprojf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_crealf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_csinf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_csinhf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_csqrtf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_ctanf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib_ctanhf", DeviceLibExt::cl_intel_devicelib_complex},
+    {"__devicelib___divdc3", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib___muldc3", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cabs", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cacos", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cacosh", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_carg", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_casin", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_casinh", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_catan", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_catanh", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_ccos", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_ccosh", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cexp", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cimag", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_clog", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cpolar", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cpow", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_cproj", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_creal", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_csin", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_csinh", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_csqrt", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_ctan", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+    {"__devicelib_ctanh", DeviceLibExt::cl_intel_devicelib_complex_fp64},
+};
+
 static void error(const Twine &Msg) {
   errs() << "sycl-post-link: " << Msg << '\n';
   exit(1);
@@ -295,20 +445,76 @@ saveResultModules(std::vector<std::unique_ptr<Module>> &ResModules) {
   return Res;
 }
 
-static string_vector
-saveSpecConstantIDMaps(const std::vector<SpecIDMapTy> &Maps) {
-  string_vector Res;
+// Each fallback device library corresponds to one bit in "require mask" which
+// is an unsigned int32. getDeviceLibBit checks which fallback device library
+// is required for FuncName and returns the corresponding bit. The corresponding
+// mask for each fallback device library is:
+// fallback-cassert:      0x1
+// fallback-cmath:        0x2
+// fallback-cmath-fp64:   0x4
+// fallback-complex:      0x8
+// fallback-complex-fp64: 0x10
+static uint32_t getDeviceLibBits(const std::string &FuncName) {
+  auto DeviceLibFuncIter = DeviceLibFuncMap.find(FuncName);
+  return ((DeviceLibFuncIter == DeviceLibFuncMap.end())
+              ? 0
+              : 0x1 << (static_cast<uint32_t>(DeviceLibFuncIter->second) -
+                        static_cast<uint32_t>(
+                            DeviceLibExt::cl_intel_devicelib_assert)));
+}
 
-  for (size_t I = 0; I < Maps.size(); ++I) {
-    std::string SCFile = makeResultFileName(".prop", I);
+// For each device image module, we go through all functions which meets
+// 1. The function name has prefix "__devicelib_"
+// 2. The function is declaration which means it doesn't have function body
+// And we don't expect non-spirv functions with "__devicelib_" prefix.
+static uint32_t getModuleReqMask(const Module &M) {
+  // Device libraries will be enabled only for spir-v module.
+  if (!llvm::Triple(M.getTargetTriple()).isSPIR())
+    return 0;
+  // 0x1 means sycl runtime will link and load libsycl-fallback-assert.spv as
+  // default. In fact, default link assert spv is not necessary but dramatic
+  // perf regression is observed if we don't link any device library. The perf
+  // regression is caused by a clang issue.
+  uint32_t ReqMask = 0x1;
+  for (const Function &SF : M) {
+    if (SF.getName().startswith(DEVICELIB_FUNC_PREFIX) && SF.isDeclaration()) {
+      assert(SF.getCallingConv() == CallingConv::SPIR_FUNC);
+      uint32_t DeviceLibBits = getDeviceLibBits(SF.getName().str());
+      ReqMask |= DeviceLibBits;
+    }
+  }
+  return ReqMask;
+}
+
+static string_vector saveDeviceImageProperty(
+    const std::vector<std::unique_ptr<Module>> &ResultModules,
+    const ImagePropSaveInfo &ImgPSInfo) {
+  string_vector Res;
+  for (size_t I = 0; I < ResultModules.size(); ++I) {
     llvm::util::PropertySetRegistry PropSet;
-    PropSet.add(llvm::util::PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS,
-                Maps[I]);
+    if (ImgPSInfo.NeedDeviceLibReqMask) {
+      uint32_t MRMask = getModuleReqMask(*ResultModules[I]);
+      std::map<StringRef, uint32_t> RMEntry = {{"DeviceLibReqMask", MRMask}};
+      PropSet.add(llvm::util::PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK,
+                  RMEntry);
+    }
+    if (ImgPSInfo.DoSpecConst && ImgPSInfo.SetSpecConstAtRT) {
+      // extract spec constant maps per each module
+      SpecIDMapTy TmpSpecIDMap;
+      if (ImgPSInfo.SpecConstsMet)
+        SpecConstantsPass::collectSpecConstantMetadata(*ResultModules[I].get(),
+                                                       TmpSpecIDMap);
+      PropSet.add(
+          llvm::util::PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS,
+          TmpSpecIDMap);
+    }
     std::error_code EC;
+    std::string SCFile = makeResultFileName(".prop", I);
     raw_fd_ostream SCOut(SCFile, EC);
     PropSet.write(SCOut);
     Res.emplace_back(std::move(SCFile));
   }
+
   return Res;
 }
 
@@ -412,7 +618,6 @@ int main(int argc, char **argv) {
   }
 
   std::vector<std::unique_ptr<Module>> ResultModules;
-  std::vector<SpecIDMapTy> ResultSpecIDMaps;
   string_vector ResultSymbolsLists;
 
   util::SimpleTable Table;
@@ -456,15 +661,11 @@ int main(int argc, char **argv) {
     Error Err = Table.addColumn(COL_CODE, Files);
     CHECK_AND_EXIT(Err);
   }
-  if (DoSpecConst && SetSpecConstAtRT) {
-    // extract spec constant maps per each module
-    for (auto &MUptr : ResultModules) {
-      ResultSpecIDMaps.emplace_back(SpecIDMapTy());
-      if (SpecConstsMet)
-        SpecConstantsPass::collectSpecConstantMetadata(*MUptr.get(),
-                                                       ResultSpecIDMaps.back());
-    }
-    string_vector Files = saveSpecConstantIDMaps(ResultSpecIDMaps);
+
+  {
+    ImagePropSaveInfo ImgPSInfo = {true, DoSpecConst, SetSpecConstAtRT,
+                                   SpecConstsMet};
+    string_vector Files = saveDeviceImageProperty(ResultModules, ImgPSInfo);
     Error Err = Table.addColumn(COL_PROPS, Files);
     CHECK_AND_EXIT(Err);
   }

sycl/include/CL/sycl/detail/pi.h

@@ -650,6 +650,8 @@ static const uint8_t PI_DEVICE_BINARY_OFFLOAD_KIND_SYCL = 4;
 /// PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS defined in
 /// PropertySetIO.h
 #define PI_PROPERTY_SET_SPEC_CONST_MAP "SYCL/specialization constants"
+/// PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK defined in PropertySetIO.h
+#define PI_PROPERTY_SET_DEVICELIB_REQ_MASK "SYCL/devicelib req mask"
 
 /// This struct is a record of the device binary information. If the Kind field
 /// denotes a portable binary type (SPIR-V or LLVM IR), the DeviceTargetSpec

sycl/include/CL/sycl/detail/pi.hpp

@@ -250,6 +250,7 @@ class DeviceBinaryImage {
     ConstIterator begin() const { return ConstIterator(Begin); }
     ConstIterator end() const { return ConstIterator(End); }
     friend class DeviceBinaryImage;
+    bool isAvailable() const { return !(Begin == nullptr); }
 
   private:
     PropertyRange() : Begin(nullptr), End(nullptr) {}
@@ -298,6 +299,7 @@ class DeviceBinaryImage {
   /// name of the property is the specializaion constant symbolic ID and the
   /// value is 32-bit unsigned integer ID.
   const PropertyRange &getSpecConstants() const { return SpecConstIDMap; }
+  const PropertyRange &getDeviceLibReqMask() const { return DeviceLibReqMask; }
   virtual ~DeviceBinaryImage() {}
 
 protected:
@@ -307,6 +309,7 @@ class DeviceBinaryImage {
   pi_device_binary Bin;
   pi::PiDeviceBinaryType Format = PI_DEVICE_BINARY_TYPE_NONE;
   DeviceBinaryImage::PropertyRange SpecConstIDMap;
+  DeviceBinaryImage::PropertyRange DeviceLibReqMask;
 };
 
 /// Tries to determine the device binary image foramat. Returns

sycl/source/detail/pi.cpp

@@ -549,6 +549,7 @@ void DeviceBinaryImage::init(pi_device_binary Bin) {
     Format = getBinaryImageFormat(Bin->BinaryStart, getSize());
 
   SpecConstIDMap.init(Bin, PI_PROPERTY_SET_SPEC_CONST_MAP);
+  DeviceLibReqMask.init(Bin, PI_PROPERTY_SET_DEVICELIB_REQ_MASK);
 }
 
 } // namespace pi