Simplify logic further

Author: bcardosolopes

mlir/include/mlir/Target/LLVMIR/LLVMImportInterface.h

@@ -74,10 +74,6 @@ class LLVMImportDialectInterface
   /// returns the list of supported intrinsic identifiers.
   virtual ArrayRef<unsigned> getSupportedIntrinsics() const { return {}; }
 
-  /// Whether dialect have a generic way to represent unsupported intrinsics
-  /// (i.e. as oposed to supported ones aboves).
-  virtual bool getUnregisteredIntrinsics() const { return false; }
-
   /// Hook for derived dialect interfaces to publish the supported instructions.
   /// As every LLVM IR instruction has a unique integer identifier, the function
   /// returns the list of supported instruction identifiers. These identifiers
@@ -102,6 +98,12 @@ class LLVMImportDialectInterface
 /// efficient dispatch.
 class LLVMImportInterface
     : public DialectInterfaceCollection<LLVMImportDialectInterface> {
+private:
+  // Generate llvm.call_intrinsic when no supporting dialect available.
+  LogicalResult
+  convertUnregisteredIntrinsic(OpBuilder &builder, llvm::CallInst *inst,
+                               LLVM::ModuleImport &moduleImport) const;
+
 public:
   using Base::Base;
 
@@ -149,12 +151,6 @@ class LLVMImportInterface
       // Add a mapping for all supported metadata kinds.
       for (unsigned kind : iface.getSupportedMetadata(llvmContext))
         metadataToDialect[kind].push_back(iface.getDialect());
-
-      // There can be only one dialect dealing with unregistered
-      // intrinsics, the last one to support the interface is the
-      // one to be used.
-      if (iface.getUnregisteredIntrinsics())
-        unregisteredIntrinscToDialect = iface.getDialect();
     }
 
     return success();
@@ -176,10 +172,7 @@ class LLVMImportInterface
     // No specialized (supported) intrinsics, attempt to generate a generic
     // version via llvm.call_intrinsic (if available).
     if (!dialect)
-      dialect = unregisteredIntrinscToDialect;
-
-    if (!dialect)
-      return failure();
+      return convertUnregisteredIntrinsic(builder, inst, moduleImport);
 
     // Dispatch the conversion to the dialect interface.
     const LLVMImportDialectInterface *iface = getInterfaceFor(dialect);
@@ -249,9 +242,6 @@ class LLVMImportInterface
   DenseMap<unsigned, Dialect *> intrinsicToDialect;
   DenseMap<unsigned, const LLVMImportDialectInterface *> instructionToDialect;
   DenseMap<unsigned, SmallVector<Dialect *, 1>> metadataToDialect;
-
-  /// Unregistered generic and target independent intrinsics.
-  Dialect *unregisteredIntrinscToDialect = nullptr;
 };
 
 } // namespace mlir

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.cpp

@@ -56,6 +56,30 @@ static ArrayRef<unsigned> getSupportedIntrinsicsImpl() {
   return convertibleIntrinsics;
 }
 
+/// Converts the LLVM intrinsic to an MLIR LLVM dialect operation if a
+/// conversion exits. Returns failure otherwise.
+static LogicalResult convertIntrinsicImpl(OpBuilder &odsBuilder,
+                                          llvm::CallInst *inst,
+                                          LLVM::ModuleImport &moduleImport) {
+  llvm::Intrinsic::ID intrinsicID = inst->getIntrinsicID();
+
+  // Check if the intrinsic is convertible to an MLIR dialect counterpart and
+  // copy the arguments to an an LLVM operands array reference for conversion.
+  if (isConvertibleIntrinsic(intrinsicID)) {
+    SmallVector<llvm::Value *> args(inst->args());
+    ArrayRef<llvm::Value *> llvmOperands(args);
+
+    SmallVector<llvm::OperandBundleUse> llvmOpBundles;
+    llvmOpBundles.reserve(inst->getNumOperandBundles());
+    for (unsigned i = 0; i < inst->getNumOperandBundles(); ++i)
+      llvmOpBundles.push_back(inst->getOperandBundleAt(i));
+
+#include "mlir/Dialect/LLVMIR/LLVMIntrinsicFromLLVMIRConversions.inc"
+  }
+
+  return failure();
+}
+
 /// Converts the LLVM intrinsic to a generic LLVM intrinsic call using
 /// llvm.intrinsic_call. Returns failure otherwise.
 static LogicalResult
@@ -98,32 +122,6 @@ convertUnregisteredIntrinsicImpl(OpBuilder &odsBuilder, llvm::CallInst *inst,
   return success();
 }
 
-/// Converts the LLVM intrinsic to an MLIR LLVM dialect operation if a
-/// conversion exits. Returns failure otherwise.
-static LogicalResult convertIntrinsicImpl(OpBuilder &odsBuilder,
-                                          llvm::CallInst *inst,
-                                          LLVM::ModuleImport &moduleImport) {
-  llvm::Intrinsic::ID intrinsicID = inst->getIntrinsicID();
-
-  // Check if the intrinsic is convertible to an MLIR dialect counterpart and
-  // copy the arguments to an an LLVM operands array reference for conversion.
-  if (isConvertibleIntrinsic(intrinsicID)) {
-    SmallVector<llvm::Value *> args(inst->args());
-    ArrayRef<llvm::Value *> llvmOperands(args);
-
-    SmallVector<llvm::OperandBundleUse> llvmOpBundles;
-    llvmOpBundles.reserve(inst->getNumOperandBundles());
-    for (unsigned i = 0; i < inst->getNumOperandBundles(); ++i)
-      llvmOpBundles.push_back(inst->getOperandBundleAt(i));
-
-#include "mlir/Dialect/LLVMIR/LLVMIntrinsicFromLLVMIRConversions.inc"
-  } else if (intrinsicID != llvm::Intrinsic::not_intrinsic) {
-    return convertUnregisteredIntrinsicImpl(odsBuilder, inst, moduleImport);
-  }
-
-  return failure();
-}
-
 /// Returns the list of LLVM IR metadata kinds that are convertible to MLIR LLVM
 /// dialect attributes.
 static ArrayRef<unsigned> getSupportedMetadataImpl(llvm::LLVMContext &context) {
@@ -411,6 +409,14 @@ static LogicalResult setIntelReqdSubGroupSizeAttr(Builder &builder,
   return success();
 }
 
+namespace mlir {
+// Generate llvm.call_intrinsic when no supporting dialect available.
+LogicalResult LLVMImportInterface::convertUnregisteredIntrinsic(
+    OpBuilder &builder, llvm::CallInst *inst,
+    LLVM::ModuleImport &moduleImport) const {
+  return convertUnregisteredIntrinsicImpl(builder, inst, moduleImport);
+}
+} // namespace mlir
 namespace {
 
 /// Implementation of the dialect interface that converts operations belonging
@@ -466,9 +472,6 @@ class LLVMDialectLLVMIRImportInterface : public LLVMImportDialectInterface {
     return getSupportedIntrinsicsImpl();
   }
 
-  /// Cnvertible to generic llvm.call_intrinsic.
-  bool getUnregisteredIntrinsics() const final { return true; }
-
   /// Returns the list of LLVM IR metadata kinds that are convertible to MLIR
   /// LLVM dialect attributes.
   ArrayRef<unsigned>