Merge pull request #76 from cltnschlosser/cs_FixBatchOnePartition

Fix batch mode one partition.

Author: DougGregor

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -78,13 +78,7 @@ extension Driver {
     }
 
     // Collect the set of input files that are part of the Swift compilation.
-    let swiftInputFiles: [TypedVirtualPath] = inputFiles.compactMap { inputFile in
-      if inputFile.type.isPartOfSwiftCompilation {
-        return inputFile
-      }
-
-      return nil
-    }
+    let swiftInputFiles: [TypedVirtualPath] = inputFiles.filter { $0.type.isPartOfSwiftCompilation }
 
     // If we will be passing primary files via -primary-file, form a set of primary input files so
     // we can check more quickly.

Sources/SwiftDriver/Jobs/Planning.swift

@@ -386,8 +386,14 @@ extension Driver {
     }
     let numPartitions = numberOfBatchPartitions(info, swiftInputFiles: swiftInputFiles)
 
-    // If there is only one partition, don't bother.
-    if numPartitions == 1 { return nil }
+    // If there is only one partition, fast path.
+    if numPartitions == 1 {
+      var assignment = [TypedVirtualPath: Int]()
+      for input in swiftInputFiles {
+        assignment[input] = 0
+      }
+      return BatchPartitions(assignment: assignment, partitions: [swiftInputFiles])
+    }
 
     // Map each input file to a partition index. Ensure that we evenly
     // distribute the remainder.

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -936,18 +936,32 @@ final class SwiftDriverTests: XCTestCase {
   }
 
   func testBatchModeCompiles() throws {
-    var driver1 = try Driver(args: ["swiftc", "foo1.swift", "bar1.swift", "foo2.swift", "bar2.swift", "foo3.swift", "bar3.swift", "foo4.swift", "bar4.swift", "foo5.swift", "bar5.swift", "wibble.swift", "-module-name", "Test", "-enable-batch-mode", "-driver-batch-count", "3"])
-    let plannedJobs = try driver1.planBuild()
-    XCTAssertEqual(plannedJobs.count, 4)
-    XCTAssertEqual(plannedJobs[0].outputs.count, 4)
-    XCTAssertEqual(plannedJobs[0].outputs.first!.file, VirtualPath.temporary(RelativePath("foo1.o")))
-    XCTAssertEqual(plannedJobs[1].outputs.count, 4)
-    XCTAssertEqual(plannedJobs[1].outputs.first!.file, VirtualPath.temporary(RelativePath("foo3.o")))
-    XCTAssertEqual(plannedJobs[2].outputs.count, 3)
-    XCTAssertEqual(plannedJobs[2].outputs.first!.file, VirtualPath.temporary(RelativePath("foo5.o")))
-    XCTAssertTrue(plannedJobs[3].tool.name.contains(driver1.targetTriple.isDarwin ? "ld" : "clang"))
-    XCTAssertEqual(plannedJobs[3].outputs.count, 1)
-    XCTAssertEqual(plannedJobs[3].outputs.first!.file, VirtualPath.relative(RelativePath("Test")))
+    do {
+      var driver1 = try Driver(args: ["swiftc", "foo1.swift", "bar1.swift", "foo2.swift", "bar2.swift", "foo3.swift", "bar3.swift", "foo4.swift", "bar4.swift", "foo5.swift", "bar5.swift", "wibble.swift", "-module-name", "Test", "-enable-batch-mode", "-driver-batch-count", "3"])
+      let plannedJobs = try driver1.planBuild()
+      XCTAssertEqual(plannedJobs.count, 4)
+      XCTAssertEqual(plannedJobs[0].outputs.count, 4)
+      XCTAssertEqual(plannedJobs[0].outputs.first!.file, VirtualPath.temporary(RelativePath("foo1.o")))
+      XCTAssertEqual(plannedJobs[1].outputs.count, 4)
+      XCTAssertEqual(plannedJobs[1].outputs.first!.file, VirtualPath.temporary(RelativePath("foo3.o")))
+      XCTAssertEqual(plannedJobs[2].outputs.count, 3)
+      XCTAssertEqual(plannedJobs[2].outputs.first!.file, VirtualPath.temporary(RelativePath("foo5.o")))
+      XCTAssertTrue(plannedJobs[3].tool.name.contains(driver1.targetTriple.isDarwin ? "ld" : "clang"))
+      XCTAssertEqual(plannedJobs[3].outputs.count, 1)
+      XCTAssertEqual(plannedJobs[3].outputs.first!.file, VirtualPath.relative(RelativePath("Test")))
+    }
+
+    // Test 1 partition results in 1 job
+    do {
+      var driver = try Driver(args: ["swiftc", "-toolchain-stdlib-rpath", "-module-cache-path", "/tmp/clang-module-cache", "-swift-version", "4", "-Xfrontend", "-ignore-module-source-info", "-module-name", "batch", "-enable-batch-mode", "-j", "1", "-c", "main.swift", "lib.swift"])
+      let plannedJobs = try driver.planBuild()
+      XCTAssertEqual(plannedJobs.count, 1)
+      var count = 0
+      for arg in plannedJobs[0].commandLine where arg == .flag("-primary-file") {
+        count += 1
+      }
+      XCTAssertEqual(count, 2)
+    }
   }
 
   func testSingleThreadedWholeModuleOptimizationCompiles() throws {