Skip to content

ARM: Remove CPU from computeTargetABI #151983

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
Aug 5, 2025
Merged

ARM: Remove CPU from computeTargetABI #151983

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: 2 additions & 3 deletions llvm/include/llvm/TargetParser/ARMTargetParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,9 @@ LLVM_ABI ProfileKind parseArchProfile(StringRef Arch);
LLVM_ABI unsigned parseArchVersion(StringRef Arch);

LLVM_ABI void fillValidCPUArchList(SmallVectorImpl<StringRef> &Values);
LLVM_ABI StringRef computeDefaultTargetABI(const Triple &TT, StringRef CPU);
LLVM_ABI StringRef computeDefaultTargetABI(const Triple &TT);

LLVM_ABI ARMABI computeTargetABI(const Triple &TT, StringRef CPU,
StringRef ABIName = "");
LLVM_ABI ARMABI computeTargetABI(const Triple &TT, StringRef ABIName = "");

/// Get the (LLVM) name of the minimum ARM CPU for the arch we are targeting.
///
Expand Down
11 changes: 5 additions & 6 deletions llvm/lib/Target/ARM/ARMTargetMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) {
return std::make_unique<ARMElfTargetObjectFile>();
}

static std::string computeDataLayout(const Triple &TT, StringRef CPU,
static std::string computeDataLayout(const Triple &TT,
const TargetOptions &Options,
bool isLittle) {
auto ABI = ARM::computeTargetABI(TT, CPU, Options.MCOptions.ABIName);
auto ABI = ARM::computeTargetABI(TT, Options.MCOptions.ABIName);
std::string Ret;

if (isLittle)
Expand Down Expand Up @@ -202,11 +202,10 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T, const Triple &TT,
std::optional<Reloc::Model> RM,
std::optional<CodeModel::Model> CM,
CodeGenOptLevel OL, bool isLittle)
: CodeGenTargetMachineImpl(T, computeDataLayout(TT, CPU, Options, isLittle),
TT, CPU, FS, Options,
getEffectiveRelocModel(TT, RM),
: CodeGenTargetMachineImpl(T, computeDataLayout(TT, Options, isLittle), TT,
CPU, FS, Options, getEffectiveRelocModel(TT, RM),
getEffectiveCodeModel(CM, CodeModel::Small), OL),
TargetABI(ARM::computeTargetABI(TT, CPU, Options.MCOptions.ABIName)),
TargetABI(ARM::computeTargetABI(TT, Options.MCOptions.ABIName)),
TLOF(createTLOF(getTargetTriple())), isLittle(isLittle) {

// Default to triple-appropriate float ABI
Expand Down
10 changes: 4 additions & 6 deletions llvm/lib/TargetParser/ARMTargetParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,8 @@ void ARM::fillValidCPUArchList(SmallVectorImpl<StringRef> &Values) {
}
}

StringRef ARM::computeDefaultTargetABI(const Triple &TT, StringRef CPU) {
StringRef ArchName =
CPU.empty() ? TT.getArchName() : getArchName(parseCPUArch(CPU));
StringRef ARM::computeDefaultTargetABI(const Triple &TT) {
StringRef ArchName = TT.getArchName();

if (TT.isOSBinFormatMachO()) {
if (TT.getEnvironment() == Triple::EABI ||
Expand Down Expand Up @@ -575,10 +574,9 @@ StringRef ARM::computeDefaultTargetABI(const Triple &TT, StringRef CPU) {
}
}

ARM::ARMABI ARM::computeTargetABI(const Triple &TT, StringRef CPU,
StringRef ABIName) {
ARM::ARMABI ARM::computeTargetABI(const Triple &TT, StringRef ABIName) {
if (ABIName.empty())
ABIName = ARM::computeDefaultTargetABI(TT, CPU);
ABIName = ARM::computeDefaultTargetABI(TT);

if (ABIName == "aapcs16")
return ARM_ABI_AAPCS16;
Expand Down
Loading