diff --git a/mlir/include/mlir/Dialect/LLVMIR/FunctionCallUtils.h b/mlir/include/mlir/Dialect/LLVMIR/FunctionCallUtils.h index 7289c3ac6ff7e..8da609755f6ca 100644 --- a/mlir/include/mlir/Dialect/LLVMIR/FunctionCallUtils.h +++ b/mlir/include/mlir/Dialect/LLVMIR/FunctionCallUtils.h @@ -50,16 +50,16 @@ LLVM::LLVMFuncOp lookupOrCreatePrintCloseFn(ModuleOp moduleOp); LLVM::LLVMFuncOp lookupOrCreatePrintCommaFn(ModuleOp moduleOp); LLVM::LLVMFuncOp lookupOrCreatePrintNewlineFn(ModuleOp moduleOp); LLVM::LLVMFuncOp lookupOrCreateMallocFn(ModuleOp moduleOp, Type indexType, - bool opaquePointers); + bool opaquePointers = true); LLVM::LLVMFuncOp lookupOrCreateAlignedAllocFn(ModuleOp moduleOp, Type indexType, bool opaquePointers = true); LLVM::LLVMFuncOp lookupOrCreateFreeFn(ModuleOp moduleOp, bool opaquePointers = true); LLVM::LLVMFuncOp lookupOrCreateGenericAllocFn(ModuleOp moduleOp, Type indexType, - bool opaquePointers); -LLVM::LLVMFuncOp lookupOrCreateGenericAlignedAllocFn(ModuleOp moduleOp, - Type indexType, - bool opaquePointers); + bool opaquePointers = true); +LLVM::LLVMFuncOp +lookupOrCreateGenericAlignedAllocFn(ModuleOp moduleOp, Type indexType, + bool opaquePointers = true); LLVM::LLVMFuncOp lookupOrCreateGenericFreeFn(ModuleOp moduleOp, bool opaquePointers = true); LLVM::LLVMFuncOp lookupOrCreateMemRefCopyFn(ModuleOp moduleOp, Type indexType, diff --git a/mlir/include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.td b/mlir/include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.td index d7bd8410e360a..76309b9b8a964 100644 --- a/mlir/include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.td +++ b/mlir/include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.td @@ -30,8 +30,6 @@ def MemrefToLLVMTypeConverterOp : Op:$use_aligned_alloc, DefaultValuedOptionalAttr:$index_bitwidth, DefaultValuedOptionalAttr:$use_generic_functions, - DefaultValuedOptionalAttr:$use_opaque_pointers, DefaultValuedOptionalAttr:$use_bare_ptr_call_conv, OptionalAttr:$data_layout); let assemblyFormat = "attr-dict"; diff --git a/mlir/lib/Conversion/MemRefToLLVM/AllocLikeConversion.cpp b/mlir/lib/Conversion/MemRefToLLVM/AllocLikeConversion.cpp index 6286b32b37042..7e3fb9e95bc2c 100644 --- a/mlir/lib/Conversion/MemRefToLLVM/AllocLikeConversion.cpp +++ b/mlir/lib/Conversion/MemRefToLLVM/AllocLikeConversion.cpp @@ -23,11 +23,9 @@ LLVM::LLVMFuncOp getNotalignedAllocFn(const LLVMTypeConverter *typeConverter, bool useGenericFn = typeConverter->getOptions().useGenericFunctions; if (useGenericFn) - return LLVM::lookupOrCreateGenericAllocFn( - module, indexType, typeConverter->useOpaquePointers()); + return LLVM::lookupOrCreateGenericAllocFn(module, indexType); - return LLVM::lookupOrCreateMallocFn(module, indexType, - typeConverter->useOpaquePointers()); + return LLVM::lookupOrCreateMallocFn(module, indexType); } LLVM::LLVMFuncOp getAlignedAllocFn(const LLVMTypeConverter *typeConverter, @@ -35,11 +33,9 @@ LLVM::LLVMFuncOp getAlignedAllocFn(const LLVMTypeConverter *typeConverter, bool useGenericFn = typeConverter->getOptions().useGenericFunctions; if (useGenericFn) - return LLVM::lookupOrCreateGenericAlignedAllocFn( - module, indexType, typeConverter->useOpaquePointers()); + return LLVM::lookupOrCreateGenericAlignedAllocFn(module, indexType); - return LLVM::lookupOrCreateAlignedAllocFn(module, indexType, - typeConverter->useOpaquePointers()); + return LLVM::lookupOrCreateAlignedAllocFn(module, indexType); } } // end namespace @@ -70,10 +66,6 @@ static Value castAllocFuncResult(ConversionPatternRewriter &rewriter, typeConverter.getPointerType(allocatedPtrTy.getElementType(), memrefAddrSpace), allocatedPtr); - - if (!typeConverter.useOpaquePointers()) - allocatedPtr = - rewriter.create(loc, elementPtrType, allocatedPtr); return allocatedPtr; } diff --git a/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp b/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp index eed29efcaaada..8932d61641827 100644 --- a/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp +++ b/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp @@ -42,7 +42,6 @@ transform::MemrefToLLVMTypeConverterOp::getTypeConverter() { (getUseAlignedAlloc() ? LowerToLLVMOptions::AllocLowering::AlignedAlloc : LowerToLLVMOptions::AllocLowering::Malloc); options.useGenericFunctions = getUseGenericFunctions(); - options.useOpaquePointers = getUseOpaquePointers(); if (getIndexBitwidth() != kDeriveIndexBitwidthFromDataLayout) options.overrideIndexBitwidth(getIndexBitwidth());