From 8540bb165d720cd1199923199887c324f230d16d Mon Sep 17 00:00:00 2001
From: Denis Bakhvalov <denis.bakhvalov@intel.com>
Date: Wed, 20 Jan 2021 15:41:39 -0800
Subject: [PATCH] [sycl-post-link] Set isEsimdImage property for ESIMD modules
 after splitting

---
 .../sycl-esimd/basic-sycl-esimd-split.ll              | 11 +++++++++--
 llvm/tools/sycl-post-link/sycl-post-link.cpp          |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/llvm/test/tools/sycl-post-link/sycl-esimd/basic-sycl-esimd-split.ll b/llvm/test/tools/sycl-post-link/sycl-esimd/basic-sycl-esimd-split.ll
index 94f52ff519d0d..a45a9ae048349 100644
--- a/llvm/test/tools/sycl-post-link/sycl-esimd/basic-sycl-esimd-split.ll
+++ b/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,10 @@ 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: 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/misc properties]
+; CHECK-ESIMD-PROP: isEsimdImage=1|1
diff --git a/llvm/tools/sycl-post-link/sycl-post-link.cpp b/llvm/tools/sycl-post-link/sycl-post-link.cpp
index 2e16ed5612539..4a28151ac71af 100644
--- a/llvm/tools/sycl-post-link/sycl-post-link.cpp
+++ b/llvm/tools/sycl-post-link/sycl-post-link.cpp
@@ -586,6 +586,12 @@ static string_vector saveDeviceImageProperty(
             NameInfoPair.first, llvm::util::PropertyValue(Data, DataBitSize)));
       }
     }
+
+    if (ImgPSInfo.IsEsimdKernel) {
+      PropSet[llvm::util::PropertySetRegistry::SYCL_MISC_PROP].insert(
+          {"isEsimdImage", true});
+    }
+
     std::error_code EC;
     std::string SCFile =
         makeResultFileName(".prop", I, ImgPSInfo.IsEsimdKernel ? "esimd_" : "");