[SYCL] Add -vc-codegen compile option for ESIMD images

llvm/include/llvm/Support/PropertySetIO.h

@@ -187,6 +187,7 @@ class PropertySetRegistry {
       "SYCL/composite specialization constants";
   static constexpr char SYCL_DEVICELIB_REQ_MASK[] = "SYCL/devicelib req mask";
   static constexpr char SYCL_KERNEL_PARAM_OPT_INFO[] = "SYCL/kernel param opt";
+  static constexpr char SYCL_IS_ESIMD_IMAGE[] = "SYCL/is ESIMD image";
 
   // Function for bulk addition of an entire property set under given category
   // (property set name).

llvm/lib/Support/PropertySetIO.cpp

@@ -197,6 +197,7 @@ constexpr char PropertySetRegistry::SYCL_SPECIALIZATION_CONSTANTS[];
 constexpr char PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK[];
 constexpr char PropertySetRegistry::SYCL_KERNEL_PARAM_OPT_INFO[];
 constexpr char PropertySetRegistry::SYCL_COMPOSITE_SPECIALIZATION_CONSTANTS[];
+constexpr char PropertySetRegistry::SYCL_IS_ESIMD_IMAGE[];
 
 } // namespace util
 } // namespace llvm

llvm/test/tools/sycl-post-link/sycl-esimd/basic-sycl-esimd-split.ll

@@ -2,9 +2,11 @@
 ; RUN: FileCheck %s -input-file=%t.table
 ; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-SYCL-IR
 ; RUN: FileCheck %s -input-file=%t_esimd_0.ll --check-prefixes CHECK-ESIMD-IR
+; RUN: FileCheck %s -input-file=%t_0.prop --check-prefixes CHECK-SYCL-PROP
+; RUN: FileCheck %s -input-file=%t_esimd_0.prop --check-prefixes CHECK-ESIMD-PROP
 
-; This is basic test of splitting SYCL and ESIMD kernels into separate
-; modules.
+; This is basic test of splitting SYCL and ESIMD kernels into separate modules.
+; ESIMD module should have isEsimdImage=1 property set after splitting.
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
 target triple = "spir64-unknown-linux-sycldevice"
@@ -41,5 +43,11 @@ attributes #0 = { "sycl-module-id"="a.cpp" }
 ; CHECK-SYCL-IR-DAG: define dso_local spir_kernel void @SYCL_kernel()
 ; CHECK-SYCL-IR-DAG: declare dso_local spir_func i64 @_Z28__spirv_GlobalInvocationId_xv()
 
+; CHECK-SYCL-PROP-NOT: [SYCL/is ESIMD image]
+; CHECK-SYCL-PROP-NOT: isEsimdImage=1|1
+
 ; CHECK-ESIMD-IR-DAG: define dso_local spir_kernel void @ESIMD_kernel()
 ; CHECK-ESIMD-IR-DAG: declare dso_local spir_func i64 @_Z28__spirv_GlobalInvocationId_xv()
+
+; CHECK-ESIMD-PROP: [SYCL/is ESIMD image]
+; CHECK-ESIMD-PROP: isEsimdImage=1|1

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

@@ -586,6 +586,13 @@ static string_vector saveDeviceImageProperty(
             NameInfoPair.first, llvm::util::PropertyValue(Data, DataBitSize)));
       }
     }
+
+    if (ImgPSInfo.IsEsimdKernel) {
+      std::map<StringRef, bool> RMEntry = {{"isEsimdImage", true}};
+      PropSet.add(llvm::util::PropertySetRegistry::SYCL_IS_ESIMD_IMAGE,
+                  RMEntry);
+    }
+
     std::error_code EC;
     std::string SCFile =
         makeResultFileName(".prop", I, ImgPSInfo.IsEsimdKernel ? "esimd_" : "");

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

@@ -670,6 +670,8 @@ static const uint8_t PI_DEVICE_BINARY_OFFLOAD_KIND_SYCL = 4;
 #define __SYCL_PI_PROPERTY_SET_DEVICELIB_REQ_MASK "SYCL/devicelib req mask"
 /// PropertySetRegistry::SYCL_KERNEL_PARAM_OPT_INFO defined in PropertySetIO.h
 #define __SYCL_PI_PROPERTY_SET_KERNEL_PARAM_OPT_INFO "SYCL/kernel param opt"
+/// PropertySetRegistry::SYCL_IS_ESIMD_IMAGE defined in PropertySetIO.h
+#define __SYCL_PI_PROPERTY_SET_SYCL_IS_ESIMD_IMAGE "SYCL/is ESIMD image"
 
 /// 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

@@ -290,6 +290,9 @@ class DeviceBinaryImage {
     return Format;
   }
 
+  /// Returns the value of a single property
+  bool isBoolPropertyTrue(const char *PropName) const;
+
   /// Gets the iterator range over scalar specialization constants in this
   /// binary image. For each property pointed to by an iterator within the
   /// range, the name of the property is the specialization constant symbolic ID

sycl/source/detail/pi.cpp

@@ -565,6 +565,13 @@ void DeviceBinaryImage::PropertyRange::init(pi_device_binary Bin,
   End = Begin ? PS->PropertiesEnd : nullptr;
 }
 
+bool DeviceBinaryImage::isBoolPropertyTrue(const char *PropName) const {
+  DeviceBinaryImage::PropertyRange BoolProp;
+  BoolProp.init(Bin, PropName);
+  return BoolProp.isAvailable() &&
+         pi::DeviceBinaryProperty(*(BoolProp.begin())).asUint32();
+}
+
 RT::PiDeviceBinaryType getBinaryImageFormat(const unsigned char *ImgData,
                                             size_t ImgSize) {
   struct {

sycl/source/detail/program_manager/program_manager.cpp

@@ -390,8 +390,15 @@ RT::PiProgram ProgramManager::getBuiltPIProgram(OSModuleHandle M,
         !SYCLConfig<SYCL_DEVICELIB_NO_FALLBACK>::get())
       DeviceLibReqMask = getDeviceLibReqMask(Img);
 
+    std::string CompileOpts = Img.getCompileOptions();
+    if (Img.isBoolPropertyTrue(__SYCL_PI_PROPERTY_SET_SYCL_IS_ESIMD_IMAGE)) {
+      if (!CompileOpts.empty())
+        CompileOpts += " ";
+      CompileOpts += "-vc-codegen";
+    }
+
     ProgramPtr BuiltProgram =
-        build(std::move(ProgramManaged), ContextImpl, Img.getCompileOptions(),
+        build(std::move(ProgramManaged), ContextImpl, CompileOpts,
               Img.getLinkOptions(), getRawSyclObjImpl(Device)->getHandleRef(),
               ContextImpl->getCachedLibPrograms(), DeviceLibReqMask);