More test fixes

Signed-off-by: Konstantin S Bobrovsky <[email protected]>

Author: kbobrovs

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

@@ -3,17 +3,17 @@
 
 ; RUN: sycl-post-link -split=kernel -symbols -S %s -o %t.table
 ; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR0
-; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR1
-; RUN: FileCheck %s -input-file=%t_2.ll --check-prefixes CHECK-IR2
 ; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM0
+; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR1
 ; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM1
+; RUN: FileCheck %s -input-file=%t_2.ll --check-prefixes CHECK-IR2
 ; RUN: FileCheck %s -input-file=%t_2.sym --check-prefixes CHECK-SYM2
 
 ; RUN: sycl-post-link -split=kernel -emit-only-kernels-as-entry-points -symbols -S %s -o %t.table
-; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR1
-; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR2
-; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM1
-; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM2
+; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR1
+; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM1
+; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR0
+; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM0
 ; RUN: FileCheck %s -input-file=%t.table --check-prefixes CHECK-TABLE
 
 ; CHECK-TABLE: [Code|Properties|Symbols]
@@ -38,13 +38,13 @@ define dso_local spir_kernel void @kernel2() #0 {
 
 attributes #0 = { "sycl-module-id"="a.cpp" }
 
-; CHECK-IR0: define dso_local spir_func void @externalDeviceFunc()
+; CHECK-IR2: define dso_local spir_func void @externalDeviceFunc()
 ; CHECK-IR1: define dso_local spir_kernel void @kernel1()
-; CHECK-IR2: define dso_local spir_kernel void @kernel2()
+; CHECK-IR0: define dso_local spir_kernel void @kernel2()
 
-; CHECK-SYM0: externalDeviceFunc
-; CHECK-SYM0-EMPTY:
+; CHECK-SYM2: externalDeviceFunc
+; CHECK-SYM2-EMPTY:
 ; CHECK-SYM1: kernel1
 ; CHECK-SYM1-EMPTY:
-; CHECK-SYM2: kernel2
-; CHECK-SYM2-EMPTY:
+; CHECK-SYM0: kernel2
+; CHECK-SYM0-EMPTY:

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

@@ -78,7 +78,7 @@ bool hasIndirectFunctionsOrCalls(const Module &M) {
 
 EntryPointsGroupScope selectDeviceCodeGroupScope(const Module &M,
                                                  IRSplitMode Mode,
-  bool AutoSplitIsGlobalScope) {
+                                                 bool AutoSplitIsGlobalScope) {
   switch (Mode) {
   case SPLIT_PER_TU:
     return Scope_PerModule;
@@ -190,7 +190,6 @@ EntryPointGroupVec groupEntryPointsByScope(const Module &M,
   // Use MapVector for deterministic order of traversal (helps tests).
   MapVector<StringRef, EntryPointVec> EntryPointMap;
 
-
   // Only process module entry points:
   for (const auto &F : M.functions()) {
     if (!isEntryPoint(F, EmitOnlyKernelsAsEntryPoints))
@@ -351,9 +350,11 @@ getSplitterByKernelType(std::unique_ptr<Module> M,
 }
 
 std::unique_ptr<ModuleSplitterBase>
-getSplitterByMode(std::unique_ptr<Module> M, IRSplitMode Mode, bool AutoSplitIsGlobalScope,
+getSplitterByMode(std::unique_ptr<Module> M, IRSplitMode Mode,
+                  bool AutoSplitIsGlobalScope,
                   bool EmitOnlyKernelsAsEntryPoints) {
-  EntryPointsGroupScope Scope = selectDeviceCodeGroupScope(*M, Mode, AutoSplitIsGlobalScope);
+  EntryPointsGroupScope Scope =
+      selectDeviceCodeGroupScope(*M, Mode, AutoSplitIsGlobalScope);
   EntryPointGroupVec Groups =
       groupEntryPointsByScope(*M, Scope, EmitOnlyKernelsAsEntryPoints);
   assert(!Groups.empty() && "At least one group is expected");

llvm/tools/sycl-post-link/ModuleSplitter.h

@@ -170,7 +170,8 @@ getSplitterByKernelType(std::unique_ptr<Module> M,
                         EntryPointVec *AllowedEntries = nullptr);
 
 std::unique_ptr<ModuleSplitterBase>
-getSplitterByMode(std::unique_ptr<Module> M, IRSplitMode Mode, bool AutoSplitIsGlobalScope,
+getSplitterByMode(std::unique_ptr<Module> M, IRSplitMode Mode,
+                  bool AutoSplitIsGlobalScope,
                   bool EmitOnlyKernelsAsEntryPoints);
 
 #ifndef _NDEBUG

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

@@ -700,8 +700,8 @@ processInputModule(std::unique_ptr<Module> M) {
   // However, if split mode is "auto", then entry point filtering is still
   // performed.
   assert(!IROutputOnly || (SplitMode == module_split::SPLIT_NONE) ||
-    (SplitMode == module_split::SPLIT_AUTO) &&
-    "invalid split mode for IR-only output");
+         (SplitMode == module_split::SPLIT_AUTO) &&
+             "invalid split mode for IR-only output");
 
   // Top-level per-kernel/per-source splitter. SYCL/ESIMD splitting is applied
   // to modules resulting from the top-level splitting.