Revert "Updated MachinePassReg and added some passes"

This reverts commit 5290f20.

Author: lelouch-17

llvm/include/llvm/Passes/CodeGenPassBuilder.h

@@ -14,12 +14,6 @@
 #ifndef LLVM_PASSES_CODEGENPASSBUILDER_H
 #define LLVM_PASSES_CODEGENPASSBUILDER_H
 
-#include "llvm/Transforms/Scalar/SeparateConstOffsetFromGEP.h"
-#include "llvm/Transforms/Scalar/StraightLineStrengthReduce.h"
-#include "llvm/Transforms/Scalar/NaryReassociate.h"
-#include "llvm/Transforms/Scalar/GVN.h"
-#include "llvm/MC/MCStreamer.h"
-
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Analysis/AliasAnalysis.h"
@@ -411,11 +405,6 @@ template <typename DerivedT> class CodeGenPassBuilder {
   /// before exception handling preparation passes.
   void addCodeGenPrepare(AddIRPass &) const;
 
-  /// TODO: Add description
-  void addStraightLineScalarOptimizationPasses(AddIRPass &) const;
-
-  void addEarlyCSEOrGVNPass(AddIRPass &) const;
-
   /// Add common passes that perform LLVM IR to IR transforms in preparation for
   /// instruction selection.
   void addISelPrepare(AddIRPass &) const;
@@ -684,31 +673,6 @@ void CodeGenPassBuilder<Derived>::addIRPasses(AddIRPass &addPass) const {
     addPass(SelectOptimizePass(&TM));
 }
 
-template <typename Derived>
-void CodeGenPassBuilder<Derived>::addEarlyCSEOrGVNPass(AddIRPass &addPass) const {
-  if (getOptLevel() == CodeGenOptLevel::Aggressive)
-    addPass(GVNPass());
-  else
-    addPass(EarlyCSEPass());
-}
-
-template <typename Derived>
-void CodeGenPassBuilder<Derived>::addStraightLineScalarOptimizationPasses(AddIRPass &addPass) const {
-  addPass(SeparateConstOffsetFromGEPPass());
-  // ReassociateGEPs exposes more opportunities for SLSR. See
-  // the example in reassociate-geps-and-slsr.ll.
-  addPass(StraightLineStrengthReducePass());
-  // SeparateConstOffsetFromGEP and SLSR creates common expressions which GVN or
-  // EarlyCSE can reuse.
-  // FIXME: Port this
-  addEarlyCSEOrGVNPass(addPass);
-  // Run NaryReassociate after EarlyCSE/GVN to be more effective.
-  addPass(NaryReassociatePass());
-  // NaryReassociate on GEPs creates redundant common expressions, so run
-  // EarlyCSE after it.
-  addPass(EarlyCSEPass());
-}
-
 /// Turn exception handling constructs into something the code generators can
 /// handle.
 template <typename Derived>

llvm/include/llvm/Passes/MachinePassRegistry.def

@@ -53,22 +53,18 @@ FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass(TM))
 FUNCTION_PASS("expand-memcmp", ExpandMemCmpPass(TM))
 FUNCTION_PASS("expand-reductions", ExpandReductionsPass())
 FUNCTION_PASS("expandvp", ExpandVectorPredicationPass())
-FUNCTION_PASS("gvn", GVNPass())
 FUNCTION_PASS("gc-lowering", GCLoweringPass())
 FUNCTION_PASS("indirectbr-expand", IndirectBrExpandPass(TM))
 FUNCTION_PASS("interleaved-access", InterleavedAccessPass(TM))
 FUNCTION_PASS("interleaved-load-combine", InterleavedLoadCombinePass(TM))
 FUNCTION_PASS("lower-constant-intrinsics", LowerConstantIntrinsicsPass())
 FUNCTION_PASS("lower-invoke", LowerInvokePass())
 FUNCTION_PASS("mergeicmps", MergeICmpsPass())
-FUNCTION_PASS("nary-reassociate", NaryReassociatePass())
 FUNCTION_PASS("partially-inline-libcalls", PartiallyInlineLibCallsPass())
 FUNCTION_PASS("post-inline-ee-instrument", EntryExitInstrumenterPass(true))
 FUNCTION_PASS("replace-with-veclib", ReplaceWithVeclib())
 FUNCTION_PASS("safe-stack", SafeStackPass(TM))
 FUNCTION_PASS("scalarize-masked-mem-intrin", ScalarizeMaskedMemIntrinPass())
-FUNCTION_PASS("separate-const-offset-from-gep", SeparateConstOffsetFromGEPPass())
-FUNCTION_PASS("slsr", StraightLineStrengthReducePass())
 FUNCTION_PASS("select-optimize", SelectOptimizePass(TM))
 FUNCTION_PASS("sjlj-eh-prepare", SjLjEHPreparePass(TM))
 FUNCTION_PASS("stack-protector", StackProtectorPass(TM))
@@ -77,8 +73,6 @@ FUNCTION_PASS("unreachableblockelim", UnreachableBlockElimPass())
 FUNCTION_PASS("verify", VerifierPass())
 FUNCTION_PASS("wasm-eh-prepare", WasmEHPreparePass())
 FUNCTION_PASS("win-eh-prepare", WinEHPreparePass())
-FUNCTION_PASS("load-store-vectorizer", LoadStoreVectorizerPass())
-FUNCTION_PASS("lowerswitch", LowerSwitchPass())
 #undef FUNCTION_PASS
 
 #ifndef LOOP_PASS
@@ -130,7 +124,7 @@ MACHINE_FUNCTION_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(PI
 #define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS)
 #endif
 MACHINE_FUNCTION_PASS("dead-mi-elimination", DeadMachineInstructionElimPass())
-MACHINE_FUNCTION_PASS("free-machine-function", FreeMachineFunctionPass())
+// MACHINE_FUNCTION_PASS("free-machine-function", FreeMachineFunctionPass())
 MACHINE_FUNCTION_PASS("no-op-machine-function", NoOpMachineFunctionPass())
 MACHINE_FUNCTION_PASS("print", PrintMIRPass())
 #undef MACHINE_FUNCTION_PASS
@@ -143,7 +137,6 @@ MACHINE_FUNCTION_PASS("print", PrintMIRPass())
 #define DUMMY_FUNCTION_PASS(NAME, PASS_NAME)
 #endif
 DUMMY_FUNCTION_PASS("atomic-expand", AtomicExpandPass)
-DUMMY_FUNCTION_PASS("early-cse", EarlyCSEPass) 
 #undef DUMMY_FUNCTION_PASS
 
 #ifndef DUMMY_MACHINE_MODULE_PASS
@@ -164,7 +157,6 @@ DUMMY_MACHINE_FUNCTION_PASS("bbsections-profile-reader", BasicBlockSectionsProfi
 DUMMY_MACHINE_FUNCTION_PASS("block-placement", MachineBlockPlacementPass)
 DUMMY_MACHINE_FUNCTION_PASS("block-placement-stats", MachineBlockPlacementStatsPass)
 DUMMY_MACHINE_FUNCTION_PASS("branch-folder", BranchFolderPass)
-DUMMY_MACHINE_FUNCTION_PASS("branch-relaxation", BranchRelaxationPass)
 DUMMY_MACHINE_FUNCTION_PASS("break-false-deps", BreakFalseDepsPass)
 DUMMY_MACHINE_FUNCTION_PASS("cfguard-longjmp", CFGuardLongjmpPass)
 DUMMY_MACHINE_FUNCTION_PASS("cfi-fixup", CFIFixupPass)
@@ -207,7 +199,6 @@ DUMMY_MACHINE_FUNCTION_PASS("opt-phis", OptimizePHIsPass)
 DUMMY_MACHINE_FUNCTION_PASS("patchable-function", PatchableFunctionPass)
 DUMMY_MACHINE_FUNCTION_PASS("peephole-opt", PeepholeOptimizerPass)
 DUMMY_MACHINE_FUNCTION_PASS("phi-node-elimination", PHIEliminationPass)
-DUMMY_MACHINE_FUNCTION_PASS("post-RA-hazard-recognizer", PostRAHazardRecognizerPass)
 DUMMY_MACHINE_FUNCTION_PASS("post-RA-sched", PostRASchedulerPass)
 DUMMY_MACHINE_FUNCTION_PASS("postmisched", PostMachineSchedulerPass)
 DUMMY_MACHINE_FUNCTION_PASS("postra-machine-sink", PostRAMachineSinkingPass)