Skip to content

Add recursive package memory for quicker builds #726

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

Open
tylerjonesio wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add recursive package memory for quicker builds #726

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
37 changes: 15 additions & 22 deletions Plugins/SkipPlugin/SkipPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,22 @@ import PackagePlugin
throw SkipPluginError(errorDescription: "Peer target «\(peerTarget.name)» was not a source module")
}

var visitedPackageIDs: Set<String> = []
func recursivePackageDependencies(for package: Package) -> [PackageDependency] {
return package.dependencies + package.dependencies.flatMap({ recursivePackageDependencies(for: $0.package) })
package.dependencies.flatMap { dependency in
guard visitedPackageIDs.insert(dependency.package.id).inserted else {
return [] as [PackageDependency]
}
return [dependency] + recursivePackageDependencies(for: dependency.package)
}
}

let packageDeps = recursivePackageDependencies(for: context.package)

// create a lookup table from the (arbitrary but unique) product ID to the owning package
// this is needed to find the package ID associated with a given product ID
var productIDPackages: [Product.ID?: Package] = [:]
for targetPackage in recursivePackageDependencies(for: context.package) {
for targetPackage in packageDeps {
for product in targetPackage.package.products {
productIDPackages[product.id] = targetPackage.package
}
Expand All @@ -152,11 +160,9 @@ import PackagePlugin
let sourcehashOutputPath = Path(outputURL.appendingPathComponent(sourceHashDot + peerTarget.name + sourcehashExtension, isDirectory: false).path)
//Diagnostics.warning("add sourcehash output for \(target.name): \(sourcehashOutputPath)", file: sourcehashOutputPath.string)

struct Dep : Identifiable {
struct Dep {
let package: Package
let target: Target

var id: String { target.id }
}

var buildModuleArgs: [String] = [
Expand Down Expand Up @@ -189,6 +195,7 @@ import PackagePlugin
return targetLink
}

var visitedTargetIDs = Set<String>()
func dependencies(for targetDependencies: [TargetDependency], in package: Package) -> [Dep] {
return targetDependencies.flatMap { dep in
switch dep {
Expand All @@ -200,13 +207,13 @@ import PackagePlugin

return product.targets.flatMap { target in
// stop at any external targets
if skipRootTargetNames.contains(target.name) {
if skipRootTargetNames.contains(target.name) || !visitedTargetIDs.insert(target.id).inserted {
return [] as [Dep]
}
return [Dep(package: productPackage, target: target)] + dependencies(for: target.dependencies, in: productPackage)
}
case .target(let target):
if skipRootTargetNames.contains(target.name) {
if skipRootTargetNames.contains(target.name) || !visitedTargetIDs.insert(target.id).inserted {
return [] as [Dep]
}
return [Dep(package: package, target: target)] + dependencies(for: target.dependencies, in: package)
Expand All @@ -216,8 +223,7 @@ import PackagePlugin
}
}

var deps = dependencies(for: target.dependencies, in: context.package)
deps = makeUniqueById(deps)
let deps = dependencies(for: target.dependencies, in: context.package)

var outputFiles: [Path] = [sourcehashOutputPath]

Expand Down Expand Up @@ -292,8 +298,6 @@ import PackagePlugin
buildArguments += args
}

let packageDeps = recursivePackageDependencies(for: context.package)

// create a map from [target ID: package] for all known targets
let targetsToPackage = Dictionary(packageDeps.flatMap({ packageDep in
packageDep.package.targets.map({ target in
Expand Down Expand Up @@ -389,14 +393,3 @@ extension Path {
return outputDir.appending(subpath: "." + outputFileName)
}
}

func makeUniqueById<T: Identifiable>(_ items: [T]) -> [T] {
var uniqueItems = Set<T.ID>()
var result = [T]()
for item in items {
if uniqueItems.insert(item.id).inserted {
result.append(item)
}
}
return result
}
Loading