[Mlir-commits] [mlir] [MLIR] Replace get(Void/Int)PtrType with getPtrType in ConvertToLLVMPattern (PR #145657)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Wed Jun 25 02:43:27 PDT 2025
https://github.com/PragmaTwice created https://github.com/llvm/llvm-project/pull/145657
`ConversionPattern::getVoidPtrType` and `ConversionPattern::getIntPtrType` looks a little confusion since the opaque pointer migration is already done.
Maybe we can mark them as deprecated and add new method `getPtrType()`, as this PR did : )
>From d3b362ad21d289d56550761661f1a047b4725ffa Mon Sep 17 00:00:00 2001
From: PragmaTwice <twice at apache.org>
Date: Wed, 25 Jun 2025 17:34:07 +0800
Subject: [PATCH] [MLIR] Replace get(Void/Int)PtrType with getPtrType in
ConvertToLLVMPattern
---
mlir/include/mlir/Conversion/LLVMCommon/Pattern.h | 5 +++++
mlir/lib/Conversion/LLVMCommon/Pattern.cpp | 12 +++++++-----
mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp | 13 +++++--------
.../lib/Conversion/FuncToLLVM/TestConvertCallOp.cpp | 2 +-
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h b/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
index 503a2a7e6f0cd..f0c364b53a66c 100644
--- a/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
+++ b/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
@@ -107,14 +107,19 @@ class ConvertToLLVMPattern : public ConversionPattern {
/// Gets the MLIR type wrapping the LLVM integer type whose bit width
/// corresponds to that of a LLVM pointer type.
+ [[deprecated("Use getPtrType() instead!")]]
Type getIntPtrType(unsigned addressSpace = 0) const;
/// Gets the MLIR type wrapping the LLVM void type.
Type getVoidType() const;
/// Get the MLIR type wrapping the LLVM i8* type.
+ [[deprecated("Use getPtrType() instead!")]]
Type getVoidPtrType() const;
+ /// Get the MLIR type wrapping the LLVM ptr type.
+ Type getPtrType(unsigned addressSpace = 0) const;
+
/// Create a constant Op producing a value of `resultType` from an index-typed
/// integer attribute.
static Value createIndexAttrConstant(OpBuilder &builder, Location loc,
diff --git a/mlir/lib/Conversion/LLVMCommon/Pattern.cpp b/mlir/lib/Conversion/LLVMCommon/Pattern.cpp
index 86fb9166b7223..2089dae102532 100644
--- a/mlir/lib/Conversion/LLVMCommon/Pattern.cpp
+++ b/mlir/lib/Conversion/LLVMCommon/Pattern.cpp
@@ -37,18 +37,20 @@ Type ConvertToLLVMPattern::getIndexType() const {
return getTypeConverter()->getIndexType();
}
-Type ConvertToLLVMPattern::getIntPtrType(unsigned addressSpace) const {
+Type ConvertToLLVMPattern::getPtrType(unsigned addressSpace) const {
return IntegerType::get(&getTypeConverter()->getContext(),
getTypeConverter()->getPointerBitwidth(addressSpace));
}
+Type ConvertToLLVMPattern::getIntPtrType(unsigned addressSpace) const {
+ return getPtrType(addressSpace);
+}
+
Type ConvertToLLVMPattern::getVoidType() const {
return LLVM::LLVMVoidType::get(&getTypeConverter()->getContext());
}
-Type ConvertToLLVMPattern::getVoidPtrType() const {
- return LLVM::LLVMPointerType::get(&getTypeConverter()->getContext());
-}
+Type ConvertToLLVMPattern::getVoidPtrType() const { return getPtrType(); }
Value ConvertToLLVMPattern::createIndexAttrConstant(OpBuilder &builder,
Location loc,
@@ -273,7 +275,7 @@ LogicalResult ConvertToLLVMPattern::copyUnrankedDescriptors(
? builder
.create<LLVM::CallOp>(loc, mallocFunc.value(), allocationSize)
.getResult()
- : builder.create<LLVM::AllocaOp>(loc, getVoidPtrType(),
+ : builder.create<LLVM::AllocaOp>(loc, getPtrType(),
IntegerType::get(getContext(), 8),
allocationSize,
/*alignment=*/0);
diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
index 4b7b2cc224ce2..0046db43101a9 100644
--- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
+++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
@@ -408,8 +408,7 @@ struct AllocaScopeOpLowering
// Save stack and then branch into the body of the region.
rewriter.setInsertionPointToEnd(currentBlock);
- auto stackSaveOp =
- rewriter.create<LLVM::StackSaveOp>(loc, getVoidPtrType());
+ auto stackSaveOp = rewriter.create<LLVM::StackSaveOp>(loc, getPtrType());
rewriter.create<LLVM::BrOp>(loc, ValueRange(), beforeBody);
// Replace the alloca_scope return with a branch that jumps out of the body.
@@ -859,7 +858,7 @@ struct GetGlobalMemrefOpLowering
// We do not expect the memref obtained using `memref.get_global` to be
// ever deallocated. Set the allocated pointer to be known bad value to
// help debug if that ever happens.
- auto intPtrType = getIntPtrType(memSpace);
+ auto intPtrType = getPtrType(memSpace);
Value deadBeefConst =
createIndexAttrConstant(rewriter, op->getLoc(), intPtrType, 0xdeadbeef);
auto deadBeefPtr =
@@ -1122,8 +1121,7 @@ class MemRefCopyOpLowering : public ConvertOpToLLVMPattern<memref::CopyOp> {
};
// Save stack position before promoting descriptors
- auto stackSaveOp =
- rewriter.create<LLVM::StackSaveOp>(loc, getVoidPtrType());
+ auto stackSaveOp = rewriter.create<LLVM::StackSaveOp>(loc, getPtrType());
auto srcMemRefType = dyn_cast<MemRefType>(srcType);
Value unrankedSource =
@@ -1249,7 +1247,7 @@ struct MemorySpaceCastOpLowering
result, resultAddrSpace, sizes);
Value resultUnderlyingSize = sizes.front();
Value resultUnderlyingDesc = rewriter.create<LLVM::AllocaOp>(
- loc, getVoidPtrType(), rewriter.getI8Type(), resultUnderlyingSize);
+ loc, getPtrType(), rewriter.getI8Type(), resultUnderlyingSize);
result.setMemRefDescPtr(rewriter, loc, resultUnderlyingDesc);
// Copy pointers, performing address space casts.
@@ -1530,8 +1528,7 @@ struct MemRefReshapeOpLowering
UnrankedMemRefDescriptor::computeSizes(rewriter, loc, *getTypeConverter(),
targetDesc, addressSpace, sizes);
Value underlyingDescPtr = rewriter.create<LLVM::AllocaOp>(
- loc, getVoidPtrType(), IntegerType::get(getContext(), 8),
- sizes.front());
+ loc, getPtrType(), IntegerType::get(getContext(), 8), sizes.front());
targetDesc.setMemRefDescPtr(rewriter, loc, underlyingDescPtr);
// Extract pointers and offset from the source memref.
diff --git a/mlir/test/lib/Conversion/FuncToLLVM/TestConvertCallOp.cpp b/mlir/test/lib/Conversion/FuncToLLVM/TestConvertCallOp.cpp
index f878a262512ee..3b29867cc3263 100644
--- a/mlir/test/lib/Conversion/FuncToLLVM/TestConvertCallOp.cpp
+++ b/mlir/test/lib/Conversion/FuncToLLVM/TestConvertCallOp.cpp
@@ -28,7 +28,7 @@ class TestTypeProducerOpConverter
LogicalResult
matchAndRewrite(test::TestTypeProducerOp op, OpAdaptor adaptor,
ConversionPatternRewriter &rewriter) const override {
- rewriter.replaceOpWithNewOp<LLVM::ZeroOp>(op, getVoidPtrType());
+ rewriter.replaceOpWithNewOp<LLVM::ZeroOp>(op, getPtrType());
return success();
}
};
More information about the Mlir-commits
mailing list