[flang] add fir.box_offset operation #73641
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
This operation allows computing the address of descriptor fields. It is needed to help attaching descriptors in OpenMP/OpenACC target region. The pointers inside the descriptor structure must be mapped too, but the fir.box is abstract, so these fields cannot be computed with fir.coordinate_of. To preserve the abstraction of the descriptor layout in FIR, introduce an operation specifically to address !fir.ref<fir.box<>> fields based on field names (base_addr or derived_type).
jeanPerier requested review from agozillon, clementval, kiranchandramohan, razvanlupusoru and tblah 
llvmbot added flang 
Member
| @llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-flang-codegen Author: None (jeanPerier) ChangesThis operation allows computing the address of descriptor fields. It is needed to help attaching descriptors in OpenMP/OpenACC target region. The pointers inside the descriptor structure must be mapped too, but the fir.box is abstract, so these fields cannot be computed with fir.coordinate_of. To preserve the abstraction of the descriptor layout in FIR, introduce an operation specifically to !fir.ref<fir.box<>> address fields based on field names (base_addr or derived_type). Full diff: https://github.com/llvm/llvm-project/pull/73641.diff 7 Files Affected:
diff --git a/flang/include/flang/Optimizer/Dialect/FIRAttr.td b/flang/include/flang/Optimizer/Dialect/FIRAttr.td index f153cf15f9af008..114bf7d1df913d1 100644 --- a/flang/include/flang/Optimizer/Dialect/FIRAttr.td +++ b/flang/include/flang/Optimizer/Dialect/FIRAttr.td @@ -58,6 +58,16 @@ def fir_FortranVariableFlagsAttr : fir_Attr<"FortranVariableFlags"> { "::fir::FortranVariableFlagsAttr::get($_builder.getContext(), $0)"; } +def fir_BoxFieldAttr : I32EnumAttr< + "BoxFieldAttr", "", + [ + I32EnumAttrCase<"base_addr", 0>, + I32EnumAttrCase<"derived_type", 1> + ]> { + let cppNamespace = "fir"; +} + + // mlir::SideEffects::Resource for modelling operations which add debugging information def DebuggingResource : Resource<"::fir::DebuggingResource">; diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td index 6e8064a63b7ae0a..af7bc52aef32680 100644 --- a/flang/include/flang/Optimizer/Dialect/FIROps.td +++ b/flang/include/flang/Optimizer/Dialect/FIROps.td @@ -3036,4 +3036,43 @@ def fir_DeclareOp : fir_Op<"declare", [AttrSizedOperandSegments, let hasVerifier = 1; } +def fir_BoxOffsetOp : fir_Op<"box_offset", [NoMemoryEffect]> { + + let summary = "Get the address of a field in a fir.ref<fir.box>"; + + let description = [{ + Given the address of a fir.box, compute the address of a field inside + the fir.box. + This allows keeping the actual runtime descriptor layout abstract in + FIR while providing access to the pointer addresses in the runtime + descriptor for OpenMP/OpenACC target mapping. + + To avoid requiring too much about the fields that the runtime descriptor + implementation must have, only the base_addr and derived_type descriptor + fields can be addressed. + + ``` + %addr = fir.box_offset %box base_addr : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>> + %tdesc = fir.box_offset %box derived_type : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> + + ``` + }]; + + let arguments = (ins + AnyReferenceLike:$box_ref, + fir_BoxFieldAttr:$field + ); + + let results = (outs RefOrLLVMPtr); + let hasVerifier = 1; + + let assemblyFormat = [{ + $box_ref $field attr-dict `:` functional-type(operands, results) + }]; + + let builders = [ + OpBuilder<(ins "mlir::Value":$boxRef, "fir::BoxFieldAttr":$field)> + ]; +} + #endif diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp index 9eabacdc818f6f4..38227f5c02a7ca5 100644 --- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp +++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp @@ -3656,6 +3656,27 @@ struct NegcOpConversion : public FIROpConversion<fir::NegcOp> { } }; +struct BoxOffsetOpConversion : public FIROpConversion<fir::BoxOffsetOp> { + using FIROpConversion::FIROpConversion; + + mlir::LogicalResult + matchAndRewrite(fir::BoxOffsetOp boxOffset, OpAdaptor adaptor, + mlir::ConversionPatternRewriter &rewriter) const override { + + mlir::Type pty = ::getLlvmPtrType(boxOffset.getContext()); + mlir::Type boxType = fir::unwrapRefType(boxOffset.getBoxRef().getType()); + mlir::Type llvmBoxTy = + lowerTy().convertBoxTypeAsStruct(mlir::cast<fir::BaseBoxType>(boxType)); + unsigned fieldId = boxOffset.getField() == fir::BoxFieldAttr::derived_type + ? getTypeDescFieldId(boxType) + : kAddrPosInBox; + rewriter.replaceOpWithNewOp<mlir::LLVM::GEPOp>( + boxOffset, pty, llvmBoxTy, adaptor.getBoxRef(), + llvm::ArrayRef<mlir::LLVM::GEPArg>{0, fieldId}); + return mlir::success(); + } +}; + /// Conversion pattern for operation that must be dead. The information in these /// operations is used by other operation. At this point they should not have /// anymore uses. @@ -3807,25 +3828,25 @@ class FIRToLLVMLowering AllocaOpConversion, AllocMemOpConversion, BoxAddrOpConversion, BoxCharLenOpConversion, BoxDimsOpConversion, BoxEleSizeOpConversion, BoxIsAllocOpConversion, BoxIsArrayOpConversion, BoxIsPtrOpConversion, - BoxProcHostOpConversion, BoxRankOpConversion, BoxTypeCodeOpConversion, - BoxTypeDescOpConversion, CallOpConversion, CmpcOpConversion, - ConstcOpConversion, ConvertOpConversion, CoordinateOpConversion, - DTEntryOpConversion, DivcOpConversion, EmboxOpConversion, - EmboxCharOpConversion, EmboxProcOpConversion, ExtractValueOpConversion, - FieldIndexOpConversion, FirEndOpConversion, FreeMemOpConversion, - GlobalLenOpConversion, GlobalOpConversion, HasValueOpConversion, - InsertOnRangeOpConversion, InsertValueOpConversion, - IsPresentOpConversion, LenParamIndexOpConversion, LoadOpConversion, - MulcOpConversion, NegcOpConversion, NoReassocOpConversion, - SelectCaseOpConversion, SelectOpConversion, SelectRankOpConversion, - SelectTypeOpConversion, ShapeOpConversion, ShapeShiftOpConversion, - ShiftOpConversion, SliceOpConversion, StoreOpConversion, - StringLitOpConversion, SubcOpConversion, TypeDescOpConversion, - TypeInfoOpConversion, UnboxCharOpConversion, UnboxProcOpConversion, - UndefOpConversion, UnreachableOpConversion, - UnrealizedConversionCastOpConversion, XArrayCoorOpConversion, - XEmboxOpConversion, XReboxOpConversion, ZeroOpConversion>(typeConverter, - options); + BoxOffsetOpConversion, BoxProcHostOpConversion, BoxRankOpConversion, + BoxTypeCodeOpConversion, BoxTypeDescOpConversion, CallOpConversion, + CmpcOpConversion, ConstcOpConversion, ConvertOpConversion, + CoordinateOpConversion, DTEntryOpConversion, DivcOpConversion, + EmboxOpConversion, EmboxCharOpConversion, EmboxProcOpConversion, + ExtractValueOpConversion, FieldIndexOpConversion, FirEndOpConversion, + FreeMemOpConversion, GlobalLenOpConversion, GlobalOpConversion, + HasValueOpConversion, InsertOnRangeOpConversion, + InsertValueOpConversion, IsPresentOpConversion, + LenParamIndexOpConversion, LoadOpConversion, MulcOpConversion, + NegcOpConversion, NoReassocOpConversion, SelectCaseOpConversion, + SelectOpConversion, SelectRankOpConversion, SelectTypeOpConversion, + ShapeOpConversion, ShapeShiftOpConversion, ShiftOpConversion, + SliceOpConversion, StoreOpConversion, StringLitOpConversion, + SubcOpConversion, TypeDescOpConversion, TypeInfoOpConversion, + UnboxCharOpConversion, UnboxProcOpConversion, UndefOpConversion, + UnreachableOpConversion, UnrealizedConversionCastOpConversion, + XArrayCoorOpConversion, XEmboxOpConversion, XReboxOpConversion, + ZeroOpConversion>(typeConverter, options); mlir::populateFuncToLLVMConversionPatterns(typeConverter, pattern); mlir::populateOpenMPToLLVMConversionPatterns(typeConverter, pattern); mlir::arith::populateArithToLLVMConversionPatterns(typeConverter, pattern); diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp index 9641b46d4725c80..ab1e9c0ec7adc85 100644 --- a/flang/lib/Optimizer/Dialect/FIROps.cpp +++ b/flang/lib/Optimizer/Dialect/FIROps.cpp @@ -3584,6 +3584,39 @@ void fir::IfOp::resultToSourceOps(llvm::SmallVectorImpl<mlir::Value> &results, results.push_back(term->getOperand(resultNum)); } +//===----------------------------------------------------------------------===// +// BoxOffsetOp +//===----------------------------------------------------------------------===// + +mlir::LogicalResult fir::BoxOffsetOp::verify() { + auto boxType = mlir::dyn_cast_or_null<fir::BaseBoxType>( + fir::dyn_cast_ptrEleTy(getBoxRef().getType())); + if (!boxType) + return emitOpError("box_ref operand must have !fir.ref<!fir.box<T>> type"); + if (getField() != fir::BoxFieldAttr::base_addr && + getField() != fir::BoxFieldAttr::derived_type) + return emitOpError("cannot address provided field"); + if (getField() == fir::BoxFieldAttr::derived_type) + if (!fir::boxHasAddendum(boxType)) + return emitOpError("can only address derived_type field of derived type " + "or unlimited polymorphic fir.box"); + return mlir::success(); +} + +void fir::BoxOffsetOp::build(mlir::OpBuilder &builder, + mlir::OperationState &result, mlir::Value boxRef, + fir::BoxFieldAttr field) { + mlir::Type valueType = + fir::unwrapPassByRefType(fir::unwrapRefType(boxRef.getType())); + mlir::Type resultType = valueType; + if (field == fir::BoxFieldAttr::base_addr) + resultType = fir::LLVMPointerType::get(fir::ReferenceType::get(valueType)); + else if (field == fir::BoxFieldAttr::derived_type) + resultType = fir::LLVMPointerType::get( + fir::TypeDescType::get(fir::unwrapSequenceType(valueType))); + build(builder, result, {resultType}, boxRef, field); +} + //===----------------------------------------------------------------------===// mlir::ParseResult fir::isValidCaseAttr(mlir::Attribute attr) { diff --git a/flang/test/Fir/box-offset-codegen.fir b/flang/test/Fir/box-offset-codegen.fir new file mode 100644 index 000000000000000..76e5f6f0a600105 --- /dev/null +++ b/flang/test/Fir/box-offset-codegen.fir @@ -0,0 +1,44 @@ +// Test fir.box_offset parse/print/parse/print identity. +// RUN: fir-opt %s | fir-opt | FileCheck %s + + + +func.func @test_box_offset(%unlimited : !fir.ref<!fir.class<none>>, %type_star : !fir.ref<!fir.box<!fir.array<?xnone>>>) { + %box1 = fir.alloca !fir.box<i32> + %addr1 = fir.box_offset %box1 base_addr : (!fir.ref<!fir.box<i32>>) -> !fir.llvm_ptr<!fir.ref<i32>> + + %box2 = fir.alloca !fir.box<!fir.type<t>> + %addr2 = fir.box_offset %box2 base_addr : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.ref<!fir.type<t>>> + %tdesc2 = fir.box_offset %box2 derived_type : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> + + %box3 = fir.alloca !fir.box<!fir.array<?xi32>> + %addr3 = fir.box_offset %box3 base_addr : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>> + + %box4 = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>> + %addr4 = fir.box_offset %box4 base_addr : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.ptr<!fir.array<?x!fir.type<t>>>> + %tdesc4 = fir.box_offset %box4 derived_type : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> + + %addr5 = fir.box_offset %unlimited base_addr : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.ref<none>> + %tdesc5 = fir.box_offset %unlimited derived_type : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.tdesc<none>> + + %addr6 = fir.box_offset %type_star base_addr : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xnone>>> + %tdesc6 = fir.box_offset %type_star derived_type : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.tdesc<none>> + return +} +// CHECK-LABEL: func.func @test_box_offset( +// CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.class<none>>, +// CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.box<!fir.array<?xnone>>>) { +// CHECK: %[[VAL_2:.*]] = fir.alloca !fir.box<i32> +// CHECK: %[[VAL_3:.*]] = fir.box_offset %[[VAL_2]] base_addr : (!fir.ref<!fir.box<i32>>) -> !fir.llvm_ptr<!fir.ref<i32>> +// CHECK: %[[VAL_4:.*]] = fir.alloca !fir.box<!fir.type<t>> +// CHECK: %[[VAL_5:.*]] = fir.box_offset %[[VAL_4]] base_addr : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.ref<!fir.type<t>>> +// CHECK: %[[VAL_6:.*]] = fir.box_offset %[[VAL_4]] derived_type : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> +// CHECK: %[[VAL_7:.*]] = fir.alloca !fir.box<!fir.array<?xi32>> +// CHECK: %[[VAL_8:.*]] = fir.box_offset %[[VAL_7]] base_addr : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>> +// CHECK: %[[VAL_9:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>> +// CHECK: %[[VAL_10:.*]] = fir.box_offset %[[VAL_9]] base_addr : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.ptr<!fir.array<?x!fir.type<t>>>> +// CHECK: %[[VAL_11:.*]] = fir.box_offset %[[VAL_9]] derived_type : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> +// CHECK: %[[VAL_12:.*]] = fir.box_offset %[[VAL_0]] base_addr : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.ref<none>> +// CHECK: %[[VAL_13:.*]] = fir.box_offset %[[VAL_0]] derived_type : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.tdesc<none>> +// CHECK: %[[VAL_14:.*]] = fir.box_offset %[[VAL_1]] base_addr : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xnone>>> +// CHECK: %[[VAL_15:.*]] = fir.box_offset %[[VAL_1]] derived_type : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.tdesc<none>> diff --git a/flang/test/Fir/box-offset.fir b/flang/test/Fir/box-offset.fir new file mode 100644 index 000000000000000..98c2eaefb8d6b9e --- /dev/null +++ b/flang/test/Fir/box-offset.fir @@ -0,0 +1,42 @@ +// Test fir.box_offset parse/print/parse/print identity. +// RUN: fir-opt %s | fir-opt | FileCheck %s + +func.func @test_box_offset(%unlimited : !fir.ref<!fir.class<none>>, %type_star : !fir.ref<!fir.box<!fir.array<?xnone>>>) { + %box1 = fir.alloca !fir.box<i32> + %addr1 = fir.box_offset %box1 base_addr : (!fir.ref<!fir.box<i32>>) -> !fir.llvm_ptr<!fir.ref<i32>> + + %box2 = fir.alloca !fir.box<!fir.type<t>> + %addr2 = fir.box_offset %box2 base_addr : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.ref<!fir.type<t>>> + %tdesc2 = fir.box_offset %box2 derived_type : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> + + %box3 = fir.alloca !fir.box<!fir.array<?xi32>> + %addr3 = fir.box_offset %box3 base_addr : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>> + + %box4 = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>> + %addr4 = fir.box_offset %box4 base_addr : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.ptr<!fir.array<?x!fir.type<t>>>> + %tdesc4 = fir.box_offset %box4 derived_type : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> + + %addr5 = fir.box_offset %unlimited base_addr : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.ref<none>> + %tdesc5 = fir.box_offset %unlimited derived_type : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.tdesc<none>> + + %addr6 = fir.box_offset %type_star base_addr : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xnone>>> + %tdesc6 = fir.box_offset %type_star derived_type : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.tdesc<none>> + return +} +// CHECK-LABEL: func.func @test_box_offset( +// CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.class<none>>, +// CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.box<!fir.array<?xnone>>>) { +// CHECK: %[[VAL_2:.*]] = fir.alloca !fir.box<i32> +// CHECK: %[[VAL_3:.*]] = fir.box_offset %[[VAL_2]] base_addr : (!fir.ref<!fir.box<i32>>) -> !fir.llvm_ptr<!fir.ref<i32>> +// CHECK: %[[VAL_4:.*]] = fir.alloca !fir.box<!fir.type<t>> +// CHECK: %[[VAL_5:.*]] = fir.box_offset %[[VAL_4]] base_addr : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.ref<!fir.type<t>>> +// CHECK: %[[VAL_6:.*]] = fir.box_offset %[[VAL_4]] derived_type : (!fir.ref<!fir.box<!fir.type<t>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> +// CHECK: %[[VAL_7:.*]] = fir.alloca !fir.box<!fir.array<?xi32>> +// CHECK: %[[VAL_8:.*]] = fir.box_offset %[[VAL_7]] base_addr : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xi32>>> +// CHECK: %[[VAL_9:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>> +// CHECK: %[[VAL_10:.*]] = fir.box_offset %[[VAL_9]] base_addr : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.ptr<!fir.array<?x!fir.type<t>>>> +// CHECK: %[[VAL_11:.*]] = fir.box_offset %[[VAL_9]] derived_type : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<t>>>>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<t>>> +// CHECK: %[[VAL_12:.*]] = fir.box_offset %[[VAL_0]] base_addr : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.ref<none>> +// CHECK: %[[VAL_13:.*]] = fir.box_offset %[[VAL_0]] derived_type : (!fir.ref<!fir.class<none>>) -> !fir.llvm_ptr<!fir.tdesc<none>> +// CHECK: %[[VAL_14:.*]] = fir.box_offset %[[VAL_1]] base_addr : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.ref<!fir.array<?xnone>>> +// CHECK: %[[VAL_15:.*]] = fir.box_offset %[[VAL_1]] derived_type : (!fir.ref<!fir.box<!fir.array<?xnone>>>) -> !fir.llvm_ptr<!fir.tdesc<none>> diff --git a/flang/test/Fir/invalid.fir b/flang/test/Fir/invalid.fir index 824aeec28b41702..049e108ba992d6c 100644 --- a/flang/test/Fir/invalid.fir +++ b/flang/test/Fir/invalid.fir @@ -962,3 +962,19 @@ func.func @fp_to_logical(%arg0: f32) -> !fir.logical<4> { %0 = fir.convert %arg0 : (f32) -> !fir.logical<4> return %0 : !fir.logical<4> } + +// ----- + +func.func @bad_box_offset(%not_a_box : !fir.ref<i32>) { + // expected-error@+1{{'fir.box_offset' op box_ref operand must have !fir.ref<!fir.box<T>> type}} + %addr1 = fir.box_offset %not_a_box base_addr : (!fir.ref<i32>) -> !fir.llvm_ptr<!fir.ref<i32>> + return +} + +// ----- + +func.func @bad_box_offset(%no_addendum : !fir.ref<!fir.box<i32>>) { + // expected-error@+1{{'fir.box_offset' op can only address derived_type field of derived type or unlimited polymorphic fir.box}} + %addr1 = fir.box_offset %no_addendum derived_type : (!fir.ref<!fir.box<i32>>) -> !fir.llvm_ptr<!fir.tdesc<!fir.type<none>>> + return +} |
kiranchandramohan approved these changes Nov 28, 2023
Contributor
kiranchandramohan left a comment
kiranchandramohan left a comment There was a problem hiding this comment.
Thanks @jeanPerier for this helpful operation.
I have one comment about the test.
tblah reviewed Nov 28, 2023
Contributor
tblah left a comment
tblah left a comment There was a problem hiding this comment.
LGTM with one nit. Please add the correct codegen test as Kiran mentioned.
agozillon approved these changes Nov 28, 2023
Contributor
agozillon left a comment
agozillon left a comment There was a problem hiding this comment.
LGTM, thank you very much for your help and hard work on this patch!
razvanlupusoru approved these changes Nov 28, 2023
Contributor
razvanlupusoru left a comment
razvanlupusoru left a comment There was a problem hiding this comment.
Thank you for adding this!
clementval approved these changes Nov 28, 2023
psteinfeld reviewed Nov 29, 2023
Contributor
psteinfeld left a comment
psteinfeld left a comment There was a problem hiding this comment.
@jeanPerier, can you please look at the warning in lib/Optimizer/CodeGen/CodeGen.cpp?
| : kAddrPosInBox; | ||
| rewriter.replaceOpWithNewOp<mlir::LLVM::GEPOp>( | ||
| boxOffset, pty, llvmBoxTy, adaptor.getBoxRef(), | ||
| llvm::ArrayRef<mlir::LLVM::GEPArg>{0, fieldId}); |
Contributor
There was a problem hiding this comment.
I get a warning on this line about a narrowing conversion, and, since I build with warnings treated as errors, this breaks my build. I build with GCC 9.3.0.
Here's the relevant text of the error message:
/local/home/psteinfeld/up/standalone/llvm-project/flang/lib/Optimizer/CodeGen/CodeGen.cpp: In member function ‘virtual mlir::LogicalResult {anonymous}::BoxOffsetOpConversion::matchAndRewrite(fir::BoxOffsetOp, mlir::ConvertOpToLLVMPattern<fir::BoxOffsetOp>::OpAdaptor, mlir::ConversionPatternRewriter&) const’: /local/home/psteinfeld/up/standalone/llvm-project/flang/lib/Optimizer/CodeGen/CodeGen.cpp:3675:54: error: narrowing conversion of ‘fieldId’ from ‘unsigned int’ to ‘int32_t’ {aka ‘int’} inside { } [-Werror=narrowing] llvm::ArrayRef<mlir::LLVM::GEPArg>{0, fieldId}); ^ At global scope: cc1plus: error: unrecognized command line option ‘-Wno-ctad-maybe-unsupported’ [-Werror] cc1plus: error: unrecognized command line option ‘-Wno-deprecated-copy’ [-Werror] cc1plus: all warnings being treated as errors jeanPerier added a commit to jeanPerier/llvm-project that referenced this pull request Nov 29, 2023
jeanPerier added a commit that referenced this pull request Nov 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
8 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.
This operation allows computing the address of descriptor fields. It is needed to help attaching descriptors in OpenMP/OpenACC target region. The pointers inside the descriptor structure must be mapped too, but the fir.box is abstract, so these fields cannot be computed with fir.coordinate_of.
To preserve the abstraction of the descriptor layout in FIR, introduce an operation specifically to !fir.ref<fir.box<>> address fields based on field names (base_addr or derived_type).