Minor fixes

Author: rolfmorel

mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td

@@ -26,10 +26,12 @@ def LLVM_TargetAttr : LLVM_Attr<"Target", "target", [LLVM_TargetAttrInterface]>
     TODO
   }];
   let parameters = (ins "StringAttr":$triple,
-                        "StringAttr":$cpu,
-                        "TargetFeaturesAttr":$target_features);
+                        OptionalParameter<"StringAttr">:$chip,
+                        OptionalParameter<"TargetFeaturesAttr">:$features);
 
-  let assemblyFormat = "`<` $triple `,` $cpu `,` qualified($target_features) `>`";
+  let assemblyFormat = [{`<` `triple` `=` $triple
+                         (`,` `chip` `=` $chip^)?
+                         (`,` qualified($features)^)? `>`}];
 
   let extraClassDeclaration = [{
     std::optional<llvm::TargetMachine *> targetMachine = std::nullopt;

mlir/include/mlir/Dialect/LLVMIR/LLVMInterfaces.td

@@ -549,15 +549,15 @@ def LLVM_TargetAttrInterface
       /*args=*/(ins)
     >,
     InterfaceMethod<
-      /*description=*/"Returns the target cpu identifier.",
+      /*description=*/"Returns the target chip (i.e. \"cpu\") identifier.",
       /*retTy=*/"::llvm::StringRef",
-      /*methodName=*/"getCpu",
+      /*methodName=*/"getChip",
       /*args=*/(ins)
     >,
     InterfaceMethod<
       /*description=*/"Returns the target features as a string.",
       /*retTy=*/"::mlir::LLVM::TargetFeaturesAttr",
-      /*methodName=*/"getTargetFeatures",
+      /*methodName=*/"getFeatures",
       /*args=*/(ins)
     >,
     InterfaceMethod<

mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp

@@ -433,7 +433,7 @@ FailureOr<llvm::TargetMachine *> TargetAttr::getTargetMachine() {
   std::string error;
   const llvm::Target *target =
       llvm::TargetRegistry::lookupTarget(getTriple(), error);
-  if (!error.empty()) {
+  if (!target || !error.empty()) {
     LLVM_DEBUG({
       llvm::dbgs() << "Failed to retrieve the target with: `" << error << "`\n";
     });
@@ -442,8 +442,8 @@ FailureOr<llvm::TargetMachine *> TargetAttr::getTargetMachine() {
   }
 
   targetMachine = {target->createTargetMachine(
-      llvm::Triple(getTriple().strref()), getCpu().strref(),
-      getTargetFeatures().getFeaturesString().c_str(), {}, {})};
+      llvm::Triple(getTriple().strref()), getChip() ? getChip().strref() : "",
+      getFeatures() ? getFeatures().getFeaturesString() : "", {}, {})};
 
   return {targetMachine.value()};
 }
@@ -467,13 +467,14 @@ FailureOr<llvm::DataLayout> TargetAttr::getDataLayout() {
 }
 
 FailureOr<::mlir::Attribute> TargetAttr::query(DataLayoutEntryKey key) {
+  Attribute result;
   if (auto stringAttrKey = dyn_cast<StringAttr>(key)) {
     if (stringAttrKey.getValue() == "triple")
       return getTriple();
-    if (stringAttrKey.getValue() == "cpu")
-      return getCpu();
-    if (stringAttrKey.getValue() == "features")
-      return getTargetFeatures();
+    if (stringAttrKey.getValue() == "chip" && (result = getChip()))
+      return result;
+    if (stringAttrKey.getValue() == "features" && (result = getFeatures()))
+      return result;
   }
 
   return failure();

mlir/lib/Dialect/LLVMIR/Transforms/DataLayoutFromTarget.cpp

@@ -40,6 +40,7 @@ struct DataLayoutFromTargetPass
         mod->emitError() << "failed to obtain llvm::DataLayout from "
                          << targetAttr;
         passFailed = true;
+        return;
       }
       auto dataLayoutAttr = DataLayoutAttr::get(
           &getContext(), dataLayout->getStringRepresentation());