[PATCH] D86005: [NewPM][LoopFullUnroll] Make LoopFullUnrollPass required

[Arthur Eubanks via Phabricator via llvm-commits]

aeubanks updated this revision to Diff 286073.
aeubanks added a comment.

Make LCSSA/LoopSimplify required, as previously discussed in https://reviews.llvm.org/D84977
optnone-opt.ll was broken without this due to an assert


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D86005/new/

https://reviews.llvm.org/D86005

Files:
  llvm/include/llvm/Transforms/Scalar/LoopUnrollPass.h
  llvm/include/llvm/Transforms/Utils/LCSSA.h
  llvm/include/llvm/Transforms/Utils/LoopSimplify.h
  llvm/test/Feature/optnone-opt.ll
  llvm/test/Transforms/LoopUnroll/FullUnroll.ll


Index: llvm/test/Transforms/LoopUnroll/FullUnroll.ll
===================================================================
--- llvm/test/Transforms/LoopUnroll/FullUnroll.ll
+++ llvm/test/Transforms/LoopUnroll/FullUnroll.ll
@@ -1,4 +1,5 @@
 ; RUN: opt -passes='loop-unroll-full' -disable-verify --mtriple x86_64-pc-linux-gnu -S -o - %s | FileCheck %s
+; RUN: opt -enable-npm-optnone -passes='loop-unroll-full' -disable-verify --mtriple x86_64-pc-linux-gnu -S -o - %s | FileCheck %s
 
 ; This checks that the loop full unroller will fire in the new pass manager
 ; when forced via #pragma in the source (or annotation in the code).
Index: llvm/test/Feature/optnone-opt.ll
===================================================================
--- llvm/test/Feature/optnone-opt.ll
+++ llvm/test/Feature/optnone-opt.ll
@@ -82,11 +82,9 @@
 ; LOOP-DAG: Skipping pass 'Unswitch loops'
 ; LoopPassManager should not be skipped over an optnone function
 ; NPM-LOOP-NOT: Skipping pass: PassManager
-; NPM-LOOP-DAG: Skipping pass: LoopSimplifyPass on {{.*}}foo
-; NPM-LOOP-DAG: Skipping pass: LCSSAPass
 ; NPM-LOOP-DAG: Skipping pass: IndVarSimplifyPass
 ; NPM-LOOP-DAG: Skipping pass: SimpleLoopUnswitchPass
-; NPM-LOOP-DAG: Skipping pass: LoopUnrollPass
+; NPM-LOOP-DAG: Skipping pass: LoopUnrollPass on {{.*}}foo
 ; NPM-LOOP-DAG: Skipping pass: LoopStrengthReducePass
 ; NPM-LOOP-DAG: Skipping pass: LoopDeletionPass
 ; NPM-LOOP-DAG: Skipping pass: LICMPass
Index: llvm/include/llvm/Transforms/Utils/LoopSimplify.h
===================================================================
--- llvm/include/llvm/Transforms/Utils/LoopSimplify.h
+++ llvm/include/llvm/Transforms/Utils/LoopSimplify.h
@@ -53,6 +53,7 @@
 class LoopSimplifyPass : public PassInfoMixin<LoopSimplifyPass> {
 public:
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+  static bool isRequired() { return true; }
 };
 
 /// Simplify each loop in a loop nest recursively.
Index: llvm/include/llvm/Transforms/Utils/LCSSA.h
===================================================================
--- llvm/include/llvm/Transforms/Utils/LCSSA.h
+++ llvm/include/llvm/Transforms/Utils/LCSSA.h
@@ -37,6 +37,7 @@
 class LCSSAPass : public PassInfoMixin<LCSSAPass> {
 public:
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+  static bool isRequired() { return true; }
 };
 } // end namespace llvm
 
Index: llvm/include/llvm/Transforms/Scalar/LoopUnrollPass.h
===================================================================
--- llvm/include/llvm/Transforms/Scalar/LoopUnrollPass.h
+++ llvm/include/llvm/Transforms/Scalar/LoopUnrollPass.h
@@ -44,6 +44,7 @@
 
   PreservedAnalyses run(Loop &L, LoopAnalysisManager &AM,
                         LoopStandardAnalysisResults &AR, LPMUpdater &U);
+  static bool isRequired() { return true; }
 };
 
 /// A set of parameters used to control various transforms performed by the


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86005.286073.patch
Type: text/x-patch
Size: 2902 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200817/fe89cea6/attachment.bin>