[ESIMD] Aggressively inline every function called by ESIMD kernel

This patch is created to overcome a current limitation of Intel
GPU vector backend that requires kernel functions to be inlined
into the kernel itself.

I removed later inlining passes since AlwaysInline pass is supposed
to inline everything that's possible.

Author: DenisBakhvalov

llvm/lib/SYCLLowerIR/LowerESIMD.cpp

@@ -1233,6 +1233,11 @@ void SYCLLowerESIMDLegacyPass::collectGenXVolatileType(Module &M) {
 PreservedAnalyses SYCLLowerESIMDPass::run(Function &F,
                                           FunctionAnalysisManager &FAM,
                                           SmallPtrSet<Type *, 4> &GVTS) {
+  // Add 'alwaysinline' attribute to every function called from ESIMD kernel
+  if ((F.getCallingConv() != CallingConv::SPIR_KERNEL) &&
+      !F.hasFnAttribute(Attribute::AlwaysInline))
+    F.addFnAttr(Attribute::AlwaysInline);
+
   SmallVector<CallInst *, 32> ESIMDIntrCalls;
   SmallVector<Instruction *, 8> ESIMDToErases;
 

llvm/test/SYCLLowerIR/esimd_lower_inline_hint.ll

@@ -0,0 +1,51 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-attributes
+; RUN: opt -LowerESIMD -S < %s | FileCheck %s
+
+; This test checks that LowerESIMD pass sets the 'alwaysinline'
+; attribute for all the functions called from ESIMD kernels.
+
+define spir_kernel void @EsimdKernel1() {
+; CHECK-LABEL: @EsimdKernel1(
+; CHECK-NEXT:    call void @foo()
+; CHECK-NEXT:    call void @bar()
+; CHECK-NEXT:    ret void
+;
+  call void @foo()
+  call void @bar()
+  ret void
+}
+
+define spir_kernel void @EsimdKernel2() {
+; CHECK-LABEL: @EsimdKernel2(
+; CHECK-NEXT:    call void @foobar()
+; CHECK-NEXT:    ret void
+;
+  call void @foobar()
+  ret void
+}
+
+define spir_func void @foo() {
+; CHECK: Function Attrs: alwaysinline
+; CHECK-LABEL: @foo(
+; CHECK-NEXT:    ret void
+;
+  ret void
+}
+
+define spir_func void @bar() {
+; CHECK: Function Attrs: alwaysinline
+; CHECK-LABEL: @bar(
+; CHECK-NEXT:    call void @foobar()
+; CHECK-NEXT:    ret void
+;
+  call void @foobar()
+  ret void
+}
+
+define spir_func void @foobar() {
+; CHECK: Function Attrs: alwaysinline
+; CHECK-LABEL: @foobar(
+; CHECK-NEXT:    ret void
+;
+  ret void
+}

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

@@ -36,6 +36,7 @@
 #include "llvm/Support/SystemUtils.h"
 #include "llvm/Support/WithColor.h"
 #include "llvm/Transforms/IPO.h"
+#include "llvm/Transforms/IPO/AlwaysInliner.h"
 #include "llvm/Transforms/IPO/GlobalDCE.h"
 #include "llvm/Transforms/InstCombine/InstCombine.h"
 #include "llvm/Transforms/Scalar.h"
@@ -668,40 +669,17 @@ static string_vector saveResultSymbolsLists(string_vector &ResSymbolsLists,
     }                                                                          \
   }
 
-// Helper function for creating Inliner pass.
-// The approach is taken from opt tool.
-static Pass *createFunctionInliningPassHelper() {
-  if (OptLevelO0)
-    return createFunctionInliningPass(0, 0, false);
-
-  if (OptLevelO1)
-    return createFunctionInliningPass(1, 0, false);
-
-  if (OptLevelO2)
-    return createFunctionInliningPass(2, 0, false);
-
-  if (OptLevelOs)
-    return createFunctionInliningPass(2, 1, false);
-
-  if (OptLevelOz)
-    return createFunctionInliningPass(2, 2, false);
-
-  if (OptLevelO3)
-    return createFunctionInliningPass(3, 0, false);
-
-  return createFunctionInliningPass();
-}
-
 // When ESIMD code was separated from the regular SYCL code,
 // we can safely process ESIMD part.
 // TODO: support options like -debug-pass, -print-[before|after], and others
 static void LowerEsimdConstructs(Module &M) {
   legacy::PassManager MPM;
   MPM.add(createSYCLLowerESIMDPass());
   if (!OptLevelO0) {
-    // Inlining and SROA passes are required to make
-    // ESIMD/accessor_gather_scatter.cpp test work.
-    MPM.add(createFunctionInliningPassHelper());
+    // LowerESIMD pass sets 'alwaysinline' attribute to all the functions
+    // in the call graph for every ESIMD kernel, which is later consumed
+    // by AlwaysInliner pass.
+    MPM.add(createAlwaysInlinerLegacyPass());
     MPM.add(createSROAPass());
   }
   MPM.add(createESIMDLowerVecArgPass());
@@ -711,11 +689,6 @@ static void LowerEsimdConstructs(Module &M) {
     MPM.add(createEarlyCSEPass(true));
     MPM.add(createInstructionCombiningPass());
     MPM.add(createDeadCodeEliminationPass());
-    MPM.add(createFunctionInliningPassHelper());
-    MPM.add(createSROAPass());
-    MPM.add(createEarlyCSEPass(true));
-    MPM.add(createInstructionCombiningPass());
-    MPM.add(createDeadCodeEliminationPass());
   }
   MPM.add(createGenXSPIRVWriterAdaptorPass());
   MPM.run(M);