Turn back the first version of the fix.

This reverts commit 40b659d.

Author: mlychkov

clang/lib/CodeGen/BackendUtil.cpp

@@ -860,17 +860,6 @@ void EmitAssemblyHelper::CreatePasses(legacy::PassManager &MPM,
 
   PMBuilder.populateFunctionPassManager(FPM);
   PMBuilder.populateModulePassManager(MPM);
-
-  if (LangOpts.SYCLIsDevice) {
-    // Eliminate dead arguments from SPIR kernels in SYCL environment.
-    // Run DAE when LLVM optimizations are applied as well.
-    if (LangOpts.EnableDAEInSpirKernels)
-      MPM.add(createDeadArgEliminationSYCLPass());
-
-    // Allocate static local memory in SYCL kernel scope for each allocation
-    // call.
-    MPM.add(createSYCLLowerWGLocalMemoryLegacyPass());
-  }
 }
 
 static void setCommandLineOpts(const CodeGenOptions &CodeGenOpts) {
@@ -984,6 +973,12 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
 
   std::unique_ptr<llvm::ToolOutputFile> ThinLinkOS, DwoOS;
 
+  // Eliminate dead arguments from SPIR kernels in SYCL environment.
+  // Run DAE when LLVM optimizations are applied as well.
+  if (LangOpts.SYCLIsDevice && !CodeGenOpts.DisableLLVMPasses &&
+      LangOpts.EnableDAEInSpirKernels)
+    PerModulePasses.add(createDeadArgEliminationSYCLPass());
+
   // Add SPIRITTAnnotations pass to the pass manager if
   // -fsycl-instrument-device-code option was passed. This option can be
   // used only with spir triple.
@@ -994,6 +989,16 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
     PerModulePasses.add(createSPIRITTAnnotationsPass());
   }
 
+  // Allocate static local memory in SYCL kernel scope for each allocation call.
+  if (LangOpts.SYCLIsDevice) {
+    // Group local memory pass depends on inlining. Turn it on even in case if
+    // all llvm passes or SYCL early optimizations are disabled.
+    // FIXME: Remove this workaround when dependency on inlining is eliminated.
+    if (CodeGenOpts.DisableLLVMPasses)
+      PerModulePasses.add(createAlwaysInlinerLegacyPass(false));
+    PerModulePasses.add(createSYCLLowerWGLocalMemoryLegacyPass());
+  }
+
   switch (Action) {
   case Backend_EmitNothing:
     break;

clang/test/CodeGenSYCL/group-local-memory-inlining.cpp

@@ -1,5 +1,26 @@
-// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice \
-// RUN:     -S -emit-llvm -mllvm -debug-pass=Structure -o - %s 2>&1 \
-// RUN:     | FileCheck %s
+// Check that SYCLLowerWGLocalMemory pass is added to the SYCL device
+// compilation pipeline with the inliner pass.
 
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -emit-llvm \
+// RUN:   -mllvm -debug-pass=Structure %s -o - 2>&1 \
+// RUN:   | FileCheck %s
+// CHECK: Function Integration/Inlining
 // CHECK: Replace __sycl_allocateLocalMemory with allocation of memory in local address space
+
+// Check that AlwaysInliner pass is always run for compilation of SYCL device
+// target code, even if all optimizations are disabled.
+
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -emit-llvm \
+// RUN:   -mllvm -debug-pass=Structure %s -o - -disable-llvm-passes 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-NOPASSES
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -emit-llvm \
+// RUN:   -mllvm -debug-pass=Structure %s -o - -fno-sycl-early-optimizations 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-NOPASSES
+// CHECK-NOPASSES: Inliner for always_inline functions
+// CHECK-NOPASSES: Replace __sycl_allocateLocalMemory with allocation of memory in local address space
+
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -emit-llvm \
+// RUN:   -mllvm -debug-pass=Structure %s -o - -O0 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-O0opt
+// CHECK-O0opt: Inliner for always_inline functions
+// CHECK-O0opt: Replace __sycl_allocateLocalMemory with allocation of memory in local address space