[mlir] Fix LLVM intrinsic convesion generator for overloadable types.

[kariddi]

Summary

If an intrinsic has overloadable types like llvm_anyint_ty or
llvm_anyfloat_ty then to getDeclaration() we need to pass a list
of the types that are "undefined" essentially concretizing them.

This patch add support for deriving such types from the MLIR op
that has been matched.

[rriddle]

mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp

47

Remove all static functions from namespace scope.

59

Use camelCase for variable names.

179

Use cast if the result isn’t being check for null.

[rriddle]

mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp

38

Function/top-level comments should be triple tick.

59

This applies to the rest of this revision as well.

[kariddi]

Testing the change by adapting existing test

[merge_guards_bot]

Unit tests: pass. 61991 tests passed, 0 failed and 783 were skipped.

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[kariddi]

Thanks River for the review. Addressed your comments.

[kariddi]

Removing space

[merge_guards_bot]

Unit tests: pass. 61991 tests passed, 0 failed and 783 were skipped.

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[merge_guards_bot]

Unit tests: pass. 61991 tests passed, 0 failed and 783 were skipped.

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[merge_guards_bot]

Unit tests: pass. 61991 tests passed, 0 failed and 783 were skipped.

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[rriddle]

mlir/test/mlir-tblgen/llvm-intrinsics.td

9 ↗

(On Diff #238943)

Start sentences with a capital letter.

mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp

34

nit: Can you just use a SmallBitVector instead?

36

nit: Remove this first line.

178

Can you use getOperand instead?

[kariddi]

Fixing additional comments.

[kariddi]

mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp

178

Thanks, good one! I actually missed that we had getOperand() available

[merge_guards_bot]

Unit tests: pass. 62041 tests passed, 0 failed and 783 were skipped.

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

[rriddle]

mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp

34

Please add a comment for this using directive.

168

nit: Swap these two variables to match the loop order below.

181

These !empty() checks need to be changed to 'any' now.

[kariddi]

Addressing comments

[kariddi]

Comments addressed

[merge_guards_bot]

Unit tests: fail. 62078 tests passed, 3 failed and 784 were skipped.

failed: Clang.Driver/cc-print-options.c
failed: LLVM.Transforms/ConstProp/fma.ll
failed: LLVM.Transforms/InstSimplify/fp-nan.ll

clang-tidy: unknown.

clang-format: pass.

Build artifacts: diff.json, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp

 // intrinsics to TableGen definitions for MLIR operations.
 //
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Support/STLExtras.h"
 #include "mlir/TableGen/GenInfo.h"
 
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/MachineValueType.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/Main.h"
 #include "llvm/TableGen/Record.h"
 #include "llvm/TableGen/TableGenBackend.h"
 
 static llvm::cl::OptionCategory IntrinsicGenCat("Intrinsics Generator Options");
 
 static llvm::cl::opt<std::string>
     nameFilter("llvmir-intrinsics-filter",
                llvm::cl::desc("Only keep the intrinsics with the specified "
                               "substring in their record name"),
                llvm::cl::cat(IntrinsicGenCat));
 
 namespace {
+
+using IndicesTy = llvm::SmallVector<int, 4>;
+
+// Static free helper functions for accessing tablegen definitions.
+// Return a CodeGen value type entry from a type record.
+static llvm::MVT::SimpleValueType getValueType(const llvm::Record *Rec) {
+  return (llvm::MVT::SimpleValueType)Rec->getValueAsDef("VT")->getValueAsInt(
+      "Value");
+}
+
+// Return the indices of the definitions in a list of definitions that
+// represent overloadable types
+static IndicesTy getOverloadableTypeIdxs(const llvm::Record &record,
+                                         const char *listName) {
+  IndicesTy OverloadedOps;
+  auto results = record.getValueAsListOfDefs(listName);
+  for (auto R : llvm::enumerate(results)) {
+    llvm::MVT::SimpleValueType VT = getValueType(R.value());
+    switch (VT) {
+    case llvm::MVT::iAny:
+    case llvm::MVT::fAny:
+    case llvm::MVT::Any:
+    case llvm::MVT::iPTRAny:
+    case llvm::MVT::vAny:
+      OverloadedOps.push_back(R.index());
+      break;
+    default:
+      continue;
+    }
+  }
+  return OverloadedOps;
+}
+
 /// A wrapper for LLVM's Tablegen class `Intrinsic` that provides accessors to
 /// the fields of the record.
 class LLVMIntrinsic {
 public:
   LLVMIntrinsic(const llvm::Record &record) : record(record) {}
 
   /// Get the name of the operation to be used in MLIR.  Uses the appropriate
   /// field if not empty, constructs a name by replacing underscores with dots
bool isCommutative() const {
     auto props = record.getValueAsListOfDefs(fieldTraits);
     for (const llvm::Record *r : props) {
       if (r->getName() == "Commutative")
         return true;
     }
     return false;
   }
 
+  IndicesTy getOverloadableOperandsIdxs() const {
+    return getOverloadableTypeIdxs(record, fieldOperands);
+  }
+
+  IndicesTy getOverloadableResultsIdxs() const {
+    return getOverloadableTypeIdxs(record, fieldResults);
+  }
+
 private:
   /// Names of the fileds in the Intrinsic LLVM Tablegen class.
   const char *fieldName = "LLVMName";
   const char *fieldOperands = "ParamTypes";
   const char *fieldResults = "RetTypes";
   const char *fieldTraits = "IntrProperties";
 
   const llvm::Record &record;
 };
 } // namespace
 
 /// Emits C++ code constructing an LLVM IR intrinsic given the generated MLIR
 /// operation.  In LLVM IR, intrinsics are constructed as function calls.
 static void emitBuilder(const LLVMIntrinsic &intr, llvm::raw_ostream &os) {
+  auto overloadedOps = intr.getOverloadableOperandsIdxs();
+  auto overloadedRes = intr.getOverloadableResultsIdxs();
   os << "    llvm::Module *module = builder.GetInsertBlock()->getModule();\n";
   os << "    llvm::Function *fn = llvm::Intrinsic::getDeclaration(\n";
   os << "        module, llvm::Intrinsic::" << intr.getProperRecordName()
-     << ");\n";
+     << ", {";
+  for (int idx : overloadedRes) {
+    os << "\n        opInst.getResult(" << idx << ").getType()"
+       << ".dyn_cast<LLVM::LLVMType>().getUnderlyingType(),";
+  }
+  for (int idx : overloadedOps) {
+    os << "\n        opInst.getOpOperand(" << idx << ").get().getType()"
+       << ".dyn_cast<LLVM::LLVMType>().getUnderlyingType(),";
+  }
+  if (!overloadedRes.empty() || !overloadedOps.empty())
+    os << "\n  ";
+  os << "});\n";
   os << "    auto operands = llvm::to_vector<8, Value *>(\n";
   os << "        opInst.operand_begin(), opInst.operand_end());\n";
   os << "    " << (intr.getNumResults() > 0 ? "$res = " : "")
      << "builder.CreateCall(fn, operands);\n";
   os << "  ";
 }
 
 /// Emits ODS (TableGen-based) code for `record` representing an LLVM intrinsic.