remove uncheckedGetInstrincSource, add llvm-c/Core.h

Author: makslevental

mlir/include/mlir-c/Target/LLVMIR.h

@@ -16,6 +16,7 @@
 
 #include "mlir-c/IR.h"
 #include "mlir-c/Support.h"
+#include "llvm-c/Core.h"
 #include "llvm-c/Support.h"
 
 #ifdef __cplusplus
@@ -74,14 +75,6 @@ mlirTypeToLLVMIRTranslatorDestroy(MlirTypeToLLVMIRTranslator translator);
 MLIR_CAPI_EXPORTED LLVMTypeRef mlirTypeToLLVMIRTranslatorTranslateType(
     MlirTypeToLLVMIRTranslator translator, MlirType mlirType);
 
-/// Attempts to look up the LLVM intrinsic matching `id` with parameter types
-/// `mlirParamTypes`. Note, since no return type is required, no check is
-/// performed to verify the found intrinsic.
-MLIR_CAPI_EXPORTED LLVMTypeRef
-mlirTypeToLLVMIRTranslatorUncheckedGetIntrinsicSignature(
-    MlirTypeToLLVMIRTranslator translator, unsigned id,
-    MlirType *mlirParamTypes, unsigned numParams);
-
 #ifdef __cplusplus
 }
 #endif

mlir/include/mlir/Target/LLVMIR/TypeToLLVM.h

@@ -53,12 +53,6 @@ class TypeToLLVMIRTranslator {
   /// Translates the given MLIR LLVM dialect type to LLVM IR.
   llvm::Type *translateType(Type type);
 
-  /// Attempts to look up the LLVM intrinsic matching `id` with parameter types
-  /// `types`. Note, since no return type is required, no check is performed to
-  /// verify the found intrinsic.
-  llvm::FunctionType *
-  uncheckedGetIntrinsicSignature(unsigned id, llvm::ArrayRef<Type> types);
-
 private:
   /// Private implementation.
   std::unique_ptr<detail::TypeToLLVMIRTranslatorImpl> impl;

mlir/lib/CAPI/Target/LLVMIR.cpp

@@ -9,7 +9,6 @@
 
 #include "mlir-c/Target/LLVMIR.h"
 
-#include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Type.h"
@@ -78,15 +77,3 @@ mlirTypeToLLVMIRTranslatorTranslateType(MlirTypeToLLVMIRTranslator translator,
   llvm::Type *type = translator_->translateType(unwrap(mlirType));
   return llvm::wrap(type);
 }
-
-LLVMTypeRef mlirTypeToLLVMIRTranslatorUncheckedGetIntrinsicSignature(
-    MlirTypeToLLVMIRTranslator translator, unsigned id,
-    MlirType *mlirParamTypes, unsigned numParams) {
-  SmallVector<mlir::Type, 4> paramTypes;
-  for (unsigned i = 0; i < numParams; i++)
-    paramTypes.emplace_back(unwrap(mlirParamTypes[i]));
-  LLVM::TypeToLLVMIRTranslator *translator_ = unwrap(translator);
-  llvm::Type *functionType =
-      translator_->uncheckedGetIntrinsicSignature(id, paramTypes);
-  return llvm::wrap(functionType);
-}

mlir/lib/Target/LLVMIR/TypeToLLVM.cpp

@@ -85,15 +85,6 @@ class TypeToLLVMIRTranslatorImpl {
     return translated;
   }
 
-  llvm::FunctionType *
-  uncheckedGetIntrinsicSignature(unsigned id, llvm::ArrayRef<Type> types) {
-    SmallVector<llvm::Type *, 8> paramTypes;
-    if (llvm::Intrinsic::isOverloaded(id)) {
-      translateTypes(types, paramTypes);
-    }
-    return llvm::Intrinsic::getType(context, id, paramTypes);
-  }
-
 private:
   /// Translates the given array type.
   llvm::Type *translate(LLVM::LLVMArrayType type) {
@@ -203,12 +194,6 @@ llvm::Type *LLVM::TypeToLLVMIRTranslator::translateType(Type type) {
   return impl->translateType(type);
 }
 
-llvm::FunctionType *
-LLVM::TypeToLLVMIRTranslator::uncheckedGetIntrinsicSignature(
-    unsigned id, llvm::ArrayRef<Type> types) {
-  return impl->uncheckedGetIntrinsicSignature(id, types);
-}
-
 unsigned LLVM::TypeToLLVMIRTranslator::getPreferredAlignment(
     Type type, const llvm::DataLayout &layout) {
   return layout.getPrefTypeAlign(translateType(type)).value();

mlir/test/CAPI/translation.c

@@ -79,36 +79,6 @@ static void testTypeToFromLLVMIRTranslator(MlirContext ctx) {
   LLVMDumpType(llvmTy2);
   fprintf(stderr, "\n");
 
-  // check "not overloaded" path
-  MlirType i32 = mlirIntegerTypeGet(ctx, 32);
-  MlirType nonOverloadeTys[] = {i32};
-  unsigned returnAddressIID = LLVMLookupIntrinsicID("llvm.returnaddress", 18);
-  LLVMTypeRef returnAddressIntrinsicTy =
-      mlirTypeToLLVMIRTranslatorUncheckedGetIntrinsicSignature(
-          toLLVMTranslator, returnAddressIID, nonOverloadeTys, 1);
-  // CHECK: ptr (i32)
-  LLVMDumpType(returnAddressIntrinsicTy);
-  fprintf(stderr, "\n");
-
-  // check "overloaded" path
-  MlirType overloadeTys[] = {i32, i32};
-  unsigned sMaxIID = LLVMLookupIntrinsicID("llvm.smax", 9);
-  LLVMTypeRef llvmSMaxIntrinsicTy =
-      mlirTypeToLLVMIRTranslatorUncheckedGetIntrinsicSignature(
-          toLLVMTranslator, sMaxIID, overloadeTys, 2);
-  // CHECK: i32 (i32, i32)
-  LLVMDumpType(llvmSMaxIntrinsicTy);
-  fprintf(stderr, "\n");
-
-  MlirType mlirSMaxIntrinsicTy = mlirTypeFromLLVMIRTranslatorTranslateType(
-      fromLLVMTranslator, llvmSMaxIntrinsicTy);
-  // CHECK: !llvm.func<i32 (i32, i32)>
-  mlirTypeDump(mlirSMaxIntrinsicTy);
-
-  MlirType retType = mlirLLVMFunctionTypeGetReturnType(mlirSMaxIntrinsicTy);
-  // CHECK: i32
-  mlirTypeDump(retType);
-
   mlirTypeFromLLVMIRTranslatorDestroy(fromLLVMTranslator);
   mlirTypeToLLVMIRTranslatorDestroy(toLLVMTranslator);
   LLVMContextDispose(llvmCtx);