Merge pull request #1181 from artemcm/EmitInterModRealG

Add support for '-explicit-dependency-graph-format=' flag

Author: artemcm

Sources/SwiftDriver/Driver/Driver.swift

@@ -634,6 +634,7 @@ public struct Driver {
                                fileSystem: fileSystem,
                                workingDirectory: workingDirectory,
                                diagnosticEngine: diagnosticEngine)
+    Self.validateEmitDependencyGraphArgs(&parsedOptions, diagnosticEngine: diagnosticEngine)
     Self.validateParseableOutputArgs(&parsedOptions, diagnosticEngine: diagnosticEngine)
     Self.validateCompilationConditionArgs(&parsedOptions, diagnosticEngine: diagnosticEngine)
     Self.validateFrameworkSearchPathArgs(&parsedOptions, diagnosticEngine: diagnosticEngine)
@@ -2646,6 +2647,28 @@ extension Driver {
     }
   }
 
+  static func validateEmitDependencyGraphArgs(_ parsedOptions: inout ParsedOptions,
+                                              diagnosticEngine: DiagnosticsEngine) {
+    // '-print-explicit-dependency-graph' requires '-explicit-module-build'
+    if parsedOptions.hasArgument(.printExplicitDependencyGraph) &&
+        !parsedOptions.hasArgument(.driverExplicitModuleBuild) {
+      diagnosticEngine.emit(Error.optionRequiresAnother(Option.printExplicitDependencyGraph.spelling,
+                                                        Option.driverExplicitModuleBuild.spelling))
+    }
+    // '-explicit-dependency-graph-format=' requires '-print-explicit-dependency-graph'
+    if parsedOptions.hasArgument(.explicitDependencyGraphFormat) &&
+        !parsedOptions.hasArgument(.printExplicitDependencyGraph) {
+      diagnosticEngine.emit(Error.optionRequiresAnother(Option.explicitDependencyGraphFormat.spelling,
+                                                        Option.printExplicitDependencyGraph.spelling))
+    }
+    // '-explicit-dependency-graph-format=' only supports values 'json' and 'dot'
+    if let formatArg = parsedOptions.getLastArgument(.explicitDependencyGraphFormat)?.asSingle {
+      if formatArg != "json" && formatArg != "dot" {
+        diagnosticEngine.emit(.error_unsupported_argument(argument: formatArg,
+                                                          option: .explicitDependencyGraphFormat))
+      }
+    }
+  }
 
   static func validateProfilingArgs(_ parsedOptions: inout ParsedOptions,
                                     fileSystem: FileSystem,

Sources/SwiftDriver/Jobs/Planning.swift

@@ -660,7 +660,12 @@ extension Driver {
     try resolveDependencyModulePaths(dependencyGraph: &dependencyGraph)
 
     if parsedOptions.hasArgument(.printExplicitDependencyGraph) {
-      try stdoutStream <<< dependencyGraph.toJSONString()
+      let outputFormat = parsedOptions.getLastArgument(.explicitDependencyGraphFormat)?.asSingle
+      if outputFormat == nil || outputFormat == "json" {
+        try stdoutStream <<< dependencyGraph.toJSONString()
+      } else if outputFormat == "dot" {
+        DOTModuleDependencyGraphSerializer(dependencyGraph).writeDOT(to: &stdoutStream)
+      }
       stdoutStream.flush()
     }
 

Sources/SwiftOptions/Options.swift

@@ -236,6 +236,7 @@ extension Option {
   public static let embedTbdForModule: Option = Option("-embed-tbd-for-module", .separate, attributes: [.frontend], helpText: "Embed symbols from the module in the emitted tbd file")
   public static let emitAbiDescriptorPath: Option = Option("-emit-abi-descriptor-path", .separate, attributes: [.frontend, .noDriver], metaVar: "<path>", helpText: "Output the ABI descriptor of current module to <path>")
   public static let emitAssembly: Option = Option("-emit-assembly", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit assembly file(s) (-S)", group: .modes)
+  public static let emitAst: Option = Option("-emit-ast", .flag, alias: Option.dumpAst, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild])
   public static let emitBc: Option = Option("-emit-bc", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit LLVM BC file(s)", group: .modes)
   public static let emitClangHeaderPath: Option = Option("-emit-clang-header-path", .separate, alias: Option.emitObjcHeaderPath, attributes: [.frontend, .noDriver, .noInteractive, .argumentIsPath, .supplementaryOutput], helpText: "Emit an Objective-C and C++ header file to <path>")
   public static let emitConstValuesPath: Option = Option("-emit-const-values-path", .separate, attributes: [.frontend, .noInteractive, .argumentIsPath, .supplementaryOutput], metaVar: "<path>", helpText: "Emit the extracted compile-time known values to <path>")
@@ -275,6 +276,7 @@ extension Option {
   public static let emitObject: Option = Option("-emit-object", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit object file(s) (-c)", group: .modes)
   public static let emitParseableModuleInterfacePath: Option = Option("-emit-parseable-module-interface-path", .separate, alias: Option.emitModuleInterfacePath, attributes: [.helpHidden, .frontend, .noInteractive, .argumentIsPath, .supplementaryOutput])
   public static let emitParseableModuleInterface: Option = Option("-emit-parseable-module-interface", .flag, alias: Option.emitModuleInterface, attributes: [.helpHidden, .noInteractive, .supplementaryOutput])
+  public static let emitParse: Option = Option("-emit-parse", .flag, alias: Option.dumpParse, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild])
   public static let emitPch: Option = Option("-emit-pch", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Emit PCH for imported Objective-C header file", group: .modes)
   public static let emitPcm: Option = Option("-emit-pcm", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit a precompiled Clang module from a module map", group: .modes)
   public static let emitPrivateModuleInterfacePath: Option = Option("-emit-private-module-interface-path", .separate, attributes: [.helpHidden, .frontend, .noInteractive, .argumentIsPath, .supplementaryOutput], metaVar: "<path>", helpText: "Output private module interface file to <path>")
@@ -319,7 +321,7 @@ extension Option {
   public static let enableExperimentalAsyncTopLevel: Option = Option("-enable-experimental-async-top-level", .flag, attributes: [.helpHidden, .frontend, .noDriver, .moduleInterface], helpText: "Enable experimental concurrency in top-level code")
   public static let enableExperimentalConcisePoundFile: Option = Option("-enable-experimental-concise-pound-file", .flag, attributes: [.frontend, .moduleInterface], helpText: "Enable experimental concise '#file' identifier")
   public static let enableExperimentalConcurrency: Option = Option("-enable-experimental-concurrency", .flag, attributes: [.helpHidden, .frontend, .noDriver, .moduleInterface], helpText: "Enable experimental concurrency model")
-  public static let enableExperimentalCxxInterop: Option = Option("-enable-experimental-cxx-interop", .flag, attributes: [.helpHidden, .frontend], helpText: "Enable experimental C++ interop code generation and config directives")
+  public static let enableExperimentalCxxInterop: Option = Option("-enable-experimental-cxx-interop", .flag, attributes: [.helpHidden, .frontend, .moduleInterface], helpText: "Enable experimental C++ interop code generation and config directives")
   public static let enableExperimentalDistributed: Option = Option("-enable-experimental-distributed", .flag, attributes: [.helpHidden, .frontend, .noDriver, .moduleInterface], helpText: "Enable experimental 'distributed' actors and functions")
   public static let enableExperimentalEagerClangModuleDiagnostics: Option = Option("-enable-experimental-eager-clang-module-diagnostics", .flag, attributes: [.helpHidden, .frontend, .noDriver, .moduleInterface], helpText: "Enable experimental eager diagnostics reporting on the importability of all referenced C, C++, and Objective-C libraries")
   public static let enableExperimentalFeature: Option = Option("-enable-experimental-feature", .separate, attributes: [.frontend], helpText: "Enable an experimental feature")
@@ -386,6 +388,8 @@ extension Option {
   public static let experimentalSkipNonInlinableFunctionBodiesWithoutTypes: Option = Option("-experimental-skip-non-inlinable-function-bodies-without-types", .flag, attributes: [.helpHidden, .frontend], helpText: "Skip work on non-inlinable function bodies that do not declare nested types")
   public static let experimentalSkipNonInlinableFunctionBodies: Option = Option("-experimental-skip-non-inlinable-function-bodies", .flag, attributes: [.helpHidden, .frontend], helpText: "Skip type-checking and SIL generation for non-inlinable function bodies")
   public static let experimentalSpiImports: Option = Option("-experimental-spi-imports", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Enable experimental support for SPI imports")
+  public static let experimentalSpiOnlyImports: Option = Option("-experimental-spi-only-imports", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Enable use of @_spiOnly imports")
+  public static let explicitDependencyGraphFormat: Option = Option("-explicit-dependency-graph-format=", .joined, attributes: [.helpHidden, .doesNotAffectIncrementalBuild], helpText: "Specify the explicit dependency graph output format to either 'json' or 'dot'")
   public static let explicitInterfaceModuleBuild: Option = Option("-explicit-interface-module-build", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Use the specified command-line to build the module from interface, instead of flags specified in the interface")
   public static let driverExplicitModuleBuild: Option = Option("-explicit-module-build", .flag, attributes: [.helpHidden], helpText: "Prebuild module dependencies to make them explicit")
   public static let explicitSwiftModuleMap: Option = Option("-explicit-swift-module-map-file", .separate, attributes: [.frontend, .noDriver], metaVar: "<path>", helpText: "Specify a JSON file containing information of explicit Swift modules")
@@ -545,7 +549,7 @@ extension Option {
   public static let printAst: Option = Option("-print-ast", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Parse and type-check input file(s) and pretty print AST(s)", group: .modes)
   public static let printClangStats: Option = Option("-print-clang-stats", .flag, attributes: [.frontend, .noDriver], helpText: "Print Clang importer statistics")
   public static let printEducationalNotes: Option = Option("-print-educational-notes", .flag, attributes: [.frontend, .doesNotAffectIncrementalBuild], helpText: "Include educational notes in printed diagnostic output, if available")
-  public static let printExplicitDependencyGraph: Option = Option("-print-explicit-dependency-graph", .flag, attributes: [.helpHidden], helpText: "Print the result of module dependency scanning after external module resolution to output")
+  public static let printExplicitDependencyGraph: Option = Option("-print-explicit-dependency-graph", .flag, attributes: [.helpHidden, .doesNotAffectIncrementalBuild], helpText: "Print the result of module dependency scanning after external module resolution to output")
   public static let printInstCounts: Option = Option("-print-inst-counts", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Before IRGen, count all the various SIL instructions. Must be used in conjunction with -print-stats.")
   public static let printLlvmInlineTree: Option = Option("-print-llvm-inline-tree", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Print the LLVM inline tree.")
   public static let printModule: Option = Option("-print-module", .flag, attributes: [.noDriver], helpText: "Print module names in diagnostics")
@@ -948,6 +952,7 @@ extension Option {
       Option.embedTbdForModule,
       Option.emitAbiDescriptorPath,
       Option.emitAssembly,
+      Option.emitAst,
       Option.emitBc,
       Option.emitClangHeaderPath,
       Option.emitConstValuesPath,
@@ -987,6 +992,7 @@ extension Option {
       Option.emitObject,
       Option.emitParseableModuleInterfacePath,
       Option.emitParseableModuleInterface,
+      Option.emitParse,
       Option.emitPch,
       Option.emitPcm,
       Option.emitPrivateModuleInterfacePath,
@@ -1098,6 +1104,8 @@ extension Option {
       Option.experimentalSkipNonInlinableFunctionBodiesWithoutTypes,
       Option.experimentalSkipNonInlinableFunctionBodies,
       Option.experimentalSpiImports,
+      Option.experimentalSpiOnlyImports,
+      Option.explicitDependencyGraphFormat,
       Option.explicitInterfaceModuleBuild,
       Option.driverExplicitModuleBuild,
       Option.explicitSwiftModuleMap,

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -1076,8 +1076,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
       return
     }
     guard try dependencyOracle.supportsScannerDiagnostics() else {
-      XCTSkip("libSwiftScan does not support diagnostics query.")
-      return
+      throw XCTSkip("libSwiftScan does not support diagnostics query.")
     }
 
     try withTemporaryDirectory { path in
@@ -1240,6 +1239,98 @@ final class ExplicitModuleBuildTests: XCTestCase {
     }
   }
 
+  func testPrintingExplicitDependencyGraph() throws {
+    try withTemporaryDirectory { path in
+      let main = path.appending(component: "testPrintingExplicitDependencyGraph.swift")
+      try localFileSystem.writeFileContents(main) {
+        $0 <<< "import C;"
+        $0 <<< "import E;"
+        $0 <<< "import G;"
+      }
+      let cHeadersPath: AbsolutePath = testInputsPath.appending(component: "ExplicitModuleBuilds").appending(component: "CHeaders")
+      let swiftModuleInterfacesPath: AbsolutePath = testInputsPath.appending(component: "ExplicitModuleBuilds").appending(component: "Swift")
+      let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
+
+      let baseCommandLine = ["swiftc",
+                             "-target", "x86_64-apple-macosx11.0",
+                             "-I", cHeadersPath.nativePathString(escaped: true),
+                             "-I", swiftModuleInterfacesPath.nativePathString(escaped: true),
+                             main.nativePathString(escaped: true)] + sdkArgumentsForTesting
+      do {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-print-explicit-dependency-graph"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertTrue(diagnosticEngine.hasErrors)
+        XCTAssertEqual(diagnosticEngine.diagnostics.first?.message.data.description,
+                       "'-print-explicit-dependency-graph' cannot be specified if '-explicit-module-build' is not present")
+      }
+      do {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-explicit-module-build",
+                                                         "-explicit-dependency-graph-format=json"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertTrue(diagnosticEngine.hasErrors)
+        XCTAssertEqual(diagnosticEngine.diagnostics.first?.message.data.description,
+                       "'-explicit-dependency-graph-format=' cannot be specified if '-print-explicit-dependency-graph' is not present")
+      }
+      do {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-explicit-module-build",
+                                                         "-print-explicit-dependency-graph",
+                                                         "-explicit-dependency-graph-format=watercolor"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertTrue(diagnosticEngine.hasErrors)
+        XCTAssertEqual(diagnosticEngine.diagnostics.first?.message.data.description,
+                       "unsupported argument \'watercolor\' to option \'-explicit-dependency-graph-format=\'")
+      }
+      
+      let _ = try withHijackedOutputStream {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-explicit-module-build",
+                                                         "-print-explicit-dependency-graph",
+                                                         "-explicit-dependency-graph-format=json"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertFalse(diagnosticEngine.hasErrors)
+      }
+
+      let output = try withHijackedOutputStream {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-explicit-module-build",
+                                                         "-print-explicit-dependency-graph",
+                                                         "-explicit-dependency-graph-format=json"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertFalse(diagnosticEngine.hasErrors)
+      }
+      XCTAssertTrue(output.contains("\"mainModuleName\" : \"testPrintingExplicitDependencyGraph\","))
+
+      let output2 = try withHijackedOutputStream {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-explicit-module-build",
+                                                         "-print-explicit-dependency-graph",
+                                                         "-explicit-dependency-graph-format=dot"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertFalse(diagnosticEngine.hasErrors)
+      }
+      XCTAssertTrue(output2.contains("\"testPrintingExplicitDependencyGraph\" [shape=box, style=bold, color=navy"))
+
+      let output3 = try withHijackedOutputStream {
+        let diagnosticEngine = DiagnosticsEngine()
+        var driver = try Driver(args: baseCommandLine + ["-explicit-module-build",
+                                                         "-print-explicit-dependency-graph"],
+                                diagnosticsEngine: diagnosticEngine)
+        let _ = try driver.planBuild()
+        XCTAssertFalse(diagnosticEngine.hasErrors)
+      }
+      XCTAssertTrue(output3.contains("\"mainModuleName\" : \"testPrintingExplicitDependencyGraph\","))
+    }
+  }
+
   func testDependencyGraphDotSerialization() throws {
       let (stdlibPath, shimsPath, toolchain, hostTriple) = try getDriverArtifactsForScanning()
       let dependencyOracle = InterModuleDependencyOracle()