shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mlir][MemRefToLLVM] Fix crash with unconvertable memory space (#132323)

Browse Source 
This PR adds handling when the `memref.alloca` with unconvertable memory
space to prevent a crash. Fixes #131439.
This commit is contained in:
Longsheng Mou 2025-03-26 16:51:26 +08:00 committed by GitHub
parent cd3798d7ef
commit 894b27a746
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
View File

@ -105,8 +105,11 @@ struct AllocaOpLowering : public AllocLikeOpLLVMLowering {
auto allocaOp = cast<memref::AllocaOp>(op); auto allocaOp = cast<memref::AllocaOp>(op);
auto elementType = auto elementType =
typeConverter->convertType(allocaOp.getType().getElementType()); typeConverter->convertType(allocaOp.getType().getElementType());
unsigned addrSpace = FailureOr<unsigned> maybeAddressSpace =
*getTypeConverter()->getMemRefAddressSpace(allocaOp.getType()); getTypeConverter()->getMemRefAddressSpace(allocaOp.getType());
if (failed(maybeAddressSpace))
return std::make_tuple(Value(), Value());
unsigned addrSpace = *maybeAddressSpace;
auto elementPtrType = auto elementPtrType =
LLVM::LLVMPointerType::get(rewriter.getContext(), addrSpace); LLVM::LLVMPointerType::get(rewriter.getContext(), addrSpace);

11
mlir/test/Conversion/MemRefToLLVM/memref-to-llvm.mlir
View File

@ -654,3 +654,14 @@ func.func @store_non_temporal(%input : memref<32xf32, affine_map<(d0) -> (d0)>>,
memref.store %2, %output[%1] {nontemporal = true} : memref<32xf32, affine_map<(d0) -> (d0)>> memref.store %2, %output[%1] {nontemporal = true} : memref<32xf32, affine_map<(d0) -> (d0)>>
func.return func.return
} }
// -----
// Ensure unconvertable memory space not cause a crash
// CHECK-LABEL: @alloca_unconvertable_memory_space
func.func @alloca_unconvertable_memory_space() {
// CHECK: memref.alloca
%alloca = memref.alloca() : memref<1x32x33xi32, #spirv.storage_class<StorageBuffer>>
func.return
}