Merge pull request #60077 from aschwaighofer/add_option_to_run_new_llvm_pass_manager

Add option to run new llvm pass manager in IRGen

Author: aschwaighofer

include/swift/AST/IRGenOptions.h

@@ -237,6 +237,9 @@ class IRGenOptions {
   /// well-formed?
   unsigned Verify : 1;
 
+  /// Should we use the legacy pass manager.
+  unsigned LegacyPassManager : 1;
+
   OptimizationMode OptMode;
 
   /// Which sanitizer is turned on.
@@ -443,7 +446,7 @@ class IRGenOptions {
   IRGenOptions()
       : DWARFVersion(2),
         OutputKind(IRGenOutputKind::LLVMAssemblyAfterOptimization),
-        Verify(true), OptMode(OptimizationMode::NotSet),
+        Verify(true), LegacyPassManager(1), OptMode(OptimizationMode::NotSet),
         Sanitizers(OptionSet<SanitizerKind>()),
         SanitizersWithRecoveryInstrumentation(OptionSet<SanitizerKind>()),
         SanitizeAddressUseODRIndicator(false),

include/swift/LLVMPasses/Passes.h

@@ -31,6 +31,11 @@ namespace swift {
     bool invalidate(llvm::Function &,
                     const llvm::PreservedAnalyses &) { return false; }
 
+    bool invalidate(llvm::Function &, const llvm::PreservedAnalyses &,
+                    llvm::FunctionAnalysisManager::Invalidator &) {
+      return false;
+    }
+
     using AAResultBase::getModRefInfo;
     llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
                                    const llvm::MemoryLocation &Loc) {
@@ -57,51 +62,97 @@ namespace swift {
     void getAnalysisUsage(llvm::AnalysisUsage &AU) const override;
   };
 
-  class SwiftRCIdentity : public llvm::ImmutablePass {
+  class SwiftAA : public llvm::AnalysisInfoMixin<SwiftAA> {
+    friend llvm::AnalysisInfoMixin<SwiftAA>;
+
+    static llvm::AnalysisKey Key;
+
   public:
-    static char ID; // Class identification, replacement for typeinfo
-    SwiftRCIdentity() : ImmutablePass(ID) {}
+    using Result = SwiftAAResult;
+
+    SwiftAAResult run(llvm::Function &F, llvm::FunctionAnalysisManager &AM);
+  };
+
+  class SwiftRCIdentity {
+  public:
+    SwiftRCIdentity() {}
 
     /// Returns the root of the RC-equivalent value for the given V.
     llvm::Value *getSwiftRCIdentityRoot(llvm::Value *V);
+
   private:
     enum { MaxRecursionDepth = 16 };
-    bool doInitialization(llvm::Module &M) override;
 
-    void getAnalysisUsage(llvm::AnalysisUsage &AU) const override {
-      AU.setPreservesAll();
-    }
     llvm::Value *stripPointerCasts(llvm::Value *Val);
     llvm::Value *stripReferenceForwarding(llvm::Value *Val);
   };
 
   class SwiftARCOpt : public llvm::FunctionPass {
     /// Swift RC Identity analysis.
-    SwiftRCIdentity *RC;
+    SwiftRCIdentity RC;
     virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override;
     virtual bool runOnFunction(llvm::Function &F) override;
   public:
     static char ID;
     SwiftARCOpt();
   };
 
+  struct SwiftARCOptPass : public llvm::PassInfoMixin<SwiftARCOptPass> {
+    SwiftRCIdentity RC;
+
+    llvm::PreservedAnalyses run(llvm::Function &F,
+                                llvm::FunctionAnalysisManager &AM);
+  };
+
   class SwiftARCContract : public llvm::FunctionPass {
     /// Swift RC Identity analysis.
-    SwiftRCIdentity *RC;
+    SwiftRCIdentity RC;
     virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override;
     virtual bool runOnFunction(llvm::Function &F) override;
   public:
     static char ID;
     SwiftARCContract() : llvm::FunctionPass(ID) {}
   };
 
+  struct SwiftARCContractPass
+      : public llvm::PassInfoMixin<SwiftARCContractPass> {
+    SwiftRCIdentity RC;
+
+    llvm::PreservedAnalyses run(llvm::Function &F,
+                                llvm::FunctionAnalysisManager &AM);
+  };
+
   class InlineTreePrinter : public llvm::ModulePass {
     virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override;
     virtual bool runOnModule(llvm::Module &M) override;
   public:
     static char ID;
     InlineTreePrinter() : llvm::ModulePass(ID) {}
   };
+
+  class SwiftMergeFunctionsPass
+      : public llvm::PassInfoMixin<SwiftMergeFunctionsPass> {
+    bool ptrAuthEnabled = false;
+    unsigned ptrAuthKey = 0;
+
+  public:
+    SwiftMergeFunctionsPass(bool ptrAuthEnabled, unsigned ptrAuthKey)
+        : ptrAuthEnabled(ptrAuthEnabled), ptrAuthKey(ptrAuthKey) {}
+    llvm::PreservedAnalyses run(llvm::Module &M,
+                                llvm::ModuleAnalysisManager &AM);
+  };
+
+  struct SwiftDbgAddrBlockSplitterPass
+      : public llvm::PassInfoMixin<SwiftDbgAddrBlockSplitterPass> {
+    llvm::PreservedAnalyses run(llvm::Function &F,
+                                llvm::FunctionAnalysisManager &AM);
+  };
+
+  struct InlineTreePrinterPass
+      : public llvm::PassInfoMixin<InlineTreePrinterPass> {
+    llvm::PreservedAnalyses run(llvm::Module &M,
+                                llvm::ModuleAnalysisManager &AM);
+  };
 } // end namespace swift
 
 #endif

include/swift/LLVMPasses/PassesFwd.h

@@ -20,23 +20,21 @@ namespace llvm {
   class PassRegistry;
 
   void initializeSwiftAAWrapperPassPass(PassRegistry &);
-  void initializeSwiftRCIdentityPass(PassRegistry &);
   void initializeSwiftARCOptPass(PassRegistry &);
   void initializeSwiftARCContractPass(PassRegistry &);
   void initializeInlineTreePrinterPass(PassRegistry &);
-  void initializeSwiftMergeFunctionsPass(PassRegistry &);
+  void initializeLegacySwiftMergeFunctionsPass(PassRegistry &);
   void initializeSwiftDbgAddrBlockSplitterPass(PassRegistry &);
 }
 
 namespace swift {
   llvm::FunctionPass *createSwiftARCOptPass();
   llvm::FunctionPass *createSwiftARCContractPass();
   llvm::ModulePass *createInlineTreePrinterPass();
-  llvm::ModulePass *createSwiftMergeFunctionsPass(bool ptrAuthEnabled,
-                                                  unsigned ptrAuthKey);
+  llvm::ModulePass *createLegacySwiftMergeFunctionsPass(bool ptrAuthEnabled,
+                                                        unsigned ptrAuthKey);
   llvm::FunctionPass *createSwiftDbgAddrBlockSplitter();
   llvm::ImmutablePass *createSwiftAAWrapperPass();
-  llvm::ImmutablePass *createSwiftRCIdentityPass();
 } // end namespace swift
 
 #endif

include/swift/Option/FrontendOptions.td

@@ -1072,4 +1072,8 @@ def concurrency_model :
 def concurrency_model_EQ :
     Joined<["-"], "concurrency-model=">,
     Alias<concurrency_model>;
+
+def enable_new_llvm_pass_manager :
+  Flag<["-"], "enable-new-llvm-pass-manager">,
+  HelpText<"Enable new llvm pass manager">;
 } // end let Flags = [FrontendOption, NoDriverOption, HelpHidden]

lib/Frontend/CompilerInvocation.cpp

@@ -2365,6 +2365,9 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
       Opts.SwiftAsyncFramePointer = SwiftAsyncFramePointerKind::Never;
   }
 
+  if (Args.hasArg(OPT_enable_new_llvm_pass_manager))
+    Opts.LegacyPassManager = false;
+
   return false;
 }