Skip to content

[NFC][Flang] Prefer triple overloads of lookupTarget #162186

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 2 commits into from
Oct 6, 2025
Merged

[NFC][Flang] Prefer triple overloads of lookupTarget #162186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a87f9
[NFC][Flang] Prefer triple overloads of lookupTarget
boomanaiden154 Oct 6, 2025
8065a08
format
boomanaiden154 Oct 6, 2025
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
6 changes: 3 additions & 3 deletions flang/lib/Frontend/CompilerInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,10 @@ bool CompilerInstance::setUpTargetMachine() {
const std::string &theTriple = targetOpts.triple;

// Create `Target`
const llvm::Triple triple(theTriple);
std::string error;
const llvm::Target *theTarget =
llvm::TargetRegistry::lookupTarget(theTriple, error);
llvm::TargetRegistry::lookupTarget(triple, error);
if (!theTarget) {
getDiagnostics().Report(clang::diag::err_fe_unable_to_create_target)
<< error;
Expand All @@ -365,13 +366,12 @@ bool CompilerInstance::setUpTargetMachine() {
tOpts.EnableAIXExtendedAltivecABI = targetOpts.EnableAIXExtendedAltivecABI;

targetMachine.reset(theTarget->createTargetMachine(
llvm::Triple(theTriple), /*CPU=*/targetOpts.cpu,
triple, /*CPU=*/targetOpts.cpu,
/*Features=*/featuresStr, /*Options=*/tOpts,
/*Reloc::Model=*/CGOpts.getRelocationModel(),
/*CodeModel::Model=*/cm, OptLevel));
assert(targetMachine && "Failed to create TargetMachine");
if (cm.has_value()) {
const llvm::Triple triple(theTriple);
if ((cm == llvm::CodeModel::Medium || cm == llvm::CodeModel::Large) &&
triple.getArch() == llvm::Triple::x86_64) {
targetMachine->setLargeDataThreshold(CGOpts.LargeDataThreshold);
Expand Down
5 changes: 3 additions & 2 deletions flang/tools/bbc/bbc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,14 @@ createTargetMachine(llvm::StringRef targetTriple, std::string &error) {
std::string triple{targetTriple};
if (triple.empty())
triple = llvm::sys::getDefaultTargetTriple();
llvm::Triple parsedTriple(triple);

const llvm::Target *theTarget =
llvm::TargetRegistry::lookupTarget(triple, error);
llvm::TargetRegistry::lookupTarget(parsedTriple, error);
if (!theTarget)
return nullptr;
return std::unique_ptr<llvm::TargetMachine>{
theTarget->createTargetMachine(llvm::Triple(triple), /*CPU=*/"",
theTarget->createTargetMachine(parsedTriple, /*CPU=*/"",
/*Features=*/"", llvm::TargetOptions(),
/*Reloc::Model=*/std::nullopt)};
}
Expand Down
7 changes: 4 additions & 3 deletions flang/tools/flang-driver/fc1_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ using namespace Fortran::frontend;

/// Print supported cpus of the given target.
static int printSupportedCPUs(llvm::StringRef triple) {
llvm::Triple parsedTriple(triple);
std::string error;
const llvm::Target *target =
llvm::TargetRegistry::lookupTarget(triple, error);
llvm::TargetRegistry::lookupTarget(parsedTriple, error);
if (!target) {
llvm::errs() << error;
return 1;
Expand All @@ -45,8 +46,8 @@ static int printSupportedCPUs(llvm::StringRef triple) {
// the target machine will handle the mcpu printing
llvm::TargetOptions targetOpts;
std::unique_ptr<llvm::TargetMachine> targetMachine(
target->createTargetMachine(llvm::Triple(triple), "", "+cpuhelp",
targetOpts, std::nullopt));
target->createTargetMachine(parsedTriple, "", "+cpuhelp", targetOpts,
std::nullopt));
return 0;
}

Expand Down