Skip to content

Commit e3a376f

Browse files
[NFC][Flang] Prefer triple overloads of lookupTarget (#162186)
The overloads accepting a string will be deprecated soon, like other functions in TargetRegistry.
1 parent 476a6ea commit e3a376f

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

flang/lib/Frontend/CompilerInstance.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,10 @@ bool CompilerInstance::setUpTargetMachine() {
344344
const std::string &theTriple = targetOpts.triple;
345345

346346
// Create `Target`
347+
const llvm::Triple triple(theTriple);
347348
std::string error;
348349
const llvm::Target *theTarget =
349-
llvm::TargetRegistry::lookupTarget(theTriple, error);
350+
llvm::TargetRegistry::lookupTarget(triple, error);
350351
if (!theTarget) {
351352
getDiagnostics().Report(clang::diag::err_fe_unable_to_create_target)
352353
<< error;
@@ -365,13 +366,12 @@ bool CompilerInstance::setUpTargetMachine() {
365366
tOpts.EnableAIXExtendedAltivecABI = targetOpts.EnableAIXExtendedAltivecABI;
366367

367368
targetMachine.reset(theTarget->createTargetMachine(
368-
llvm::Triple(theTriple), /*CPU=*/targetOpts.cpu,
369+
triple, /*CPU=*/targetOpts.cpu,
369370
/*Features=*/featuresStr, /*Options=*/tOpts,
370371
/*Reloc::Model=*/CGOpts.getRelocationModel(),
371372
/*CodeModel::Model=*/cm, OptLevel));
372373
assert(targetMachine && "Failed to create TargetMachine");
373374
if (cm.has_value()) {
374-
const llvm::Triple triple(theTriple);
375375
if ((cm == llvm::CodeModel::Medium || cm == llvm::CodeModel::Large) &&
376376
triple.getArch() == llvm::Triple::x86_64) {
377377
targetMachine->setLargeDataThreshold(CGOpts.LargeDataThreshold);

flang/tools/bbc/bbc.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,14 @@ createTargetMachine(llvm::StringRef targetTriple, std::string &error) {
316316
std::string triple{targetTriple};
317317
if (triple.empty())
318318
triple = llvm::sys::getDefaultTargetTriple();
319+
llvm::Triple parsedTriple(triple);
319320

320321
const llvm::Target *theTarget =
321-
llvm::TargetRegistry::lookupTarget(triple, error);
322+
llvm::TargetRegistry::lookupTarget(parsedTriple, error);
322323
if (!theTarget)
323324
return nullptr;
324325
return std::unique_ptr<llvm::TargetMachine>{
325-
theTarget->createTargetMachine(llvm::Triple(triple), /*CPU=*/"",
326+
theTarget->createTargetMachine(parsedTriple, /*CPU=*/"",
326327
/*Features=*/"", llvm::TargetOptions(),
327328
/*Reloc::Model=*/std::nullopt)};
328329
}

flang/tools/flang-driver/fc1_main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ using namespace Fortran::frontend;
3434

3535
/// Print supported cpus of the given target.
3636
static int printSupportedCPUs(llvm::StringRef triple) {
37+
llvm::Triple parsedTriple(triple);
3738
std::string error;
3839
const llvm::Target *target =
39-
llvm::TargetRegistry::lookupTarget(triple, error);
40+
llvm::TargetRegistry::lookupTarget(parsedTriple, error);
4041
if (!target) {
4142
llvm::errs() << error;
4243
return 1;
@@ -45,8 +46,8 @@ static int printSupportedCPUs(llvm::StringRef triple) {
4546
// the target machine will handle the mcpu printing
4647
llvm::TargetOptions targetOpts;
4748
std::unique_ptr<llvm::TargetMachine> targetMachine(
48-
target->createTargetMachine(llvm::Triple(triple), "", "+cpuhelp",
49-
targetOpts, std::nullopt));
49+
target->createTargetMachine(parsedTriple, "", "+cpuhelp", targetOpts,
50+
std::nullopt));
5051
return 0;
5152
}
5253

0 commit comments

Comments
 (0)