[IRGen] Introduce OptimizedIRRequest

Introduce a request that wraps the entire compiler
pipeline and returns the optimized IR for a
whole-module or file.

Author: hamishknight

include/swift/AST/IRGenRequests.h

@@ -28,6 +28,7 @@ namespace swift {
 class SourceFile;
 class IRGenOptions;
 class SILModule;
+class SILOptions;
 struct TBDGenOptions;
 
 namespace irgen {
@@ -127,8 +128,11 @@ struct IRGenDescriptor {
 
   const IRGenOptions &Opts;
   const TBDGenOptions &TBDOpts;
+  const SILOptions &SILOpts;
 
+  Lowering::TypeConverter &Conv;
   SILModule *SILMod;
+
   StringRef ModuleName;
   const PrimarySpecificPaths &PSPs;
   StringRef PrivateDiscriminator;
@@ -152,13 +156,16 @@ struct IRGenDescriptor {
 public:
   static IRGenDescriptor
   forFile(FileUnit *file, const IRGenOptions &Opts,
-          const TBDGenOptions &TBDOpts, std::unique_ptr<SILModule> &&SILMod,
+          const TBDGenOptions &TBDOpts, const SILOptions &SILOpts,
+          Lowering::TypeConverter &Conv, std::unique_ptr<SILModule> &&SILMod,
           StringRef ModuleName, const PrimarySpecificPaths &PSPs,
           StringRef PrivateDiscriminator,
           llvm::GlobalVariable **outModuleHash) {
     return IRGenDescriptor{file,
                            Opts,
                            TBDOpts,
+                           SILOpts,
+                           Conv,
                            SILMod.release(),
                            ModuleName,
                            PSPs,
@@ -169,14 +176,17 @@ struct IRGenDescriptor {
 
   static IRGenDescriptor
   forWholeModule(ModuleDecl *M, const IRGenOptions &Opts,
-                 const TBDGenOptions &TBDOpts,
+                 const TBDGenOptions &TBDOpts, const SILOptions &SILOpts,
+                 Lowering::TypeConverter &Conv,
                  std::unique_ptr<SILModule> &&SILMod, StringRef ModuleName,
                  const PrimarySpecificPaths &PSPs,
                  ArrayRef<std::string> parallelOutputFilenames,
                  llvm::GlobalVariable **outModuleHash) {
     return IRGenDescriptor{M,
                            Opts,
                            TBDOpts,
+                           SILOpts,
+                           Conv,
                            SILMod.release(),
                            ModuleName,
                            PSPs,
@@ -226,6 +236,21 @@ void simple_display(llvm::raw_ostream &out, const IRGenDescriptor &d);
 
 SourceLoc extractNearestSourceLoc(const IRGenDescriptor &desc);
 
+/// Returns the optimized IR for a given file or module. Note this runs the
+/// entire compiler pipeline and ignores the passed SILModule.
+class OptimizedIRRequest
+    : public SimpleRequest<OptimizedIRRequest, GeneratedModule(IRGenDescriptor),
+                           RequestFlags::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  GeneratedModule evaluate(Evaluator &evaluator, IRGenDescriptor desc) const;
+};
+
 /// The zone number for IRGen.
 #define SWIFT_TYPEID_ZONE IRGen
 #define SWIFT_TYPEID_HEADER "swift/AST/IRGenTypeIDZone.def"

include/swift/AST/IRGenTypeIDZone.def

@@ -17,3 +17,6 @@
 SWIFT_REQUEST(IRGen, IRGenRequest,
               GeneratedModule(IRGenDescriptor),
               Uncached, NoLocationInfo)
+SWIFT_REQUEST(IRGen, OptimizedIRRequest,
+              GeneratedModule(IRGenDescriptor),
+              Uncached, NoLocationInfo)

lib/IRGen/IRGen.cpp

@@ -21,6 +21,7 @@
 #include "swift/AST/IRGenRequests.h"
 #include "swift/AST/LinkLibrary.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/SILGenRequests.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/Dwarf.h"
 #include "swift/Basic/Platform.h"
@@ -1311,9 +1312,12 @@ GeneratedModule swift::performIRGeneration(
     StringRef ModuleName, const PrimarySpecificPaths &PSPs,
     ArrayRef<std::string> parallelOutputFilenames,
     llvm::GlobalVariable **outModuleHash) {
+  // Get a pointer to the SILModule to avoid a potential use-after-move.
+  const auto *SILModPtr = SILMod.get();
+  const auto &SILOpts = SILModPtr->getOptions();
   auto desc = IRGenDescriptor::forWholeModule(
-      M, Opts, TBDOpts, std::move(SILMod), ModuleName, PSPs,
-      parallelOutputFilenames, outModuleHash);
+      M, Opts, TBDOpts, SILOpts, SILModPtr->Types, std::move(SILMod),
+      ModuleName, PSPs, parallelOutputFilenames, outModuleHash);
 
   if (Opts.shouldPerformIRGenerationInParallel() &&
       !parallelOutputFilenames.empty()) {
@@ -1332,9 +1336,12 @@ performIRGeneration(FileUnit *file, const IRGenOptions &Opts,
                     StringRef ModuleName, const PrimarySpecificPaths &PSPs,
                     StringRef PrivateDiscriminator,
                     llvm::GlobalVariable **outModuleHash) {
-  auto desc = IRGenDescriptor::forFile(file, Opts, TBDOpts, std::move(SILMod),
-                                       ModuleName, PSPs, PrivateDiscriminator,
-                                       outModuleHash);
+  // Get a pointer to the SILModule to avoid a potential use-after-move.
+  const auto *SILModPtr = SILMod.get();
+  const auto &SILOpts = SILModPtr->getOptions();
+  auto desc = IRGenDescriptor::forFile(
+      file, Opts, TBDOpts, SILOpts, SILModPtr->Types, std::move(SILMod),
+      ModuleName, PSPs, PrivateDiscriminator, outModuleHash);
   return llvm::cantFail(file->getASTContext().evaluator(IRGenRequest{desc}));
 }
 
@@ -1409,3 +1416,54 @@ bool swift::performLLVM(const IRGenOptions &Opts, ASTContext &Ctx,
     return true;
   return false;
 }
+
+GeneratedModule OptimizedIRRequest::evaluate(Evaluator &evaluator,
+                                             IRGenDescriptor desc) const {
+  auto *parentMod = desc.getParentModule();
+  auto &ctx = parentMod->getASTContext();
+
+  // Resolve imports for all the source files.
+  for (auto *file : parentMod->getFiles()) {
+    if (auto *SF = dyn_cast<SourceFile>(file))
+      performImportResolution(*SF);
+  }
+
+  bindExtensions(*parentMod);
+
+  // Type-check the files that need lowering to SIL.
+  auto loweringDesc = ASTLoweringDescriptor{desc.Ctx, desc.Conv, desc.SILOpts};
+  for (auto *file : loweringDesc.getFiles()) {
+    if (auto *SF = dyn_cast<SourceFile>(file))
+      performTypeChecking(*SF);
+  }
+
+  if (ctx.hadError())
+    return GeneratedModule::null();
+
+  auto silMod = llvm::cantFail(evaluator(ASTLoweringRequest{loweringDesc}));
+  silMod->installSILRemarkStreamer();
+  silMod->setSerializeSILAction([](){});
+
+  // Run SIL passes.
+  runSILDiagnosticPasses(*silMod);
+  runSILOptimizationPasses(*silMod);
+  silMod->verify();
+
+  if (ctx.hadError())
+    return GeneratedModule::null();
+
+  runSILLoweringPasses(*silMod);
+
+  if (ctx.hadError())
+    return GeneratedModule::null();
+
+  // Perform IRGen with the generated SILModule.
+  desc.SILMod = silMod.release();
+  auto irMod = llvm::cantFail(evaluator(IRGenRequest{desc}));
+  if (!irMod)
+    return irMod;
+
+  performLLVMOptimizations(desc.Opts, irMod.getModule(),
+                           irMod.getTargetMachine());
+  return irMod;
+}