Skip to content

[Driver] Pass -emit-irgen thru to frontend. #1706

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
Oct 3, 2024
Merged

[Driver] Pass -emit-irgen thru to frontend. #1706

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
5 changes: 4 additions & 1 deletion Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,7 +2193,10 @@ extension Driver {
case .emitSibgen:
compilerOutputType = .raw_sib

case .emitIrgen, .emitIr:
case .emitIrgen:
compilerOutputType = .raw_llvmIr

case .emitIr:
compilerOutputType = .llvmIR

case .emitBc:
Expand Down
6 changes: 4 additions & 2 deletions Sources/SwiftDriver/Jobs/CompileJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ extension Driver {
/// Is this compile job top-level
func isTopLevelOutput(type: FileType?) -> Bool {
switch type {
case .assembly, .sil, .raw_sil, .llvmIR, .ast, .jsonDependencies, .sib, .raw_sib,
.importedModules, .indexData:
case .assembly, .sil, .raw_sil, .raw_llvmIr, .llvmIR, .ast, .jsonDependencies, .sib,
.raw_sib, .importedModules, .indexData:
return true
case .object:
return (linkerOutputType == nil)
Expand Down Expand Up @@ -463,6 +463,8 @@ extension FileType {
return .emitSibgen
case .sib:
return .emitSib
case .raw_llvmIr:
return .emitIrgen
case .llvmIR:
return .emitIr
case .llvmBitcode:
Expand Down
20 changes: 15 additions & 5 deletions Sources/SwiftDriver/Utilities/FileType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ public enum FileType: String, Hashable, CaseIterable, Codable {
/// Raw sib file
case raw_sib

/// Raw LLVM IR file
case raw_llvmIr

/// LLVM IR file
case llvmIR = "ll"

Expand Down Expand Up @@ -188,6 +191,9 @@ extension FileType: CustomStringConvertible {
case .raw_sib:
return "raw-sib"

case .raw_llvmIr:
return "raw-llvm-ir"

case .llvmIR:
return "llvm-ir"

Expand Down Expand Up @@ -285,7 +291,7 @@ extension FileType {
.jsonDependencies, .clangModuleMap, .jsonTargetInfo, .jsonCompilerFeatures,
.jsonSwiftArtifacts, .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline,
.jsonABIBaseline, .swiftConstValues, .jsonAPIDescriptor,
.moduleSummary, .moduleSemanticInfo, .cachedDiagnostics:
.moduleSummary, .moduleSemanticInfo, .cachedDiagnostics, .raw_llvmIr:
return false
}
}
Expand Down Expand Up @@ -352,6 +358,8 @@ extension FileType {
return "raw-sil"
case .raw_sib:
return "raw-sib"
case .raw_llvmIr:
return "raw-llvm-ir"
case .llvmIR:
return "llvm-ir"
case .llvmBitcode:
Expand Down Expand Up @@ -412,7 +420,8 @@ extension FileType {
.moduleTrace, .yamlOptimizationRecord, .swiftInterface, .privateSwiftInterface, .packageSwiftInterface,
.jsonDependencies, .clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo,
.jsonSwiftArtifacts, .jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues,
.jsonAPIDescriptor, .moduleSummary, .moduleSemanticInfo, .cachedDiagnostics:
.jsonAPIDescriptor, .moduleSummary, .moduleSemanticInfo, .cachedDiagnostics,
.raw_llvmIr:
return true
case .image, .object, .dSYM, .pch, .sib, .raw_sib, .swiftModule,
.swiftDocumentation, .swiftSourceInfoFile, .llvmBitcode, .diagnostics,
Expand All @@ -436,7 +445,8 @@ extension FileType {
.modDepCache, .bitstreamOptimizationRecord, .pcm, .pch, .jsonDependencies,
.clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo, .jsonSwiftArtifacts,
.indexUnitOutputPath, .jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues,
.jsonAPIDescriptor, .moduleSummary, .moduleSemanticInfo, .cachedDiagnostics:
.jsonAPIDescriptor, .moduleSummary, .moduleSemanticInfo, .cachedDiagnostics,
.raw_llvmIr:
return false
}
}
Expand All @@ -446,7 +456,7 @@ extension FileType {
switch self {
case .swift, .ast, .indexData, .indexUnitOutputPath, .jsonCompilerFeatures, .jsonTargetInfo:
return false
case .sil, .sib, .image, .object, .dSYM, .dependencies, .autolink, .swiftModule, .swiftDocumentation, .swiftInterface, .privateSwiftInterface, .packageSwiftInterface, .swiftSourceInfoFile, .swiftConstValues, .assembly, .raw_sil, .raw_sib, .llvmIR, .llvmBitcode, .diagnostics, .emitModuleDiagnostics, .emitModuleDependencies, .objcHeader, .swiftDeps, .modDepCache, .remap, .importedModules, .tbd, .jsonDependencies, .jsonSwiftArtifacts, .moduleTrace, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .pcm, .pch, .clangModuleMap, .jsonAPIBaseline, .jsonABIBaseline, .jsonAPIDescriptor, .moduleSummary, .moduleSemanticInfo, .cachedDiagnostics:
case .sil, .sib, .image, .object, .dSYM, .dependencies, .autolink, .swiftModule, .swiftDocumentation, .swiftInterface, .privateSwiftInterface, .packageSwiftInterface, .swiftSourceInfoFile, .swiftConstValues, .assembly, .raw_sil, .raw_sib, .llvmIR, .llvmBitcode, .diagnostics, .emitModuleDiagnostics, .emitModuleDependencies, .objcHeader, .swiftDeps, .modDepCache, .remap, .importedModules, .tbd, .jsonDependencies, .jsonSwiftArtifacts, .moduleTrace, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .pcm, .pch, .clangModuleMap, .jsonAPIBaseline, .jsonABIBaseline, .jsonAPIDescriptor, .moduleSummary, .moduleSemanticInfo, .cachedDiagnostics, .raw_llvmIr:
return true
}
}
Expand All @@ -468,7 +478,7 @@ extension FileType {
.moduleTrace, .indexData, .yamlOptimizationRecord,
.bitstreamOptimizationRecord, .pcm, .pch, .jsonDependencies,
.jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues, .jsonAPIDescriptor,
.moduleSummary, .moduleSemanticInfo, .cachedDiagnostics:
.moduleSummary, .moduleSemanticInfo, .cachedDiagnostics, .raw_llvmIr:
return true
}
}
Expand Down
20 changes: 20 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8166,6 +8166,26 @@ final class SwiftDriverTests: XCTestCase {
}
try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-emit-module", "-cache-compile-job", "-explicit-module-build")
}

func testEmitLLVMIR() throws {
do {
var driver = try Driver(args: ["swiftc", "-emit-irgen", "file.swift"])
let jobs = try driver.planBuild().removingAutolinkExtractJobs()
XCTAssertEqual(jobs.count, 1)

XCTAssertTrue(jobs[0].commandLine.contains("-emit-irgen"))
XCTAssertTrue(!jobs[0].commandLine.contains("-emit-ir"))
}

do {
var driver = try Driver(args: ["swiftc", "-emit-ir", "file.swift"])
let jobs = try driver.planBuild().removingAutolinkExtractJobs()
XCTAssertEqual(jobs.count, 1)

XCTAssertTrue(jobs[0].commandLine.contains("-emit-ir"))
XCTAssertTrue(!jobs[0].commandLine.contains("-emit-irgen"))
}
}
}

func assertString(
Expand Down