Skip to content

Commit 15e1e3b

Browse files
clementvalclementval
authored
[flang] Read the extra field from the in box when doing reboxing (#102992)
Updated version of #102686. The issue was that in some rebox case the addendum presence flag should be updated and not always taken from the "from" box. This is the case when reboxing a fir.class to a fir.box that doesn't require an addendum for example. Open a new review since there is a bit of additional code in the CodeGen part.
1 parent eae1d65 commit 15e1e3b

File tree

8 files changed

+87
-35
lines changed

8 files changed

+87
-35
lines changed

‎flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ class ConvertFIRToLLVMPattern : public mlir::ConvertToLLVMPattern {
107107
mlir::Value box,
108108
mlir::ConversionPatternRewriter &rewriter) const;
109109

110+
mlir::Value getExtraFromBox(mlir::Location loc, TypePair boxTy,
111+
mlir::Value box,
112+
mlir::ConversionPatternRewriter &rewriter) const;
113+
110114
// Get the element type given an LLVM type that is of the form
111115
// (array|struct|vector)+ and the provided indexes.
112116
mlir::Type getBoxEleTy(mlir::Type type,

‎flang/lib/Optimizer/CodeGen/CodeGen.cpp

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,8 @@ struct EmboxCommonConversion : public fir::FIROpConversion<OP> {
12271227
mlir::ConversionPatternRewriter &rewriter,
12281228
unsigned rank, mlir::Value eleSize,
12291229
mlir::Value cfiTy, mlir::Value typeDesc,
1230-
int allocatorIdx = kDefaultAllocator) const {
1230+
int allocatorIdx = kDefaultAllocator,
1231+
mlir::Value extraField = {}) const {
12311232
auto llvmBoxTy = this->lowerTy().convertBoxTypeAsStruct(boxTy, rank);
12321233
bool isUnlimitedPolymorphic = fir::isUnlimitedPolymorphicType(boxTy);
12331234
bool useInputType = fir::isPolymorphicType(boxTy) || isUnlimitedPolymorphic;
@@ -1246,16 +1247,40 @@ struct EmboxCommonConversion : public fir::FIROpConversion<OP> {
12461247

12471248
const bool hasAddendum = fir::boxHasAddendum(boxTy);
12481249

1249-
// Descriptor used to set the correct value of the extra field.
1250-
Fortran::runtime::StaticDescriptor<0> staticDescriptor;
1251-
Fortran::runtime::Descriptor &desc{staticDescriptor.descriptor()};
1252-
desc.raw().extra = 0;
1253-
desc.SetAllocIdx(allocatorIdx);
1254-
if (hasAddendum)
1255-
desc.SetHasAddendum();
1256-
descriptor =
1257-
insertField(rewriter, loc, descriptor, {kExtraPosInBox},
1258-
this->genI32Constant(loc, rewriter, desc.raw().extra));
1250+
if (extraField) {
1251+
// Make sure to set the addendum presence flag according to the
1252+
// destination box.
1253+
if (hasAddendum) {
1254+
auto maskAttr = mlir::IntegerAttr::get(
1255+
rewriter.getIntegerType(8, /*isSigned=*/false),
1256+
llvm::APInt(8, (uint64_t)_CFI_ADDENDUM_FLAG, /*isSigned=*/false));
1257+
mlir::LLVM::ConstantOp mask = rewriter.create<mlir::LLVM::ConstantOp>(
1258+
loc, rewriter.getI8Type(), maskAttr);
1259+
extraField = rewriter.create<mlir::LLVM::OrOp>(loc, extraField, mask);
1260+
} else {
1261+
auto maskAttr = mlir::IntegerAttr::get(
1262+
rewriter.getIntegerType(8, /*isSigned=*/false),
1263+
llvm::APInt(8, (uint64_t)~_CFI_ADDENDUM_FLAG, /*isSigned=*/false));
1264+
mlir::LLVM::ConstantOp mask = rewriter.create<mlir::LLVM::ConstantOp>(
1265+
loc, rewriter.getI8Type(), maskAttr);
1266+
extraField = rewriter.create<mlir::LLVM::AndOp>(loc, extraField, mask);
1267+
}
1268+
// Extra field value is provided so just use it.
1269+
descriptor =
1270+
insertField(rewriter, loc, descriptor, {kExtraPosInBox}, extraField);
1271+
} else {
1272+
// Compute the value of the extra field based on allocator_idx and
1273+
// addendum present using a Descriptor object.
1274+
Fortran::runtime::StaticDescriptor<0> staticDescriptor;
1275+
Fortran::runtime::Descriptor &desc{staticDescriptor.descriptor()};
1276+
desc.raw().extra = 0;
1277+
desc.SetAllocIdx(allocatorIdx);
1278+
if (hasAddendum)
1279+
desc.SetHasAddendum();
1280+
descriptor =
1281+
insertField(rewriter, loc, descriptor, {kExtraPosInBox},
1282+
this->genI32Constant(loc, rewriter, desc.raw().extra));
1283+
}
12591284

12601285
if (hasAddendum) {
12611286
unsigned typeDescFieldId = getTypeDescFieldId(boxTy);
@@ -1325,6 +1350,7 @@ struct EmboxCommonConversion : public fir::FIROpConversion<OP> {
13251350
loc, rewriter, useInputType ? inputType : boxTy.getEleTy(), typeparams);
13261351

13271352
mlir::Value typeDesc;
1353+
mlir::Value extraField;
13281354
// When emboxing to a polymorphic box, get the type descriptor, type code
13291355
// and element size from the source box if any.
13301356
if (fir::isPolymorphicType(boxTy) && sourceBox) {
@@ -1336,11 +1362,13 @@ struct EmboxCommonConversion : public fir::FIROpConversion<OP> {
13361362
sourceBox, rewriter);
13371363
cfiTy = this->getValueFromBox(loc, sourceBoxTyPair, sourceBox,
13381364
cfiTy.getType(), rewriter, kTypePosInBox);
1365+
extraField =
1366+
this->getExtraFromBox(loc, sourceBoxTyPair, sourceBox, rewriter);
13391367
}
13401368
auto mod = box->template getParentOfType<mlir::ModuleOp>();
13411369
mlir::Value descriptor =
13421370
populateDescriptor(loc, mod, boxTy, inputType, rewriter, rank, eleSize,
1343-
cfiTy, typeDesc, allocatorIdx);
1371+
cfiTy, typeDesc, allocatorIdx, extraField);
13441372

13451373
return {boxTy, descriptor, eleSize};
13461374
}
@@ -1380,10 +1408,14 @@ struct EmboxCommonConversion : public fir::FIROpConversion<OP> {
13801408
rewriter);
13811409
}
13821410

1411+
mlir::Value extraField =
1412+
this->getExtraFromBox(loc, inputBoxTyPair, loweredBox, rewriter);
1413+
13831414
auto mod = box->template getParentOfType<mlir::ModuleOp>();
13841415
mlir::Value descriptor =
13851416
populateDescriptor(loc, mod, boxTy, box.getBox().getType(), rewriter,
1386-
rank, eleSize, cfiTy, typeDesc);
1417+
rank, eleSize, cfiTy, typeDesc,
1418+
/*allocatorIdx=*/kDefaultAllocator, extraField);
13871419

13881420
return {boxTy, descriptor, eleSize};
13891421
}

‎flang/lib/Optimizer/CodeGen/FIROpPatterns.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,14 @@ mlir::Value ConvertFIRToLLVMPattern::getRankFromBox(
195195
return getValueFromBox(loc, boxTy, box, resultTy, rewriter, kRankPosInBox);
196196
}
197197

198+
/// Read the extra field from a fir.box.
199+
mlir::Value ConvertFIRToLLVMPattern::getExtraFromBox(
200+
mlir::Location loc, TypePair boxTy, mlir::Value box,
201+
mlir::ConversionPatternRewriter &rewriter) const {
202+
mlir::Type resultTy = getBoxEleTy(boxTy.llvm, {kExtraPosInBox});
203+
return getValueFromBox(loc, boxTy, box, resultTy, rewriter, kExtraPosInBox);
204+
}
205+
198206
// Get the element type given an LLVM type that is of the form
199207
// (array|struct|vector)+ and the provided indexes.
200208
mlir::Type ConvertFIRToLLVMPattern::getBoxEleTy(

‎flang/test/Fir/convert-to-llvm.fir

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,6 +2368,8 @@ func.func @test_rebox_1(%arg0: !fir.box<!fir.array<?x?xf32>>) {
23682368
//CHECK: %[[NULL:.*]] = llvm.mlir.zero : !llvm.ptr
23692369
//CHECK: %[[GEP:.*]] = llvm.getelementptr %[[NULL]][1]
23702370
//CHECK: %[[ELEM_SIZE_I64:.*]] = llvm.ptrtoint %[[GEP]] : !llvm.ptr to i64
2371+
//CHECK: %[[EXTRA_GEP:.*]] = llvm.getelementptr %[[ARG0]][0, 6] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<2 x array<3 x i64>>)>
2372+
//CHECK: %[[EXTRA:.*]] = llvm.load %[[EXTRA_GEP]] : !llvm.ptr -> i8
23712373
//CHECK: %[[RBOX:.*]] = llvm.mlir.undef : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
23722374
//CHECK: %[[RBOX_TMP1:.*]] = llvm.insertvalue %[[ELEM_SIZE_I64]], %[[RBOX]][1] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
23732375
//CHECK: %[[CFI_VERSION:.*]] = llvm.mlir.constant(20240719 : i32) : i32
@@ -2380,9 +2382,9 @@ func.func @test_rebox_1(%arg0: !fir.box<!fir.array<?x?xf32>>) {
23802382
//CHECK: %[[OTHER_ATTR:.*]] = llvm.mlir.constant(0 : i32) : i32
23812383
//CHECK: %[[OTHER_ATTR_I8:.*]] = llvm.trunc %[[OTHER_ATTR]] : i32 to i8
23822384
//CHECK: %[[RBOX_TMP5:.*]] = llvm.insertvalue %[[OTHER_ATTR_I8]], %[[RBOX_TMP4]][5] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
2383-
//CHECK: %[[ADDENDUM:.*]] = llvm.mlir.constant(0 : i32) : i32
2384-
//CHECK: %[[ADDENDUM_I8:.*]] = llvm.trunc %[[ADDENDUM]] : i32 to i8
2385-
//CHECK: %[[RBOX_TMP6:.*]] = llvm.insertvalue %[[ADDENDUM_I8]], %[[RBOX_TMP5]][6] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
2385+
//CHECK: %[[MASK:.*]] = llvm.mlir.constant(254 : ui8) : i8
2386+
//CHECK: %[[EXTRA_WITH_ADDENDUM_CORRECTION:.*]] = llvm.and %[[EXTRA]], %[[MASK]] : i8
2387+
//CHECK: %[[RBOX_TMP6:.*]] = llvm.insertvalue %[[EXTRA_WITH_ADDENDUM_CORRECTION]], %[[RBOX_TMP5]][6] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
23862388
//CHECK: %[[DIM1_STRIDE_REF:.*]] = llvm.getelementptr %[[ARG0]][0, 7, 0, 2] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<2 x array<3 x i64>>)>
23872389
//CHECK: %[[DIM1_STRIDE:.*]] = llvm.load %[[DIM1_STRIDE_REF]] : !llvm.ptr -> i64
23882390
//CHECK: %[[DIM2_STRIDE_REF:.*]] = llvm.getelementptr %[[ARG0]][0, 7, 1, 2] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<2 x array<3 x i64>>)>
@@ -2442,6 +2444,8 @@ func.func @foo(%arg0: !fir.box<!fir.array<?x!fir.type<t{i:i32,c:!fir.char<1,10>}
24422444
//CHECK: %[[GEP:.*]] = llvm.getelementptr %[[NULL]][1]
24432445
//CHECK: %[[CHAR_SIZE:.*]] = llvm.ptrtoint %[[GEP]] : !llvm.ptr to i64
24442446
//CHECK: %[[ELEM_SIZE:.*]] = llvm.mul %[[CHAR_SIZE]], %[[ELEM_COUNT]]
2447+
//CHECK: %[[EXTRA_GEP:.*]] = llvm.getelementptr %[[ARG0]][0, 6] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>, ptr, array<1 x i64>)>
2448+
//CHECK: %[[EXTRA:.*]] = llvm.load %[[EXTRA_GEP]] : !llvm.ptr -> i8
24452449
//CHECK: %[[RBOX_TMP1:.*]] = llvm.insertvalue %[[ELEM_SIZE]], %{{.*}}[1] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
24462450
//CHECK: %[[RBOX_TMP2:.*]] = llvm.insertvalue %{{.*}}, %[[RBOX_TMP1]][2] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
24472451
//CHECK: %[[RANK:.*]] = llvm.mlir.constant(1 : i32) : i32
@@ -2450,9 +2454,9 @@ func.func @foo(%arg0: !fir.box<!fir.array<?x!fir.type<t{i:i32,c:!fir.char<1,10>}
24502454
//CHECK: %[[TYPE_CHAR_I8:.*]] = llvm.trunc %[[TYPE_CHAR]] : i32 to i8
24512455
//CHECK: %[[RBOX_TMP4:.*]] = llvm.insertvalue %[[TYPE_CHAR_I8]], %[[RBOX_TMP3]][4] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
24522456
//CHECK: %[[RBOX_TMP5:.*]] = llvm.insertvalue %{{.*}}, %[[RBOX_TMP4]][5] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
2453-
//CHECK: %[[ADDENDUM:.*]] = llvm.mlir.constant(0 : i32) : i32
2454-
//CHECK: %[[ADDENDUM_I8:.*]] = llvm.trunc %[[ADDENDUM]] : i32 to i8
2455-
//CHECK: %[[RBOX_TMP6:.*]] = llvm.insertvalue %[[ADDENDUM_I8]], %[[RBOX_TMP5]][6] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
2457+
//CHECK: %[[MASK:.*]] = llvm.mlir.constant(254 : ui8) : i8
2458+
//CHECK: %[[EXTRA_WITH_ADDENDUM_CORRECTION:.*]] = llvm.and %[[EXTRA]], %[[MASK]] : i8
2459+
//CHECK: %[[RBOX_TMP6:.*]] = llvm.insertvalue %[[EXTRA_WITH_ADDENDUM_CORRECTION]], %[[RBOX_TMP5]][6] : !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>
24562460
//CHECK: %[[SRC_STRIDE_PTR:.*]] = llvm.getelementptr %[[ARG0]][0, 7, 0, 2] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>, ptr, array<1 x i64>)>
24572461
//CHECK: %[[SRC_STRIDE:.*]] = llvm.load %[[SRC_STRIDE_PTR]] : !llvm.ptr -> i64
24582462
//CHECK: %[[SRC_ARRAY_PTR:.*]] = llvm.getelementptr %[[ARG0]][0, 0] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>, ptr, array<1 x i64>)>

‎flang/test/Fir/rebox.fir

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ func.func @test_rebox_1(%arg0: !fir.box<!fir.array<?x?xf32>>) {
2222
%0 = fir.slice %c5, %undef, %undef, %c6, %c80, %c3 : (index, index, index, index, index, index) -> !fir.slice<2>
2323
%1 = fir.shift %c3, %c4 : (index, index) -> !fir.shift<2>
2424

25+
// CHECK: %[[EXTRA_GEP:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [2 x [3 x i64]] }, ptr %[[INBOX]], i32 0, i32 6
26+
// CHECK: %[[EXTRA:.*]] = load i8, ptr %[[EXTRA_GEP]]
27+
// CHECK: %[[EXTRA_WITH_ADDENDUM_CORRECTION:.*]] = and i8 %[[EXTRA]]
28+
// CHECK: %[[OUTBOX0:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { ptr undef, i64 ptrtoint (ptr getelementptr (float, ptr null, i32 1) to i64), i32 20240719, i8 1, i8 27, i8 0, i8 undef, [1 x [3 x i64]] undef }, i8 %[[EXTRA_WITH_ADDENDUM_CORRECTION]], 6
2529
// CHECK: %[[INSTRIDE_0_GEP:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [2 x [3 x i64]] }, ptr %[[INBOX]], i32 0, i32 7, i32 0, i32 2
26-
// CHECK: %[[INSTRIDE_0:.]] = load i64, ptr %[[INSTRIDE_0_GEP]]
30+
// CHECK: %[[INSTRIDE_0:.*]] = load i64, ptr %[[INSTRIDE_0_GEP]]
2731
// CHECK: %[[INSTRIDE_1_GEP:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [2 x [3 x i64]] }, ptr %[[INBOX]], i32 0, i32 7, i32 1, i32 2
2832
// CHECK: %[[INSTRIDE_1:.*]] = load i64, ptr %[[INSTRIDE_1_GEP]]
2933
// CHECK: %[[INBASE_GEP:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [2 x [3 x i64]] }, ptr %[[INBOX]], i32 0, i32 0
@@ -33,9 +37,9 @@ func.func @test_rebox_1(%arg0: !fir.box<!fir.array<?x?xf32>>) {
3337
// CHECK: %[[OFFSET_1:.*]] = mul i64 2, %[[INSTRIDE_1]]
3438
// CHECK: %[[VOIDBASE1:.*]] = getelementptr i8, ptr %[[VOIDBASE0]], i64 %[[OFFSET_1]]
3539
// CHECK: %[[OUTSTRIDE0:.*]] = mul i64 3, %[[INSTRIDE_1]]
36-
// CHECK: %[[OUTBOX0:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { ptr undef, i64 ptrtoint (ptr getelementptr (float, ptr null, i32 1) to i64), i32 {{.*}}, i8 1, i8 27, i8 0, i8 0, [1 x [3 x i64]] [{{.*}} [i64 1, i64 25, i64 undef]] }, i64 %[[OUTSTRIDE0]], 7, 0, 2
37-
// CHECK: %[[OUTBOX1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[OUTBOX0]], ptr %[[VOIDBASE1]], 0
38-
// CHECK: store { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[OUTBOX1]], ptr %[[OUTBOX_ALLOC]], align 8
40+
// CHECK: %[[OUTBOX1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %{{.*}}, i64 %[[OUTSTRIDE0]], 7, 0, 2
41+
// CHECK: %[[OUTBOX2:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[OUTBOX1]], ptr %[[VOIDBASE1]], 0
42+
// CHECK: store { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[OUTBOX2]], ptr %[[OUTBOX_ALLOC]], align 8
3943
%2 = fir.rebox %arg0(%1) [%0] : (!fir.box<!fir.array<?x?xf32>>, !fir.shift<2>, !fir.slice<2>) -> !fir.box<!fir.array<?xf32>>
4044
// CHECK: call void @bar1(ptr %[[OUTBOX_ALLOC]])
4145
fir.call @bar1(%2) : (!fir.box<!fir.array<?xf32>>) -> ()
@@ -92,7 +96,7 @@ func.func @test_rebox_3(%arg0: !fir.box<!fir.array<?xf32>>) {
9296
// CHECK: %[[INBASE:.*]] = load ptr, ptr %[[INBASE_GEP]]
9397
// CHECK: %[[OUTSTRIDE1:.*]] = mul i64 3, %[[INSTRIDE]]
9498
// CHECK: %[[OUTSTRIDE2:.*]] = mul i64 4, %[[OUTSTRIDE1]]
95-
// CHECK: %[[OUTBOX0:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [3 x [3 x i64]] } { ptr undef, i64 ptrtoint (ptr getelementptr (float, ptr null, i32 1) to i64), i32 {{.*}}, i8 3, i8 27, i8 0, i8 0, [3 x [3 x i64]] [{{.*}} [i64 2, i64 3, i64 undef], [3 x i64] undef, [3 x i64] undef] }, i64 %[[INSTRIDE]], 7, 0, 2
99+
// CHECK: %[[OUTBOX0:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [3 x [3 x i64]] } %{{.*}}, i64 %[[INSTRIDE]], 7, 0, 2
96100
// CHECK: %[[OUTBOX1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [3 x [3 x i64]] } %[[OUTBOX0]], i64 3, 7, 1, 0
97101
// CHECK: %[[OUTBOX2:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [3 x [3 x i64]] } %[[OUTBOX1]], i64 4, 7, 1, 1
98102
// CHECK: %[[OUTBOX3:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [3 x [3 x i64]] } %[[OUTBOX2]], i64 %[[OUTSTRIDE1]], 7, 1, 2
@@ -121,7 +125,7 @@ func.func @test_rebox_4(%arg0: !fir.box<!fir.array<?x!fir.char<1,?>>>) {
121125
// CHECK: %[[STRIDE:.*]] = load i64, ptr %[[STRIDE_GEP]]
122126
// CHECK: %[[BASE_GEP:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, ptr %[[INPUT]], i32 0, i32 0
123127
// CHECK: %[[BASE:.*]] = load ptr, ptr %[[BASE_GEP]]
124-
// CHECK: %[[NEWBOX1:.*]] = insertvalue {{{.*}}} { ptr undef, i64 ptrtoint (ptr getelementptr ([10 x i8], ptr null, i32 1) to i64), i32 20240719, i8 1, i8 40, i8 1, i8 0, [1 x [3 x i64]] [{{.*}} [i64 1, i64 undef, i64 undef]] }, i64 %[[EXTENT]], 7, 0, 1
128+
// CHECK: %[[NEWBOX1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %{{.*}}, i64 %[[EXTENT]], 7, 0, 1
125129
// CHECK: %[[NEWBOX2:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[NEWBOX1]], i64 %[[STRIDE]], 7, 0, 2
126130
// CHECK: %[[NEWBOX3:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[NEWBOX2]], ptr %[[BASE]], 0
127131
// CHECK: store { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[NEWBOX3]], ptr %[[NEWBOX_STORAGE]]
@@ -164,7 +168,7 @@ func.func @test_cmplx_1(%arg0: !fir.box<!fir.array<?x!fir.complex<4>>>) {
164168
// CHECK: %[[CHECK_NONZERO:.*]] = icmp sgt i64 %[[DIV_1]], 0
165169
// CHECK: %[[CHECKED_BOUND:.*]] = select i1 %[[CHECK_NONZERO]], i64 %[[DIV_1]], i64 0
166170
// CHECK: %[[STRIDE:.*]] = mul i64 1, %[[INSTRIDE_1]]
167-
// CHECK: %[[VAL_BUILD_1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { ptr undef, i64 ptrtoint (ptr getelementptr (float, ptr null, i32 1) to i64), i32 {{.*}}, i8 1, i8 27, i8 0, i8 0, [1 x [3 x i64]] [{{\[}}3 x i64] [i64 1, i64 undef, i64 undef]] }, i64 %[[CHECKED_BOUND]], 7, 0, 1
171+
// CHECK: %[[VAL_BUILD_1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %{{.*}}, i64 %[[CHECKED_BOUND]], 7, 0, 1
168172
// CHECK: %[[VAL_BUILD_2:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[VAL_BUILD_1]], i64 %[[STRIDE]], 7, 0, 2
169173
// CHECK: %[[VAL_BUILD_3:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[VAL_BUILD_2]], ptr %[[OFFSET_GEP]], 0
170174
// CHECK: store { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[VAL_BUILD_3]], ptr %[[OUTBOX_ALLOC]]
@@ -198,7 +202,7 @@ func.func @test_cmplx_2(%arg0: !fir.box<!fir.array<?x!fir.complex<4>>>) {
198202
// CHECK: %[[FRONT_OFFSET:.*]] = mul i64 6, %[[INSTRIDE_0]]
199203
// CHECK: %[[OFFSET_GEP:.*]] = getelementptr i8, ptr %[[FIELD_OFFSET_GEP]], i64 %[[FRONT_OFFSET]]
200204
// CHECK: %[[STRIDE:.*]] = mul i64 5, %[[INSTRIDE_0]]
201-
// CHECK: %[[VAL_BUILD_1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { ptr undef, i64 ptrtoint (ptr getelementptr (float, ptr null, i32 1) to i64), i32 {{.*}}, i8 1, i8 27, i8 0, i8 0, [1 x [3 x i64]] [{{\[}}3 x i64] [i64 1, i64 11, i64 undef]] }, i64 %[[STRIDE]], 7, 0, 2
205+
// CHECK: %[[VAL_BUILD_1:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %{{.*}}, i64 %[[STRIDE]], 7, 0, 2
202206
// CHECK: %[[VAL_BUILD_2:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[VAL_BUILD_1]], ptr %[[OFFSET_GEP]], 0
203207
// CHECK: store { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[VAL_BUILD_2]], ptr %[[OUTBOX_ALLOC]]
204208
fir.call @bar1(%2) fastmath<contract> : (!fir.box<!fir.array<?xf32>>) -> ()

‎flang/test/Fir/tbaa-codegen2.fir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ module attributes {fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", llvm.targ
7474
// CHECK: %[[VAL11:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, ptr %[[ARG0]], i32 0, i32 0
7575
// box access:
7676
// CHECK: %[[VAL12:.*]] = load ptr, ptr %[[VAL11]], align 8, !tbaa ![[BOX_ACCESS_TAG]]
77-
// CHECK: %[[VAL15:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %14, ptr %[[VAL12]], 0
77+
// CHECK: %[[VAL15:.*]] = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %{{.*}}, ptr %[[VAL12]], 0
7878
// CHECK: store { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } %[[VAL15]], ptr %{{.*}}, align 8, !tbaa ![[BOX_ACCESS_TAG]]
7979
// CHECK: %[[VAL16:.*]] = getelementptr { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, ptr %{{.*}}, i32 0, i32 7, i64 0, i32 0
8080
// box access:

0 commit comments

Comments
 (0)