[SYCL][NATIVECPU] Move pipeline creation to CodeGen (#12854)

Fixes post commit failure from #12659.
intel · Feb 28, 2024 · 77c12c0 · 77c12c0
1 parent 7be96cf
commit 77c12c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
@@ -1087,6 +1087,10 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
 
  if (SYCLNativeCPUBackend) {
  llvm::sycl::utils::addSYCLNativeCPUBackendPasses(MPM, MAM, Level);
+ // Run optimization passes after all the changes we made to the kernels.
+ // Todo: maybe we could find a set of relevant passes instead of re-running
+ // the full optimization pipeline.
+ MPM.addPass(PB.buildPerModuleDefaultPipeline(Level));
  }
  if (LangOpts.SYCLIsDevice) {
  MPM.addPass(SYCLMutatePrintfAddrspacePass());

diff --git a/llvm/lib/SYCLLowerIR/PipelineSYCLNativeCPU.cpp b/llvm/lib/SYCLLowerIR/PipelineSYCLNativeCPU.cpp
@@ -11,8 +11,6 @@
 // When NATIVECPU_USE_OCK is set, adds passes from the oneAPI Construction Kit.
 //
 //===----------------------------------------------------------------------===//
-#include "llvm/Passes/OptimizationLevel.h"
-#include "llvm/Passes/PassBuilder.h"
 #include "llvm/SYCLLowerIR/ConvertToMuxBuiltinsSYCLNativeCPU.h"
 #include "llvm/SYCLLowerIR/PrepareSYCLNativeCPU.h"
 #include "llvm/SYCLLowerIR/RenameKernelSYCLNativeCPU.h"
@@ -24,9 +22,9 @@
 #include "compiler/utils/prepare_barriers_pass.h"
 #include "compiler/utils/sub_group_analysis.h"
 #include "compiler/utils/work_item_loops_pass.h"
+#include "llvm/Transforms/IPO/AlwaysInliner.h"
 #include "vecz/pass.h"
 #include "vecz/vecz_target_info.h"
-#include "llvm/Transforms/IPO/AlwaysInliner.h"
 #endif
 
 using namespace llvm;
@@ -88,10 +86,4 @@ void llvm::sycl::utils::addSYCLNativeCPUBackendPasses(
  MPM.addPass(PrepareSYCLNativeCPUPass());
  MPM.addPass(RenameKernelSYCLNativeCPUPass());
 
- // Run optimization passes after all the changes we made to the kernels.
- // Todo: check optimization level from clang
- // Todo: maybe we could find a set of relevant passes instead of re-running
- // the full optimization pipeline.
- PassBuilder PB;
- MPM.addPass(PB.buildPerModuleDefaultPipeline(OptLevel));
 }