Fixed code review comments

Author: DenisBakhvalov

llvm/test/tools/sycl-post-link/sycl-external-funcs/drop-unref-funcs.ll

@@ -0,0 +1,20 @@
+; RUN: sycl-post-link -ir-output-only -split=auto -S %s -o %t.ll
+; RUN: FileCheck %s -input-file=%t.ll
+
+; This test checks that unreferenced functions without sycl-module-id
+; attribute are dropped from the module 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"
+
+define dso_local spir_func void @externalDeviceFunc() #0 {
+  ret void
+}
+
+define dso_local spir_func void @unreferencedFunc() {
+  ret void
+}
+
+attributes #0 = { "sycl-module-id"="a.cpp" }
+
+; CHECK: define dso_local spir_func void @externalDeviceFunc()

llvm/test/tools/sycl-post-link/sycl-external-funcs/keep-indirectly-ref-funcs.ll

@@ -0,0 +1,16 @@
+; RUN: sycl-post-link -ir-output-only -split=auto -S %s -o %t.ll
+; RUN: FileCheck %s -input-file=%t.ll
+
+; This test checks that indirectly referenced functions (with sycl-module-id
+; attribute) are not dropped from the module.
+
+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"
+
+define dso_local spir_func void @indRefDeviceFunc() #0 {
+  ret void
+}
+
+attributes #0 = { "sycl-module-id"="a.cpp" "referenced-indirectly"}
+
+; CHECK: define dso_local spir_func void @indRefDeviceFunc()

llvm/test/tools/sycl-post-link/sycl-external-funcs/split-and-lower-esimd.ll

@@ -1,8 +1,9 @@
 ; RUN: sycl-post-link -split=auto -split-esimd -lower-esimd -O0 -S %s -o %t.table
 ; RUN: FileCheck %s -input-file=%t_esimd_0.ll
 
-; This test checks that unreferenced functions are not dropped
-; from the module and ESIMD lowering happens for them as well.
+; This test checks that unreferenced functions with sycl-module-id
+; attribute are not dropped from the module and ESIMD lowering
+; happens for them as well.
 
 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"

llvm/test/tools/sycl-post-link/sycl-external-funcs/split-global.ll

@@ -1,8 +1,9 @@
 ; RUN: sycl-post-link -ir-output-only -split=auto -S %s -o %t.ll
 ; RUN: FileCheck %s -input-file=%t.ll
 
-; This test checks that unreferenced functions are not dropped
-; from the module after splitting in global mode.
+; This test checks that unreferenced functions with sycl-module-id
+; attribute are not dropped from the module after splitting
+; in global mode.
 
 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"

llvm/test/tools/sycl-post-link/sycl-external-funcs/split-per-kernel.ll

@@ -4,8 +4,9 @@
 ; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM1
 ; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM2
 
-; This test checks that unreferenced functions are not dropped
-; from the module after splitting in per-kernel mode.
+; This test checks that unreferenced functions with sycl-module-id
+; attribute are not dropped from the module after splitting
+; in per-kernel mode.
 
 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"

llvm/test/tools/sycl-post-link/sycl-external-funcs/split-per-source1.ll

@@ -4,8 +4,9 @@
 ; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM1
 ; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM2
 
-; This test checks that unreferenced functions are not dropped
-; from the module after splitting in per-source mode.
+; This test checks that unreferenced functions with sycl-module-id
+; attribute are not dropped from the module after splitting
+; in per-source mode.
 
 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"

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

@@ -242,10 +242,14 @@ static void collectKernelModuleMap(
     Module &M, std::map<StringRef, std::vector<Function *>> &ResKernelModuleMap,
     KernelMapEntryScope EntryScope) {
 
+  // Process module entry points: kernels and SYCL_EXTERNAL functions.
+  // Only they have sycl-module-id attribute, so any other unrefenced
+  // functions are dropped.
   for (auto &F : M.functions()) {
-    // Process module entry points: kernels and SYCL_EXTERNAL functions.
-    // Only they have sycl-module-id attribute, so any other unrefenced
-    // functions are dropped.
+    if (!F.isDeclaration() && F.getCallingConv() != CallingConv::SPIR_KERNEL &&
+        F.getCallingConv() != CallingConv::SPIR_FUNC) {
+      error("Unsupported calling convention in function " + F.getName());
+    }
     if (F.hasFnAttribute(ATTR_SYCL_MODULE_ID)) {
       switch (EntryScope) {
       case Scope_PerKernel:
@@ -637,13 +641,17 @@ using ModulePair = std::pair<std::unique_ptr<Module>, std::unique_ptr<Module>>;
 // This function splits a module with a mix of SYCL and ESIMD kernels
 // into two separate modules.
 static ModulePair splitSyclEsimd(std::unique_ptr<Module> M) {
-  // Collect information about the SYCL and ESIMD kernels in the module.
   std::vector<Function *> SyclFunctions;
   std::vector<Function *> EsimdFunctions;
+  // Collect information about the SYCL and ESIMD functions in the module.
+  // Process module entry points: kernels and SYCL_EXTERNAL functions.
+  // Only they have sycl-module-id attribute, so any other unrefenced
+  // functions are dropped.
   for (auto &F : M->functions()) {
-    // Process module entry points: kernels and SYCL_EXTERNAL functions.
-    // Only they have sycl-module-id attribute, so any other unrefenced
-    // functions are dropped.
+    if (!F.isDeclaration() && F.getCallingConv() != CallingConv::SPIR_KERNEL &&
+        F.getCallingConv() != CallingConv::SPIR_FUNC) {
+      error("Unsupported calling convention in function " + F.getName());
+    }
     if (F.hasFnAttribute(ATTR_SYCL_MODULE_ID)) {
       if (F.getMetadata("sycl_explicit_simd"))
         EsimdFunctions.push_back(&F);