averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

ClangImporter: handle -target-cpu for x86 targets

Browse Source 
`-mcpu` is a deprecated "alias" (unsupported) on x86 targets for
`-mtune`. Unlike `-mcpu`, `-mtune` simply tunes the code for the CPU but
does not prevent execution on other targets. In order to match the
behaviour of `-mcpu` on ARM, we must use both `-march=` and `-mtune=`.
Adjust this behaviour to allow tuning of code for non-Darwin targets.
This commit is contained in:
Saleem Abdulrasool
2024-03-26 16:13:18 -07:00
parent 092ebe141d
commit e89bfcf63f
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ClangImporter/ClangImporter.cpp
View File

@@ -799,8 +799,19 @@ importer::addCommonInvocationArguments(
} }
if (!importerOpts.TargetCPU.empty()) { if (!importerOpts.TargetCPU.empty()) {
switch (triple.getArch()) {
case llvm::Triple::x86:
case llvm::Triple::x86_64:
// `-mcpu` is deprecated and an alias for `-mtune`. We need to pass
// `-march` and `-mtune` to behave identically to the `apple-a\d+` cases
// below.
invocationArgStrs.push_back("-march=" + importerOpts.TargetCPU);
invocationArgStrs.push_back("-mtune=" + importerOpts.TargetCPU);
break;
default:
invocationArgStrs.push_back("-mcpu=" + importerOpts.TargetCPU); invocationArgStrs.push_back("-mcpu=" + importerOpts.TargetCPU);
break;
}
} else if (triple.isOSDarwin()) { } else if (triple.isOSDarwin()) {
// Special case CPU based on known deployments: // Special case CPU based on known deployments:
// - arm64 deploys to apple-a7 // - arm64 deploys to apple-a7

3
test/Misc/target-cpu.swift
View File

@@ -40,3 +40,6 @@
// RUN: not %swift -typecheck -target s390x-unknown-linux-gnu -Xcc -### %s 2>&1 | %FileCheck -check-prefix=S390X_CPU %s // RUN: not %swift -typecheck -target s390x-unknown-linux-gnu -Xcc -### %s 2>&1 | %FileCheck -check-prefix=S390X_CPU %s
// S390X_CPU: "-target-cpu" "z13" // S390X_CPU: "-target-cpu" "z13"
// RUN: not %swiftc -typecheck -target x86_64-unknown-windows-msvc -target-cpu haswell -Xcc -### %s 2>&1 | %FileCheck -check-prefix X86_64 %s
// X86_64: "-target-cpu" "haswell"
// X86_64: "-tune-cpu" "haswell"