Skip to content

Commit e6a4346

Browse files
rscottmanleyScott Manley
rscottmanley
and
Scott Manley
authored
[flang] add getElementType() to fir::SquenceType and fir::VectorType (#112770)
getElementType() was missing from Sequence and Vector types. Did a replace of the obvious places getEleTy() was used for these two types and updated to use this name instead. Co-authored-by: Scott Manley <[email protected]>
1 parent ba1ee2b commit e6a4346

File tree

12 files changed

+41
-35
lines changed

12 files changed

+41
-35
lines changed

‎flang/include/flang/Optimizer/Builder/PPCIntrinsicCall.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ struct VecTypeInfo {
182182
static inline VecTypeInfo getVecTypeFromFirType(mlir::Type firTy) {
183183
assert(mlir::isa<fir::VectorType>(firTy));
184184
VecTypeInfo vecTyInfo;
185-
vecTyInfo.eleTy = mlir::dyn_cast<fir::VectorType>(firTy).getEleTy();
185+
vecTyInfo.eleTy = mlir::dyn_cast<fir::VectorType>(firTy).getElementType();
186186
vecTyInfo.len = mlir::dyn_cast<fir::VectorType>(firTy).getLen();
187187
return vecTyInfo;
188188
}

‎flang/include/flang/Optimizer/Dialect/FIRTypes.td‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,8 @@ def fir_SequenceType : FIR_Type<"Sequence", "array"> {
465465
size = size * static_cast<std::uint64_t>(extent);
466466
return size;
467467
}
468+
469+
mlir::Type getElementType() const { return getEleTy(); }
468470
}];
469471
}
470472

@@ -519,6 +521,8 @@ def fir_VectorType : FIR_Type<"Vector", "vector"> {
519521

520522
let extraClassDeclaration = [{
521523
static bool isValidElementType(mlir::Type t);
524+
525+
mlir::Type getElementType() const { return getEleTy(); }
522526
}];
523527

524528
let skipDefaultBuilders = 1;

‎flang/lib/Lower/ConvertConstant.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,8 @@ genInlinedArrayLit(Fortran::lower::AbstractConverter &converter,
584584
} while (con.IncrementSubscripts(subscripts));
585585
} else if constexpr (T::category == Fortran::common::TypeCategory::Derived) {
586586
do {
587-
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrayTy).getEleTy();
587+
mlir::Type eleTy =
588+
mlir::cast<fir::SequenceType>(arrayTy).getElementType();
588589
mlir::Value elementVal =
589590
genScalarLit(converter, loc, con.At(subscripts), eleTy,
590591
/*outlineInReadOnlyMemory=*/false);
@@ -594,7 +595,7 @@ genInlinedArrayLit(Fortran::lower::AbstractConverter &converter,
594595
} else {
595596
llvm::SmallVector<mlir::Attribute> rangeStartIdx;
596597
uint64_t rangeSize = 0;
597-
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrayTy).getEleTy();
598+
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrayTy).getElementType();
598599
do {
599600
auto getElementVal = [&]() {
600601
return builder.createConvert(loc, eleTy,
@@ -643,7 +644,7 @@ genOutlineArrayLit(Fortran::lower::AbstractConverter &converter,
643644
mlir::Location loc, mlir::Type arrayTy,
644645
const Fortran::evaluate::Constant<T> &constant) {
645646
fir::FirOpBuilder &builder = converter.getFirOpBuilder();
646-
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrayTy).getEleTy();
647+
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrayTy).getElementType();
647648
llvm::StringRef globalName = converter.getUniqueLitName(
648649
loc, std::make_unique<Fortran::lower::SomeExpr>(toEvExpr(constant)),
649650
eleTy);

‎flang/lib/Lower/ConvertExpr.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ class ScalarExprLowering {
15741574
mlir::Location loc = getLoc();
15751575
mlir::Value addr = fir::getBase(array);
15761576
mlir::Type arrTy = fir::dyn_cast_ptrEleTy(addr.getType());
1577-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1577+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
15781578
mlir::Type seqTy = builder.getRefType(builder.getVarLenSeqTy(eleTy));
15791579
mlir::Type refTy = builder.getRefType(eleTy);
15801580
mlir::Value base = builder.createConvert(loc, seqTy, addr);
@@ -1659,7 +1659,7 @@ class ScalarExprLowering {
16591659
mlir::Location loc = getLoc();
16601660
mlir::Value addr = fir::getBase(exv);
16611661
mlir::Type arrTy = fir::dyn_cast_ptrOrBoxEleTy(addr.getType());
1662-
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1662+
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
16631663
mlir::Type refTy = builder.getRefType(eleTy);
16641664
mlir::IndexType idxTy = builder.getIndexType();
16651665
llvm::SmallVector<mlir::Value> arrayCoorArgs;
@@ -4145,7 +4145,7 @@ class ArrayExprLowering {
41454145
mlir::Location loc = getLoc();
41464146
return [=, builder = &converter.getFirOpBuilder()](IterSpace iters) {
41474147
mlir::Type arrTy = fir::dyn_cast_ptrOrBoxEleTy(tmp.getType());
4148-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
4148+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
41494149
mlir::Type eleRefTy = builder->getRefType(eleTy);
41504150
mlir::IntegerType i1Ty = builder->getI1Type();
41514151
// Adjust indices for any shift of the origin of the array.
@@ -5759,7 +5759,7 @@ class ArrayExprLowering {
57595759
return fir::BoxValue(embox, lbounds, nonDeferredLenParams);
57605760
};
57615761
}
5762-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
5762+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
57635763
if (isReferentiallyOpaque()) {
57645764
// Semantics are an opaque reference to an array.
57655765
// This case forwards a continuation that will generate the address

‎flang/lib/Lower/ConvertExprToHLFIR.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ class HlfirDesignatorBuilder {
579579
return createVectorSubscriptElementAddrOp(partInfo, baseType,
580580
resultExtents);
581581

582-
mlir::Type resultType = mlir::cast<fir::SequenceType>(baseType).getEleTy();
582+
mlir::Type resultType =
583+
mlir::cast<fir::SequenceType>(baseType).getElementType();
583584
if (!resultTypeShape.empty()) {
584585
// Ranked array section. The result shape comes from the array section
585586
// subscripts.
@@ -811,7 +812,7 @@ class HlfirDesignatorBuilder {
811812
}
812813
}
813814
builder.setInsertionPoint(elementalAddrOp);
814-
return mlir::cast<fir::SequenceType>(baseType).getEleTy();
815+
return mlir::cast<fir::SequenceType>(baseType).getElementType();
815816
}
816817

817818
/// Yield the designator for the final part-ref inside the

‎flang/lib/Lower/ConvertVariable.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ static fir::GlobalOp defineGlobal(Fortran::lower::AbstractConverter &converter,
518518
// type does not support nested structures.
519519
if (mlir::isa<fir::SequenceType>(symTy) &&
520520
!Fortran::semantics::IsAllocatableOrPointer(sym)) {
521-
mlir::Type eleTy = mlir::cast<fir::SequenceType>(symTy).getEleTy();
521+
mlir::Type eleTy = mlir::cast<fir::SequenceType>(symTy).getElementType();
522522
if (mlir::isa<mlir::IntegerType, mlir::FloatType, mlir::ComplexType,
523523
fir::LogicalType>(eleTy)) {
524524
const auto *details =

‎flang/lib/Optimizer/Builder/IntrinsicCall.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3824,7 +3824,7 @@ IntrinsicLibrary::genReduction(FN func, FD funcDim, llvm::StringRef errMsg,
38243824
if (absentDim || rank == 1) {
38253825
mlir::Type ty = array.getType();
38263826
mlir::Type arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
3827-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
3827+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
38283828
if (fir::isa_complex(eleTy)) {
38293829
mlir::Value result = builder.createTemporary(loc, eleTy);
38303830
func(builder, loc, array, mask, result);
@@ -6137,7 +6137,7 @@ IntrinsicLibrary::genReduce(mlir::Type resultType,
61376137

61386138
mlir::Type ty = array.getType();
61396139
mlir::Type arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
6140-
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
6140+
mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
61416141

61426142
// Handle optional arguments
61436143
bool absentDim = isStaticallyAbsent(args[2]);

‎flang/lib/Optimizer/Builder/PPCIntrinsicCall.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2797,7 +2797,7 @@ void PPCIntrinsicLibrary::genMmaIntr(llvm::ArrayRef<fir::ExtendedValue> args) {
27972797
if (vType != targetType) {
27982798
if (mlir::isa<mlir::VectorType>(targetType)) {
27992799
// Perform vector type conversion for arguments passed by value.
2800-
auto eleTy{mlir::dyn_cast<fir::VectorType>(vType).getEleTy()};
2800+
auto eleTy{mlir::dyn_cast<fir::VectorType>(vType).getElementType()};
28012801
auto len{mlir::dyn_cast<fir::VectorType>(vType).getLen()};
28022802
mlir::VectorType mlirType = mlir::VectorType::get(len, eleTy);
28032803
auto v0{builder.createConvert(loc, mlirType, v)};

‎flang/lib/Optimizer/Builder/Runtime/Reduction.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ void fir::runtime::genMaxloc(fir::FirOpBuilder &builder, mlir::Location loc,
11571157
mlir::Value back) {
11581158
auto ty = arrayBox.getType();
11591159
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1160-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1160+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
11611161
fir::factory::CharacterExprHelper charHelper{builder, loc};
11621162
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
11631163
mlir::func::FuncOp func;
@@ -1189,7 +1189,7 @@ mlir::Value fir::runtime::genMaxval(fir::FirOpBuilder &builder,
11891189
mlir::Value maskBox) {
11901190
auto ty = arrayBox.getType();
11911191
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1192-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1192+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
11931193
auto dim = builder.createIntegerConstant(loc, builder.getIndexType(), 0);
11941194
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
11951195
mlir::func::FuncOp func;
@@ -1241,7 +1241,7 @@ void fir::runtime::genMinloc(fir::FirOpBuilder &builder, mlir::Location loc,
12411241
mlir::Value back) {
12421242
auto ty = arrayBox.getType();
12431243
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1244-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1244+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
12451245
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
12461246
mlir::func::FuncOp func;
12471247
REAL_INTRINSIC_INSTANCES(Minloc, )
@@ -1298,7 +1298,7 @@ mlir::Value fir::runtime::genMinval(fir::FirOpBuilder &builder,
12981298
mlir::Value maskBox) {
12991299
auto ty = arrayBox.getType();
13001300
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1301-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1301+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
13021302
auto dim = builder.createIntegerConstant(loc, builder.getIndexType(), 0);
13031303
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
13041304

@@ -1326,7 +1326,7 @@ void fir::runtime::genNorm2Dim(fir::FirOpBuilder &builder, mlir::Location loc,
13261326
mlir::func::FuncOp func;
13271327
auto ty = arrayBox.getType();
13281328
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1329-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1329+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
13301330
if (eleTy.isF128())
13311331
func = fir::runtime::getRuntimeFunc<ForcedNorm2DimReal16>(loc, builder);
13321332
else
@@ -1348,7 +1348,7 @@ mlir::Value fir::runtime::genNorm2(fir::FirOpBuilder &builder,
13481348
mlir::func::FuncOp func;
13491349
auto ty = arrayBox.getType();
13501350
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1351-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1351+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
13521352
auto dim = builder.createIntegerConstant(loc, builder.getIndexType(), 0);
13531353

13541354
if (eleTy.isF32())
@@ -1398,7 +1398,7 @@ mlir::Value fir::runtime::genProduct(fir::FirOpBuilder &builder,
13981398
mlir::Value resultBox) {
13991399
auto ty = arrayBox.getType();
14001400
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1401-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1401+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
14021402
auto dim = builder.createIntegerConstant(loc, builder.getIndexType(), 0);
14031403

14041404
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
@@ -1482,7 +1482,7 @@ mlir::Value fir::runtime::genSum(fir::FirOpBuilder &builder, mlir::Location loc,
14821482
mlir::Value resultBox) {
14831483
auto ty = arrayBox.getType();
14841484
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1485-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1485+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
14861486
auto dim = builder.createIntegerConstant(loc, builder.getIndexType(), 0);
14871487

14881488
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
@@ -1521,7 +1521,7 @@ mlir::Value fir::runtime::genSum(fir::FirOpBuilder &builder, mlir::Location loc,
15211521
mlir::func::FuncOp func; \
15221522
auto ty = arrayBox.getType(); \
15231523
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty); \
1524-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy(); \
1524+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType(); \
15251525
auto dim = builder.createIntegerConstant(loc, builder.getIndexType(), 0); \
15261526
\
15271527
if (eleTy.isInteger(builder.getKindMap().getIntegerBitsize(1))) \
@@ -1596,7 +1596,7 @@ void fir::runtime::genReduce(fir::FirOpBuilder &builder, mlir::Location loc,
15961596
bool argByRef) {
15971597
auto ty = arrayBox.getType();
15981598
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1599-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1599+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
16001600
auto dim = builder.createIntegerConstant(loc, builder.getI32Type(), 1);
16011601

16021602
assert(resultBox && "expect non null value for the result");
@@ -1646,7 +1646,7 @@ mlir::Value fir::runtime::genReduce(fir::FirOpBuilder &builder,
16461646
bool argByRef) {
16471647
auto ty = arrayBox.getType();
16481648
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1649-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1649+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
16501650
auto dim = builder.createIntegerConstant(loc, builder.getI32Type(), 1);
16511651

16521652
assert((fir::isa_real(eleTy) || fir::isa_integer(eleTy) ||
@@ -1687,7 +1687,7 @@ void fir::runtime::genReduceDim(fir::FirOpBuilder &builder, mlir::Location loc,
16871687
mlir::Value resultBox, bool argByRef) {
16881688
auto ty = arrayBox.getType();
16891689
auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
1690-
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
1690+
auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getElementType();
16911691
auto [cat, kind] = fir::mlirTypeToCategoryKind(loc, eleTy);
16921692

16931693
mlir::func::FuncOp func;

‎flang/lib/Optimizer/Builder/Runtime/Transformational.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,11 @@ void fir::runtime::genMatmul(fir::FirOpBuilder &builder, mlir::Location loc,
365365
mlir::func::FuncOp func;
366366
auto boxATy = matrixABox.getType();
367367
auto arrATy = fir::dyn_cast_ptrOrBoxEleTy(boxATy);
368-
auto arrAEleTy = mlir::cast<fir::SequenceType>(arrATy).getEleTy();
368+
auto arrAEleTy = mlir::cast<fir::SequenceType>(arrATy).getElementType();
369369
auto [aCat, aKind] = fir::mlirTypeToCategoryKind(loc, arrAEleTy);
370370
auto boxBTy = matrixBBox.getType();
371371
auto arrBTy = fir::dyn_cast_ptrOrBoxEleTy(boxBTy);
372-
auto arrBEleTy = mlir::cast<fir::SequenceType>(arrBTy).getEleTy();
372+
auto arrBEleTy = mlir::cast<fir::SequenceType>(arrBTy).getElementType();
373373
auto [bCat, bKind] = fir::mlirTypeToCategoryKind(loc, arrBEleTy);
374374

375375
#define MATMUL_INSTANCE(ACAT, AKIND, BCAT, BKIND) \
@@ -417,11 +417,11 @@ void fir::runtime::genMatmulTranspose(fir::FirOpBuilder &builder,
417417
mlir::func::FuncOp func;
418418
auto boxATy = matrixABox.getType();
419419
auto arrATy = fir::dyn_cast_ptrOrBoxEleTy(boxATy);
420-
auto arrAEleTy = mlir::cast<fir::SequenceType>(arrATy).getEleTy();
420+
auto arrAEleTy = mlir::cast<fir::SequenceType>(arrATy).getElementType();
421421
auto [aCat, aKind] = fir::mlirTypeToCategoryKind(loc, arrAEleTy);
422422
auto boxBTy = matrixBBox.getType();
423423
auto arrBTy = fir::dyn_cast_ptrOrBoxEleTy(boxBTy);
424-
auto arrBEleTy = mlir::cast<fir::SequenceType>(arrBTy).getEleTy();
424+
auto arrBEleTy = mlir::cast<fir::SequenceType>(arrBTy).getElementType();
425425
auto [bCat, bKind] = fir::mlirTypeToCategoryKind(loc, arrBEleTy);
426426

427427
#define MATMUL_INSTANCE(ACAT, AKIND, BCAT, BKIND) \

0 commit comments

Comments
 (0)