Skip to content

Fix batch mode one partition. #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Fix batch mode one partition. #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Sources/SwiftDriver/Jobs/CompileJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,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.
Expand Down
10 changes: 8 additions & 2 deletions Sources/SwiftDriver/Jobs/Planning.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,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.
Expand Down
38 changes: 26 additions & 12 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,18 +922,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 {
Expand Down