mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 01:06:06 +00:00
Code Issues Projects Releases Wiki Activity

[flang][fir] allow fir.convert from and to !llvm.ptr type (#106590)

Browse Source 
Allow some interaction between LLVM and FIR dialect by allowing
conversion between FIR memory types and llvm.ptr type.
This is meant to help experimentation where FIR and LLVM dialect
coexists, and is useful to deal with cases where LLVM type makes it
early into the MLIR produced by flang, like when inserting LLVM stack
intrinsic here:
0a00d32c5f/flang/lib/Optimizer/Transforms/StackReclaim.cpp (L57)
This commit is contained in:
jeanPerier 2024-08-30 08:20:17 +02:00 committed by GitHub
parent 24e791b416
commit b65fc7e91a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flang/include/flang/Optimizer/Dialect/FIROps.td
View File

@ -2713,7 +2713,7 @@ def fir_AddrOfOp : fir_OneResultOp<"address_of", [NoMemoryEffect]> {
let assemblyFormat = "`(` $symbol `)` attr-dict `:` type($resTy)";
}
def fir_ConvertOp : fir_OneResultOp<"convert", [NoMemoryEffect]> {
def fir_ConvertOp : fir_SimpleOneResultOp<"convert", [NoMemoryEffect]> {
let summary = "encapsulates all Fortran entity type conversions";
let description = [{
@ -2722,6 +2722,9 @@ def fir_ConvertOp : fir_OneResultOp<"convert", [NoMemoryEffect]> {
type, this instruction is a NOP and may be folded away. This also supports
integer to pointer conversion and pointer to integer conversion.
This operation also allows limited interaction between FIR and LLVM
dialects by allowing conversion between FIR pointer types and llvm.ptr type.
```
%v = ... : i64
%w = fir.convert %v : (i64) -> i32
@ -2731,6 +2734,7 @@ def fir_ConvertOp : fir_OneResultOp<"convert", [NoMemoryEffect]> {
}];
let arguments = (ins AnyType:$value);
let results = (outs AnyType:$res);
let assemblyFormat = [{
$value attr-dict `:` functional-type($value, results)

2
flang/lib/Optimizer/Dialect/FIROps.cpp
View File

@ -1387,7 +1387,7 @@ bool fir::ConvertOp::isFloatCompatible(mlir::Type ty) {
bool fir::ConvertOp::isPointerCompatible(mlir::Type ty) {
return mlir::isa<fir::ReferenceType, fir::PointerType, fir::HeapType,
fir::LLVMPointerType, mlir::MemRefType, mlir::FunctionType,
fir::TypeDescType>(ty);
fir::TypeDescType, mlir::LLVM::LLVMPointerType>(ty);
}
static std::optional<mlir::Type> getVectorElementType(mlir::Type ty) {

16
flang/test/Fir/convert.fir
View File

@ -11,3 +11,19 @@ func.func @c(%x : !fir.complex<4>) -> !fir.complex<8> {
%1 = fir.convert %x : (!fir.complex<4>) -> !fir.complex<8>
return %1 : !fir.complex<8>
}
func.func @convert_to_llvm_pointer(%x : !fir.llvm_ptr<i32>) -> !llvm.ptr {
%0 = fir.convert %x : (!fir.llvm_ptr<i32>) -> !llvm.ptr
return %0 : !llvm.ptr
}
// CHECK-LABEL: convert_to_llvm_pointer(
// CHECK-SAME: ptr %[[X:.*]])
// CHECK-NEXT: ret ptr %[[X]]
func.func @convert_from_llvm_pointer(%x : !llvm.ptr) -> !fir.llvm_ptr<i32> {
%0 = fir.convert %x : (!llvm.ptr) -> !fir.llvm_ptr<i32>
return %0 : !fir.llvm_ptr<i32>
}
// CHECK-LABEL: convert_from_llvm_pointer(
// CHECK-SAME: ptr %[[X:.*]])
// CHECK-NEXT: ret ptr %[[X]]