[PassBuilder][PassManagerBuilder] Run LICM before loop spawning to en…

…sure loop-invariant conditions appear outside of the loop. Addresses llvm#66.
tarunprabhu · Jul 1, 2023 · 6d2ce44 · 6d2ce44
1 parent 7f98738
commit 6d2ce44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -1452,7 +1452,8 @@ PassBuilder::buildTapirLoweringPipeline(OptimizationLevel Level,
   // Rotate Loop - disable header duplication at -Oz
   LPM1.addPass(LoopRotatePass(Level != OptimizationLevel::Oz));
   LPM2.addPass(IndVarSimplifyPass());
-  LPM2.addPass(LICMPass(PTO.LicmMssaOptCap, PTO.LicmMssaNoAccForPromotionCap));
+  LPM2.addPass(LICMPass(PTO.LicmMssaOptCap, PTO.LicmMssaNoAccForPromotionCap,
+                        /*AllowSpeculation=*/true));
 
   FunctionPassManager FPM;
   FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM1),

diff --git a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
@@ -511,6 +511,7 @@ void PassManagerBuilder::populateModulePassManager(
     // rotated form due to GVN or other transformations, and loop spawning
     // relies on the rotated form.  Disable header duplication at -Oz.
     MPM.add(createLoopRotatePass(SizeLevel == 2 ? 0 : -1));
+    MPM.add(createLICMPass(LicmMssaOptCap, LicmMssaNoAccForPromotionCap));
     // Outline Tapir loops as needed.
     MPM.add(createLoopSpawningTIPass());