Skip to content

Commit 1553802

Browse files
[NFC][MLIR] Prefer triple overload of lookupTarget (#162187)
The overloads accepting a string will be deprecated soon, similar to other functions in TargetRegistry.
1 parent e115b02 commit 1553802

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

mlir/lib/Target/LLVM/ModuleToObject.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,18 @@ ModuleToObject::getOrCreateTargetMachine() {
5656
return targetMachine.get();
5757
// Load the target.
5858
std::string error;
59+
llvm::Triple parsedTriple(triple);
5960
const llvm::Target *target =
60-
llvm::TargetRegistry::lookupTarget(triple, error);
61+
llvm::TargetRegistry::lookupTarget(parsedTriple, error);
6162
if (!target) {
6263
getOperation().emitError()
6364
<< "Failed to lookup target for triple '" << triple << "' " << error;
6465
return std::nullopt;
6566
}
6667

6768
// Create the target machine using the target.
68-
targetMachine.reset(target->createTargetMachine(llvm::Triple(triple), chip,
69-
features, {}, {}));
69+
targetMachine.reset(
70+
target->createTargetMachine(parsedTriple, chip, features, {}, {}));
7071
if (!targetMachine)
7172
return std::nullopt;
7273
return targetMachine.get();

mlir/lib/Target/LLVM/ROCDL/Target.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ SerializeGPUModuleBase::assembleIsa(StringRef isa) {
289289
llvm::Triple triple(llvm::Triple::normalize(targetTriple));
290290
std::string error;
291291
const llvm::Target *target =
292-
llvm::TargetRegistry::lookupTarget(triple.normalize(), error);
292+
llvm::TargetRegistry::lookupTarget(triple, error);
293293
if (!target) {
294294
emitError(loc, Twine("failed to lookup target: ") + error);
295295
return std::nullopt;

mlir/lib/Target/LLVMIR/Transforms/TargetUtils.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,17 @@ getTargetMachine(mlir::LLVM::TargetAttrInterface attr) {
4343
llvm::cast_if_present<LLVM::TargetFeaturesAttr>(attr.getFeatures());
4444
std::string features = featuresAttr ? featuresAttr.getFeaturesString() : "";
4545

46+
llvm::Triple parsedTriple(triple);
4647
std::string error;
4748
const llvm::Target *target =
48-
llvm::TargetRegistry::lookupTarget(triple, error);
49+
llvm::TargetRegistry::lookupTarget(parsedTriple, error);
4950
if (!target || !error.empty()) {
5051
LDBG() << "Looking up target '" << triple << "' failed: " << error << "\n";
5152
return failure();
5253
}
5354

54-
return std::unique_ptr<llvm::TargetMachine>(target->createTargetMachine(
55-
llvm::Triple(triple), chipAKAcpu, features, {}, {}));
55+
return std::unique_ptr<llvm::TargetMachine>(
56+
target->createTargetMachine(parsedTriple, chipAKAcpu, features, {}, {}));
5657
}
5758

5859
FailureOr<llvm::DataLayout>

0 commit comments

Comments
 (0)