Merge branch 'pr_2999' into llvmspirv_pulldown

Author: vmaksimo

clang/lib/Frontend/CompilerInvocation.cpp

@@ -968,7 +968,10 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
           Args.getLastArg(OPT_emit_llvm_uselists, OPT_no_emit_llvm_uselists))
     Opts.EmitLLVMUseLists = A->getOption().getID() == OPT_emit_llvm_uselists;
 
-  Opts.DisableLLVMPasses = Args.hasArg(OPT_disable_llvm_passes);
+  Opts.DisableLLVMPasses =
+      Args.hasArg(OPT_disable_llvm_passes) ||
+      (Args.hasArg(OPT_fsycl_is_device) && Triple.isSPIR() &&
+       Args.hasArg(OPT_fno_sycl_early_optimizations));
   Opts.DisableLifetimeMarkers = Args.hasArg(OPT_disable_lifetimemarkers);
 
   const llvm::Triple::ArchType DebugEntryValueArchs[] = {

clang/test/CodeGenSYCL/kernel-early-optimization-pipeline.cpp

@@ -0,0 +1,10 @@
+// Check LLVM optimization pipeline is run by default for SPIR-V compiled for
+// SYCL device target, and can be disabled with -fno-sycl-early-optimizations.
+//
+// RUN: %clang_cc1 -O2 -fsycl -fsycl-is-device -triple spir64-unknown-unknown-sycldevice %s -mllvm -debug-pass=Structure -emit-llvm -o - 2>&1 | FileCheck %s --check-prefix=CHECK-EARLYOPT
+// CHECK-EARLYOPT: Lower Work Group Scope Code
+// CHECK-EARLYOPT: Combine redundant instructions
+//
+// RUN: %clang_cc1 -O2 -fsycl -fsycl-is-device -fno-sycl-early-optimizations -triple spir64-unknown-unknown-sycldevice %s -mllvm -debug-pass=Structure -emit-llvm -o - 2>&1 | FileCheck %s --check-prefix=CHECK-NOEARLYOPT
+// CHECK-NOEARLYOPT: Lower Work Group Scope Code
+// CHECK-NOEARLYOPT-NOT: Combine redundant instructions