diff options
| -rw-r--r-- | llvm/lib/Passes/PassBuilder.cpp | 12 | ||||
| -rw-r--r-- | llvm/test/Other/new-pass-manager.ll | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 221ee15a78e..61499ab7d77 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -310,12 +310,13 @@ PassBuilder::buildFunctionSimplificationPipeline(OptimizationLevel Level, // the other we have is `LoopInstSimplify`. LoopPassManager LPM1(DebugLogging), LPM2(DebugLogging); + // FIXME: Enable these when the loop pass manager can support enforcing loop + // simplified and LCSSA form as well as updating the loop nest after + // transformations and we finsih porting the loop passes. +#if 0 // Rotate Loop - disable header duplication at -Oz LPM1.addPass(LoopRotatePass(Level != Oz)); LPM1.addPass(LICMPass()); - // FIXME: Enable these when the loop pass manager can support updating the - // loop nest after transformations and we finsih porting the loop passes. -#if 0 LPM1.addPass(LoopUnswitchPass(/* OptimizeForSize */ Level != O3)); LPM2.addPass(IndVarSimplifyPass()); LPM2.addPass(LoopIdiomPass()); @@ -356,7 +357,12 @@ PassBuilder::buildFunctionSimplificationPipeline(OptimizationLevel Level, FPM.addPass(JumpThreadingPass()); FPM.addPass(CorrelatedValuePropagationPass()); FPM.addPass(DSEPass()); + // FIXME: Enable this when the loop pass manager can support enforcing loop + // simplified and LCSSA form as well as updating the loop nest after + // transformations and we finsih porting the loop passes. +#if 0 FPM.addPass(createFunctionToLoopPassAdaptor(LICMPass())); +#endif // Finally, do an expensive DCE pass to catch all the dead code exposed by // the simplifications and basic cleanup after all the simplifications. diff --git a/llvm/test/Other/new-pass-manager.ll b/llvm/test/Other/new-pass-manager.ll index 6338dd012ce..73d245d1091 100644 --- a/llvm/test/Other/new-pass-manager.ll +++ b/llvm/test/Other/new-pass-manager.ll @@ -433,8 +433,6 @@ ; CHECK-O: Running pass: SimplifyCFGPass ; CHECK-O: Running pass: ReassociatePass ; CHECK-O: Starting llvm::Loop pass manager run. -; CHECK-O: Running pass: LoopRotatePass -; CHECK-O: Running pass: LICMPass ; CHECK-O: Finished llvm::Loop pass manager run. ; CHECK-O: Running pass: SimplifyCFGPass ; CHECK-O: Running pass: InstCombinePass @@ -447,7 +445,6 @@ ; CHECK-O: Running pass: JumpThreadingPass ; CHECK-O: Running pass: CorrelatedValuePropagationPass ; CHECK-O: Running pass: DSEPass -; CHECK-O: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass> ; CHECK-O: Running pass: ADCEPass ; CHECK-O: Running pass: SimplifyCFGPass ; CHECK-O: Running pass: InstCombinePass |
