[SYCL] Reimplemented -f[no]sycl-early-optimizations flag

clang/include/clang/Basic/CodeGenOptions.def

@@ -511,6 +511,9 @@ CODEGENOPT(OpaquePointers, 1, 0)
 /// non-deleting destructors. (No effect on Microsoft ABI.)
 CODEGENOPT(CtorDtorReturnThis, 1, 0)
 
+/// Whether to disable the standard optimization pipeline for the SYCL device compiler.
+CODEGENOPT(DisableSYCLEarlyOpts, 1, 0)
+
 #undef CODEGENOPT
 #undef ENUM_CODEGENOPT
 #undef VALUE_CODEGENOPT

clang/include/clang/Driver/Options.td

@@ -5107,7 +5107,13 @@ def : Flag<["-"], "fno-sycl-explicit-simd">,
   Flags<[CoreOption, Deprecated]>,
   Group<clang_ignored_legacy_options_Group>,
   HelpText<"Disable SYCL explicit SIMD extension. (deprecated)">;
-defm sycl_early_optimizations : OptOutCC1FFlag<"sycl-early-optimizations", "Enable", "Disable", " standard optimization pipeline for SYCL device compiler", [CoreOption]>;
+def fsycl_early_optimizations : Flag<["-"], "fsycl-early-optimizations">,
+  Flags<[CoreOption]>, Group<f_Group>,
+  HelpText<"Enable standard optimization pipeline for SYCL device compiler">;
+def fno_sycl_early_optimizations : Flag<["-"], "fno-sycl-early-optimizations">,
+  Flags<[CC1Option, CoreOption]>, Group<f_Group>,
+  HelpText<"Disable standard optimization pipeline for SYCL device compiler">,
+  MarshallingInfoFlag<CodeGenOpts<"DisableSYCLEarlyOpts">>;
 def fsycl_dead_args_optimization : Flag<["-"], "fsycl-dead-args-optimization">,
   Group<sycl_Group>, Flags<[NoArgumentUnused, CoreOption]>, HelpText<"Enables "
   "elimination of DPC++ dead kernel arguments">;

clang/lib/CodeGen/BackendUtil.cpp

@@ -915,25 +915,25 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
 
   ModulePassManager MPM;
 
-  // FIXME: Change this when -fno-sycl-early-optimizations is not tied to
-  // -disable-llvm-passes.
-  if (CodeGenOpts.DisableLLVMPasses && LangOpts.SYCLIsDevice)
+  if (LangOpts.SYCLIsDevice && !CodeGenOpts.DisableSYCLEarlyOpts)
     MPM.addPass(SYCLPropagateAspectsUsagePass());
 
   if (!CodeGenOpts.DisableLLVMPasses) {
+
     // Map our optimization levels into one of the distinct levels used to
     // configure the pipeline.
     OptimizationLevel Level = mapToLevel(CodeGenOpts);
 
-    if (LangOpts.SYCLIsDevice)
+    if (LangOpts.SYCLIsDevice && !CodeGenOpts.DisableSYCLEarlyOpts)
       PB.registerPipelineStartEPCallback(
           [&](ModulePassManager &MPM, OptimizationLevel Level) {
             MPM.addPass(ESIMDVerifierPass(LangOpts.SYCLESIMDForceStatelessMem));
             MPM.addPass(SYCLPropagateAspectsUsagePass());
           });
 
     // Add the InferAddressSpaces pass for all the SPIR[V] targets
-    if (TargetTriple.isSPIR() || TargetTriple.isSPIRV()) {
+    if ((TargetTriple.isSPIR() || TargetTriple.isSPIRV()) &&
+        !CodeGenOpts.DisableSYCLEarlyOpts) {
       PB.registerOptimizerLastEPCallback(
           [](ModulePassManager &MPM, OptimizationLevel Level) {
             MPM.addPass(createModuleToFunctionPassAdaptor(
@@ -1020,34 +1020,38 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
             MPM.addPass(InstrProfiling(*Options, false));
           });
 
-    if (CodeGenOpts.OptimizationLevel == 0) {
-      MPM = PB.buildO0DefaultPipeline(Level, IsLTO || IsThinLTO);
-    } else if (IsThinLTO) {
-      MPM = PB.buildThinLTOPreLinkDefaultPipeline(Level);
-    } else if (IsLTO) {
-      MPM = PB.buildLTOPreLinkDefaultPipeline(Level);
-    } else {
-      MPM = PB.buildPerModuleDefaultPipeline(Level);
+    if (!CodeGenOpts.DisableSYCLEarlyOpts) {
+      if (CodeGenOpts.OptimizationLevel == 0) {
+        MPM = PB.buildO0DefaultPipeline(Level, IsLTO || IsThinLTO);
+      } else if (IsThinLTO) {
+        MPM = PB.buildThinLTOPreLinkDefaultPipeline(Level);
+      } else if (IsLTO) {
+        MPM = PB.buildLTOPreLinkDefaultPipeline(Level);
+      } else {
+        MPM = PB.buildPerModuleDefaultPipeline(Level);
+      }
     }
 
     if (!CodeGenOpts.MemoryProfileOutput.empty()) {
       MPM.addPass(createModuleToFunctionPassAdaptor(MemProfilerPass()));
       MPM.addPass(ModuleMemProfilerPass());
     }
-  }
-  if (LangOpts.SYCLIsDevice) {
-    MPM.addPass(SYCLMutatePrintfAddrspacePass());
-    if (!CodeGenOpts.DisableLLVMPasses && LangOpts.EnableDAEInSpirKernels)
-      MPM.addPass(DeadArgumentEliminationSYCLPass());
-  }
 
-  // Add SPIRITTAnnotations pass to the pass manager if
-  // -fsycl-instrument-device-code option was passed. This option can be used
-  // only with spir triple.
-  if (LangOpts.SYCLIsDevice && CodeGenOpts.SPIRITTAnnotations) {
-    assert(TargetTriple.isSPIR() &&
-           "ITT annotations can only be added to a module with spir target");
-    MPM.addPass(SPIRITTAnnotationsPass());
+    if (LangOpts.SYCLIsDevice) {
+      MPM.addPass(SYCLMutatePrintfAddrspacePass());
+      if (LangOpts.EnableDAEInSpirKernels)
+        MPM.addPass(DeadArgumentEliminationSYCLPass());
+    }
+
+    // Add SPIRITTAnnotations pass to the pass manager if
+    // -fsycl-instrument-device-code option was passed. This option can be used
+    // only with spir triple.
+    if (LangOpts.SYCLIsDevice && CodeGenOpts.SPIRITTAnnotations &&
+        !CodeGenOpts.DisableSYCLEarlyOpts) {
+      assert(TargetTriple.isSPIR() &&
+             "ITT annotations can only be added to a module with spir target");
+      MPM.addPass(SPIRITTAnnotationsPass());
+    }
   }
 
   // Allocate static local memory in SYCL kernel scope for each allocation
@@ -1056,7 +1060,7 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
     // 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)
+    if (CodeGenOpts.DisableLLVMPasses || CodeGenOpts.DisableSYCLEarlyOpts)
       MPM.addPass(AlwaysInlinerPass(false));
     MPM.addPass(SYCLLowerWGLocalMemoryPass());
   }

clang/lib/Frontend/CompilerInvocation.cpp

@@ -1689,10 +1689,10 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
         {std::string(Split.first), std::string(Split.second)});
   }
 
-  Opts.DisableLLVMPasses =
-      Args.hasArg(OPT_disable_llvm_passes) ||
-      (Args.hasArg(OPT_fsycl_is_device) && T.isSPIR() &&
-       Args.hasArg(OPT_fno_sycl_early_optimizations));
+  Opts.DisableLLVMPasses = Args.hasArg(OPT_disable_llvm_passes);
+
+  Opts.DisableSYCLEarlyOpts = Args.hasArg(OPT_fsycl_is_device) && T.isSPIR() &&
+                              Args.hasArg(OPT_fno_sycl_early_optimizations);
 
   const llvm::Triple::ArchType DebugEntryValueArchs[] = {
       llvm::Triple::x86, llvm::Triple::x86_64, llvm::Triple::aarch64,