[llvm] 7e8f9d6 - [llvm][Inline] Add FunctionSimplificationPipeline to module inliner pipeline

[Liqiang Tao via llvm-commits]

Author: Liqiang Tao
Date: 2021-12-03T12:13:31+09:00
New Revision: 7e8f9d6b38a443d95daed3904334a96dcc549383

URL: https://github.com/llvm/llvm-project/commit/7e8f9d6b38a443d95daed3904334a96dcc549383
DIFF: https://github.com/llvm/llvm-project/commit/7e8f9d6b38a443d95daed3904334a96dcc549383.diff

LOG: [llvm][Inline] Add FunctionSimplificationPipeline to module inliner pipeline

The FunctionSimplificationPipeline could effectively reduce the size of .text section when module inliner is enabled.

Reviewed By: kazu

Differential Revision: https://reviews.llvm.org/D114704

Added: 
    

Modified: 
    llvm/include/llvm/Passes/PassBuilder.h
    llvm/lib/Passes/PassBuilderPipelines.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Passes/PassBuilder.h b/llvm/include/llvm/Passes/PassBuilder.h
index 7c7883e98183c..66b0b149fa257 100644
--- a/llvm/include/llvm/Passes/PassBuilder.h
+++ b/llvm/include/llvm/Passes/PassBuilder.h
@@ -199,7 +199,7 @@ class PassBuilder {
 
   /// Construct the module pipeline that performs inlining with
   /// module inliner pass.
-  ModuleInlinerPass buildModuleInlinerPipeline(OptimizationLevel Level,
+  ModulePassManager buildModuleInlinerPipeline(OptimizationLevel Level,
                                                ThinOrFullLTOPhase Phase);
 
   /// Construct the core LLVM module optimization pipeline.

diff  --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
index de1b0ace78766..50c8cf3c0d9f5 100644
--- a/llvm/lib/Passes/PassBuilderPipelines.cpp
+++ b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -754,9 +754,11 @@ PassBuilder::buildInlinerPipeline(OptimizationLevel Level,
   return MIWP;
 }
 
-ModuleInlinerPass
+ModulePassManager
 PassBuilder::buildModuleInlinerPipeline(OptimizationLevel Level,
                                         ThinOrFullLTOPhase Phase) {
+  ModulePassManager MPM;
+
   InlineParams IP = getInlineParamsFromOptLevel(Level);
   if (Phase == ThinOrFullLTOPhase::ThinLTOPreLink && PGOOpt &&
       PGOOpt->Action == PGOOptions::SampleUse)
@@ -773,7 +775,16 @@ PassBuilder::buildModuleInlinerPipeline(OptimizationLevel Level,
   // inline deferral logic in module inliner.
   IP.EnableDeferral = false;
 
-  return ModuleInlinerPass(IP, UseInlineAdvisor);
+  MPM.addPass(ModuleInlinerPass(IP, UseInlineAdvisor));
+
+  MPM.addPass(createModuleToFunctionPassAdaptor(
+      buildFunctionSimplificationPipeline(Level, Phase),
+      PTO.EagerlyInvalidateAnalyses));
+
+  MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(
+      CoroSplitPass(Level != OptimizationLevel::O0)));
+
+  return MPM;
 }
 
 ModulePassManager