remove SYCLRTShared.h to avoid touch LLVM functionality

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

Author: jinge90

llvm/include/llvm/Support/PropertySetIO.h

@@ -120,6 +120,11 @@ class PropertySetRegistry {
 public:
   using MapTy = MapVector<StringRef, PropertySet>;
 
+  // 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).
   template <typename T>

llvm/include/llvm/Support/SYCLRTShared.h

@@ -110,5 +110,8 @@ template <> uint32_t &PropertyValue::getValueRef<uint32_t>() {
 template <> PropertyValue::Type PropertyValue::getTypeTag<uint32_t>() {
   return UINT32;
 }
+
+constexpr char PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS[];
+constexpr char PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK[];
 } // namespace util
 } // namespace llvm

llvm/lib/Support/PropertySetIO.cpp

@@ -28,7 +28,6 @@
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PropertySetIO.h"
-#include "llvm/Support/SYCLRTShared.h"
 #include "llvm/Support/SimpleTable.h"
 #include "llvm/Support/SystemUtils.h"
 #include "llvm/Support/WithColor.h"
@@ -38,7 +37,6 @@
 #include <memory>
 
 using namespace llvm;
-using llvm::util::sycl::DeviceLibExt;
 
 using string_vector = std::vector<std::string>;
 using SpecIDMapTy = std::map<StringRef, unsigned>;
@@ -51,6 +49,18 @@ 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{
     cl::Positional, cl::desc("<input bitcode file>"), cl::init("-"),
@@ -485,15 +495,18 @@ static string_vector saveDeviceImageProperty(
     if (ImgPSInfo.NeedDeviceLibReqMask) {
       uint32_t MRMask = getModuleReqMask(*ResultModules[I]);
       std::map<StringRef, uint32_t> RMEntry = {{"DeviceLibReqMask", MRMask}};
-      PropSet.add(PROP_SYCL_DEVICELIB_REQ_MASK, RMEntry);
+      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(PROP_SYCL_SPECIALIZATION_CONSTANTS, TmpSpecIDMap);
+      PropSet.add(
+          llvm::util::PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS,
+          TmpSpecIDMap);
     }
     std::error_code EC;
     std::string SCFile = makeResultFileName(".prop", I);

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

@@ -644,6 +644,14 @@ static const uint8_t PI_DEVICE_BINARY_OFFLOAD_KIND_SYCL = 4;
 /// PTX 64-bit image <-> "nvptx64", 64-bit NVIDIA PTX device
 #define PI_DEVICE_BINARY_TARGET_NVPTX64 "nvptx64"
 
+/// Device binary image property set names recognized by the SYCL runtime.
+/// Name must be consistent with
+/// 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
 /// field can still be specific and denote e.g. FPGA target. It must match the

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

@@ -12,7 +12,6 @@
 /// \ingroup sycl_pi
 
 #include "context_impl.hpp"
-#include "llvm/Support/SYCLRTShared.h"
 #include <CL/sycl/context.hpp>
 #include <CL/sycl/detail/common.hpp>
 #include <CL/sycl/detail/pi.hpp>
@@ -543,8 +542,8 @@ void DeviceBinaryImage::init(pi_device_binary Bin) {
     // try to determine the format; may remain "NONE"
     Format = getBinaryImageFormat(Bin->BinaryStart, getSize());
 
-  SpecConstIDMap.init(Bin, PROP_SYCL_SPECIALIZATION_CONSTANTS);
-  DeviceLibReqMask.init(Bin, PROP_SYCL_DEVICELIB_REQ_MASK);
+  SpecConstIDMap.init(Bin, PI_PROPERTY_SET_SPEC_CONST_MAP);
+  DeviceLibReqMask.init(Bin, PI_PROPERTY_SET_DEVICELIB_REQ_MASK);
 }
 
 } // namespace pi

sycl/source/detail/pi.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #pragma once
-#include "llvm/Support/SYCLRTShared.h"
 #include <CL/sycl/detail/common.hpp>
 #include <CL/sycl/detail/device_binary_image.hpp>
 #include <CL/sycl/detail/export.hpp>
@@ -17,6 +16,7 @@
 #include <CL/sycl/detail/util.hpp>
 #include <CL/sycl/stl.hpp>
 
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <unordered_map>
@@ -43,7 +43,16 @@ namespace detail {
 class context_impl;
 using ContextImplPtr = std::shared_ptr<context_impl>;
 class program_impl;
-using llvm::util::sycl::DeviceLibExt;
+// DeviceLibExt is shared between sycl runtime and sycl-post-link tool.
+// If any update is made here, need to sync with DeviceLibExt definition
+// in llvm/tools/sycl-post-link/sycl-post-link.cpp
+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
+};
 
 // Provides single loading and building OpenCL programs with unique contexts
 // that is necessary for no interoperability cases with lambda.