Address Mehdi's comments

Author: rolfmorel

mlir/include/mlir/Target/LLVMIR/Transforms/Passes.h

@@ -9,26 +9,11 @@
 #ifndef MLIR_TARGET_LLVMIR_TRANSFORMS_PASSES_H
 #define MLIR_TARGET_LLVMIR_TRANSFORMS_PASSES_H
 
-#include "mlir/Dialect/LLVMIR/LLVMInterfaces.h"
 #include "mlir/Pass/Pass.h"
-#include "llvm/Support/Threading.h"
-#include "llvm/Target/TargetMachine.h"
 
 namespace mlir {
-
 namespace LLVM {
 
-namespace detail {
-
-void initializeBackendsOnce();
-
-FailureOr<std::unique_ptr<llvm::TargetMachine>>
-getTargetMachine(mlir::LLVM::TargetAttrInterface attr);
-
-FailureOr<llvm::DataLayout> getDataLayout(mlir::LLVM::TargetAttrInterface attr);
-
-} // namespace detail
-
 #define GEN_PASS_DECL
 #define GEN_PASS_REGISTRATION
 #include "mlir/Target/LLVMIR/Transforms/Passes.h.inc"

mlir/include/mlir/Target/LLVMIR/Transforms/Passes.td

@@ -28,10 +28,13 @@ def LLVMTargetToDataLayout : Pass<"llvm-target-to-data-layout"> {
 }
 
 def LLVMTargetToTargetFeatures : Pass<"llvm-target-to-target-features"> {
-  let summary = "TODO";
+  let summary = "Update attached #llvm.target's features per the described target";
   let dependentDialects = ["mlir::DLTIDialect"];
   let description = [{
-    TODO
+    Obtain the TargetMachine specified by the attached #llvm.target's attributes
+    and obtain from it the full list of features of the selected target. Updates
+    the attached #llvm.target so that its features reflect the full list of
+    features.
   }];
   let options = [
     Option<"initializeLLVMTargets", "initialize-llvm-targets", "bool",

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

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Target/LLVMIR/Transforms/Passes.h"
+#include "mlir/Target/LLVMIR/Transforms/TargetUtils.h"
 
 #include "mlir/Dialect/DLTI/DLTI.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"

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

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Target/LLVMIR/Transforms/Passes.h"
+#include "mlir/Target/LLVMIR/Transforms/TargetUtils.h"
 
 #include "mlir/Dialect/DLTI/DLTI.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"

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

@@ -13,12 +13,11 @@
 
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/DebugLog.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Target/TargetMachine.h"
 
 #define DEBUG_TYPE "mlir-llvm-target-utils"
-#define DBGS() (llvm::dbgs() << '[' << DEBUG_TYPE << "] ")
-#define LDBG(X) LLVM_DEBUG(DBGS() << X << "\n")
 
 llvm::once_flag initializeBackendsOnce;
 
@@ -46,7 +45,7 @@ getTargetMachine(mlir::LLVM::TargetAttrInterface attr) {
   const llvm::Target *target =
       llvm::TargetRegistry::lookupTarget(triple, error);
   if (!target || !error.empty()) {
-    LDBG("Looking up target '" << triple << "' failed: " << error << "\n");
+    LDBG() << "Looking up target '" << triple << "' failed: " << error << "\n";
     return failure();
   }
 
@@ -59,7 +58,7 @@ getDataLayout(mlir::LLVM::TargetAttrInterface attr) {
   FailureOr<std::unique_ptr<llvm::TargetMachine>> targetMachine =
       getTargetMachine(attr);
   if (failed(targetMachine)) {
-    LDBG("Failed to retrieve the target machine for data layout.\n");
+    LDBG() << "Failed to retrieve the target machine for data layout.\n";
     return failure();
   }
   return (targetMachine.value())->createDataLayout();