Create function declaration in the proper module #161281
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir-gpu Author: Renaud Kauffmann (Renaud-K) ChangesUsing Full diff: https://github.com/llvm/llvm-project/pull/161281.diff 2 Files Affected:
diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
index 262e0e7a30c63..cc6314cbd1ffe 100644
--- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
+++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
@@ -48,8 +48,8 @@ static bool isStaticStrideOrOffset(int64_t strideOrOffset) {
}
static FailureOr<LLVM::LLVMFuncOp>
-getFreeFn(OpBuilder &b, const LLVMTypeConverter *typeConverter, ModuleOp module,
- SymbolTableCollection *symbolTables) {
+getFreeFn(OpBuilder &b, const LLVMTypeConverter *typeConverter,
+ Operation *module, SymbolTableCollection *symbolTables) {
bool useGenericFn = typeConverter->getOptions().useGenericFunctions;
if (useGenericFn)
@@ -483,8 +483,8 @@ class DeallocOpLowering : public ConvertOpToLLVMPattern<memref::DeallocOp> {
ConversionPatternRewriter &rewriter) const override {
// Insert the `free` declaration if it is not already present.
FailureOr<LLVM::LLVMFuncOp> freeFunc =
- getFreeFn(rewriter, getTypeConverter(), op->getParentOfType<ModuleOp>(),
- symbolTables);
+ getFreeFn(rewriter, getTypeConverter(),
+ op->getParentWithTrait<OpTrait::SymbolTable>(), symbolTables);
if (failed(freeFunc))
return failure();
Value allocatedPtr;
diff --git a/mlir/test/Dialect/GPU/memref-to-llvm.mlir b/mlir/test/Dialect/GPU/memref-to-llvm.mlir
new file mode 100644
index 0000000000000..81a96bf29e84f
--- /dev/null
+++ b/mlir/test/Dialect/GPU/memref-to-llvm.mlir
@@ -0,0 +1,33 @@
+// RUN: mlir-opt --convert-to-llvm %s | FileCheck %s
+
+// Checking that malloc and free are declared in the proper module.
+
+// CHECK: module attributes {gpu.container_module} {
+// CHECK: llvm.func @free(!llvm.ptr)
+// CHECK: llvm.func @malloc(i64) -> !llvm.ptr
+// CHECK: gpu.module @kernels {
+// CHECK: llvm.func @free(!llvm.ptr)
+// CHECK: llvm.func @malloc(i64) -> !llvm.ptr
+// CHECK: gpu.func @kernel_1
+// CHECK: llvm.call @malloc({{.*}}) : (i64) -> !llvm.ptr
+// CHECK: llvm.call @free({{.*}}) : (!llvm.ptr) -> ()
+// CHECK: gpu.return
+// CHECK: }
+// CHECK: }
+// CHECK: }
+module attributes {gpu.container_module} {
+
+ gpu.module @kernels {
+ gpu.func @kernel_1() kernel {
+ %memref_a = memref.alloc() : memref<8x16xf32>
+ memref.dealloc %memref_a : memref<8x16xf32>
+ gpu.return
+ }
+ }
+
+ func.func @main() {
+ %memref_a = memref.alloc() : memref<8x16xf32>
+ memref.dealloc %memref_a : memref<8x16xf32>
+ return
+ }
+}
|
|
@llvm/pr-subscribers-mlir Author: Renaud Kauffmann (Renaud-K) ChangesUsing Full diff: https://github.com/llvm/llvm-project/pull/161281.diff 2 Files Affected:
diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
index 262e0e7a30c63..cc6314cbd1ffe 100644
--- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
+++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
@@ -48,8 +48,8 @@ static bool isStaticStrideOrOffset(int64_t strideOrOffset) {
}
static FailureOr<LLVM::LLVMFuncOp>
-getFreeFn(OpBuilder &b, const LLVMTypeConverter *typeConverter, ModuleOp module,
- SymbolTableCollection *symbolTables) {
+getFreeFn(OpBuilder &b, const LLVMTypeConverter *typeConverter,
+ Operation *module, SymbolTableCollection *symbolTables) {
bool useGenericFn = typeConverter->getOptions().useGenericFunctions;
if (useGenericFn)
@@ -483,8 +483,8 @@ class DeallocOpLowering : public ConvertOpToLLVMPattern<memref::DeallocOp> {
ConversionPatternRewriter &rewriter) const override {
// Insert the `free` declaration if it is not already present.
FailureOr<LLVM::LLVMFuncOp> freeFunc =
- getFreeFn(rewriter, getTypeConverter(), op->getParentOfType<ModuleOp>(),
- symbolTables);
+ getFreeFn(rewriter, getTypeConverter(),
+ op->getParentWithTrait<OpTrait::SymbolTable>(), symbolTables);
if (failed(freeFunc))
return failure();
Value allocatedPtr;
diff --git a/mlir/test/Dialect/GPU/memref-to-llvm.mlir b/mlir/test/Dialect/GPU/memref-to-llvm.mlir
new file mode 100644
index 0000000000000..81a96bf29e84f
--- /dev/null
+++ b/mlir/test/Dialect/GPU/memref-to-llvm.mlir
@@ -0,0 +1,33 @@
+// RUN: mlir-opt --convert-to-llvm %s | FileCheck %s
+
+// Checking that malloc and free are declared in the proper module.
+
+// CHECK: module attributes {gpu.container_module} {
+// CHECK: llvm.func @free(!llvm.ptr)
+// CHECK: llvm.func @malloc(i64) -> !llvm.ptr
+// CHECK: gpu.module @kernels {
+// CHECK: llvm.func @free(!llvm.ptr)
+// CHECK: llvm.func @malloc(i64) -> !llvm.ptr
+// CHECK: gpu.func @kernel_1
+// CHECK: llvm.call @malloc({{.*}}) : (i64) -> !llvm.ptr
+// CHECK: llvm.call @free({{.*}}) : (!llvm.ptr) -> ()
+// CHECK: gpu.return
+// CHECK: }
+// CHECK: }
+// CHECK: }
+module attributes {gpu.container_module} {
+
+ gpu.module @kernels {
+ gpu.func @kernel_1() kernel {
+ %memref_a = memref.alloc() : memref<8x16xf32>
+ memref.dealloc %memref_a : memref<8x16xf32>
+ gpu.return
+ }
+ }
+
+ func.func @main() {
+ %memref_a = memref.alloc() : memref<8x16xf32>
+ memref.dealloc %memref_a : memref<8x16xf32>
+ return
+ }
+}
|
fabianmcg
approved these changes
Sep 29, 2025
mahesh-attarde
pushed a commit
to mahesh-attarde/llvm-project
that referenced
this pull request
Oct 3, 2025
Using `memref.dealloc` in the gpu module would add a function definition for `@free` in the the top level module instead of the gpu module. The fix is to do what is already done for memref.alloc which is to use `op->getParentWithTrait<OpTrait::SymbolTable>()` instead of `op->getParentOfType<ModuleOp>()` to create the call in the proper module.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using
memref.deallocin the gpu module would add a function definition for@freein the the top level module instead of the gpu module. The fix is to do what is already done for memref.alloc which is to useop->getParentWithTrait<OpTrait::SymbolTable>()instead ofop->getParentOfType<ModuleOp>()to create the call in the proper module.