Skip to content

Commit e825bc0

Browse files
momchil-velikovmomchil-velikov
committed
[AArch64] Refactor implementation of FP8 types (NFC)
* The FP8 scalar type (`__mfp8`) was described as a vector type * The FP8 vector types were described/assumed to have integer element type (the element type ought to be `__mfp8`), * Add support for `m` type specifier (denoting `__mfp8`) in `DecodeTypeFromStr` and create SVE builtin prototypes using the specifier, instead of `int8_t`. [fixup] Add a comment about special case of mapping FP8 vectors to LLVM vector types
1 parent d8ad1ee commit e825bc0

File tree

7 files changed

+58
-46
lines changed

7 files changed

+58
-46
lines changed

‎clang/include/clang/Basic/AArch64SVEACLETypes.def

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
// - IsBF true for vector of brain float elements.
5858
//===----------------------------------------------------------------------===//
5959

60+
#ifndef SVE_SCALAR_TYPE
61+
#define SVE_SCALAR_TYPE(Name, MangledName, Id, SingletonId, Bits) \
62+
SVE_TYPE(Name, Id, SingletonId)
63+
#endif
64+
6065
#ifndef SVE_VECTOR_TYPE
6166
#define SVE_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
6267
SVE_TYPE(Name, Id, SingletonId)
@@ -72,6 +77,11 @@
7277
SVE_VECTOR_TYPE_DETAILS(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF, false, false, true)
7378
#endif
7479

80+
#ifndef SVE_VECTOR_TYPE_MFLOAT
81+
#define SVE_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF) \
82+
SVE_VECTOR_TYPE_DETAILS(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF, false, false, false)
83+
#endif
84+
7585
#ifndef SVE_VECTOR_TYPE_FLOAT
7686
#define SVE_VECTOR_TYPE_FLOAT(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF) \
7787
SVE_VECTOR_TYPE_DETAILS(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF, false, true, false)
@@ -97,16 +107,6 @@
97107
SVE_TYPE(Name, Id, SingletonId)
98108
#endif
99109

100-
#ifndef AARCH64_VECTOR_TYPE
101-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
102-
SVE_TYPE(Name, Id, SingletonId)
103-
#endif
104-
105-
#ifndef AARCH64_VECTOR_TYPE_MFLOAT
106-
#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF) \
107-
AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
108-
#endif
109-
110110
//===- Vector point types -----------------------------------------------===//
111111

112112
SVE_VECTOR_TYPE_INT("__SVInt8_t", "__SVInt8_t", SveInt8, SveInt8Ty, 16, 8, 1, true)
@@ -125,8 +125,7 @@ SVE_VECTOR_TYPE_FLOAT("__SVFloat64_t", "__SVFloat64_t", SveFloat64, SveFloat64Ty
125125

126126
SVE_VECTOR_TYPE_BFLOAT("__SVBfloat16_t", "__SVBfloat16_t", SveBFloat16, SveBFloat16Ty, 8, 16, 1)
127127

128-
// This is a 8 bits opaque type.
129-
SVE_VECTOR_TYPE_INT("__SVMfloat8_t", "__SVMfloat8_t", SveMFloat8, SveMFloat8Ty, 16, 8, 1, false)
128+
SVE_VECTOR_TYPE_MFLOAT("__SVMfloat8_t", "__SVMfloat8_t", SveMFloat8, SveMFloat8Ty, 16, 8, 1)
130129

131130
//
132131
// x2
@@ -148,7 +147,7 @@ SVE_VECTOR_TYPE_FLOAT("__clang_svfloat64x2_t", "svfloat64x2_t", SveFloat64x2, Sv
148147

149148
SVE_VECTOR_TYPE_BFLOAT("__clang_svbfloat16x2_t", "svbfloat16x2_t", SveBFloat16x2, SveBFloat16x2Ty, 8, 16, 2)
150149

151-
SVE_VECTOR_TYPE_INT("__clang_svmfloat8x2_t", "svmfloat8x2_t", SveMFloat8x2, SveMFloat8x2Ty, 16, 8, 2, false)
150+
SVE_VECTOR_TYPE_MFLOAT("__clang_svmfloat8x2_t", "svmfloat8x2_t", SveMFloat8x2, SveMFloat8x2Ty, 16, 8, 2)
152151

153152
//
154153
// x3
@@ -170,7 +169,7 @@ SVE_VECTOR_TYPE_FLOAT("__clang_svfloat64x3_t", "svfloat64x3_t", SveFloat64x3, Sv
170169

171170
SVE_VECTOR_TYPE_BFLOAT("__clang_svbfloat16x3_t", "svbfloat16x3_t", SveBFloat16x3, SveBFloat16x3Ty, 8, 16, 3)
172171

173-
SVE_VECTOR_TYPE_INT("__clang_svmfloat8x3_t", "svmfloat8x3_t", SveMFloat8x3, SveMFloat8x3Ty, 16, 8, 3, false)
172+
SVE_VECTOR_TYPE_MFLOAT("__clang_svmfloat8x3_t", "svmfloat8x3_t", SveMFloat8x3, SveMFloat8x3Ty, 16, 8, 3)
174173

175174
//
176175
// x4
@@ -192,23 +191,23 @@ SVE_VECTOR_TYPE_FLOAT("__clang_svfloat64x4_t", "svfloat64x4_t", SveFloat64x4, Sv
192191

193192
SVE_VECTOR_TYPE_BFLOAT("__clang_svbfloat16x4_t", "svbfloat16x4_t", SveBFloat16x4, SveBFloat16x4Ty, 8, 16, 4)
194193

195-
SVE_VECTOR_TYPE_INT("__clang_svmfloat8x4_t", "svmfloat8x4_t", SveMFloat8x4, SveMFloat8x4Ty, 16, 8, 4, false)
194+
SVE_VECTOR_TYPE_MFLOAT("__clang_svmfloat8x4_t", "svmfloat8x4_t", SveMFloat8x4, SveMFloat8x4Ty, 16, 8, 4)
196195

197196
SVE_PREDICATE_TYPE_ALL("__SVBool_t", "__SVBool_t", SveBool, SveBoolTy, 16, 1)
198197
SVE_PREDICATE_TYPE_ALL("__clang_svboolx2_t", "svboolx2_t", SveBoolx2, SveBoolx2Ty, 16, 2)
199198
SVE_PREDICATE_TYPE_ALL("__clang_svboolx4_t", "svboolx4_t", SveBoolx4, SveBoolx4Ty, 16, 4)
200199

201200
SVE_OPAQUE_TYPE("__SVCount_t", "__SVCount_t", SveCount, SveCountTy)
202201

203-
AARCH64_VECTOR_TYPE_MFLOAT("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 1, 8, 1)
202+
SVE_SCALAR_TYPE("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 8)
204203

205204
#undef SVE_VECTOR_TYPE
205+
#undef SVE_VECTOR_TYPE_MFLOAT
206206
#undef SVE_VECTOR_TYPE_BFLOAT
207207
#undef SVE_VECTOR_TYPE_FLOAT
208208
#undef SVE_VECTOR_TYPE_INT
209209
#undef SVE_PREDICATE_TYPE
210210
#undef SVE_PREDICATE_TYPE_ALL
211211
#undef SVE_OPAQUE_TYPE
212-
#undef AARCH64_VECTOR_TYPE_MFLOAT
213-
#undef AARCH64_VECTOR_TYPE
212+
#undef SVE_SCALAR_TYPE
214213
#undef SVE_TYPE

‎clang/lib/AST/ASTContext.cpp

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,11 +2269,10 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const {
22692269
Width = 0; \
22702270
Align = 16; \
22712271
break;
2272-
#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
2273-
ElBits, NF) \
2272+
#define SVE_SCALAR_TYPE(Name, MangledName, Id, SingletonId, Bits) \
22742273
case BuiltinType::Id: \
2275-
Width = NumEls * ElBits * NF; \
2276-
Align = NumEls * ElBits; \
2274+
Width = Bits; \
2275+
Align = Bits; \
22772276
break;
22782277
#include "clang/Basic/AArch64SVEACLETypes.def"
22792278
#define PPC_VECTOR_TYPE(Name, Id, Size) \
@@ -4423,15 +4422,14 @@ ASTContext::getBuiltinVectorTypeInfo(const BuiltinType *Ty) const {
44234422
ElBits, NF) \
44244423
case BuiltinType::Id: \
44254424
return {BFloat16Ty, llvm::ElementCount::getScalable(NumEls), NF};
4425+
#define SVE_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
4426+
ElBits, NF) \
4427+
case BuiltinType::Id: \
4428+
return {MFloat8Ty, llvm::ElementCount::getScalable(NumEls), NF};
44264429
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF) \
44274430
case BuiltinType::Id: \
44284431
return {BoolTy, llvm::ElementCount::getScalable(NumEls), NF};
4429-
#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
4430-
ElBits, NF) \
4431-
case BuiltinType::Id: \
4432-
return {getIntTypeForBitwidth(ElBits, false), \
4433-
llvm::ElementCount::getFixed(NumEls), NF};
4434-
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
4432+
#define SVE_TYPE(Name, Id, SingletonId)
44354433
#include "clang/Basic/AArch64SVEACLETypes.def"
44364434

44374435
#define RVV_VECTOR_TYPE_INT(Name, Id, SingletonId, NumEls, ElBits, NF, \
@@ -4493,11 +4491,16 @@ QualType ASTContext::getScalableVectorType(QualType EltTy, unsigned NumElts,
44934491
EltTySize == ElBits && NumElts == (NumEls * NF) && NumFields == 1) { \
44944492
return SingletonId; \
44954493
}
4494+
#define SVE_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
4495+
ElBits, NF) \
4496+
if (EltTy->isMFloat8Type() && EltTySize == ElBits && \
4497+
NumElts == (NumEls * NF) && NumFields == 1) { \
4498+
return SingletonId; \
4499+
}
44964500
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF) \
44974501
if (EltTy->isBooleanType() && NumElts == (NumEls * NF) && NumFields == 1) \
44984502
return SingletonId;
4499-
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
4500-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
4503+
#define SVE_TYPE(Name, Id, SingletonId)
45014504
#include "clang/Basic/AArch64SVEACLETypes.def"
45024505
} else if (Target->hasRISCVVTypes()) {
45034506
uint64_t EltTySize = getTypeSize(EltTy);
@@ -12382,6 +12385,9 @@ static QualType DecodeTypeFromStr(const char *&Str, const ASTContext &Context,
1238212385
case 'p':
1238312386
Type = Context.getProcessIDType();
1238412387
break;
12388+
case 'm':
12389+
Type = Context.MFloat8Ty;
12390+
break;
1238512391
}
1238612392

1238712393
// If there are modifiers and if we're allowed to parse them, go for it.

‎clang/lib/AST/ItaniumMangle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3433,7 +3433,7 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
34333433
type_name = MangledName; \
34343434
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name; \
34353435
break;
3436-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
3436+
#define SVE_SCALAR_TYPE(Name, MangledName, Id, SingletonId, Bits) \
34373437
case BuiltinType::Id: \
34383438
type_name = MangledName; \
34393439
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name; \

‎clang/lib/AST/Type.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2527,9 +2527,7 @@ bool Type::isSVESizelessBuiltinType() const {
25272527
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId) \
25282528
case BuiltinType::Id: \
25292529
return true;
2530-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
2531-
case BuiltinType::Id: \
2532-
return false;
2530+
#define SVE_TYPE(Name, Id, SingletonId)
25332531
#include "clang/Basic/AArch64SVEACLETypes.def"
25342532
default:
25352533
return false;

‎clang/lib/CodeGen/CodeGenTypes.cpp

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -505,15 +505,18 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
505505
case BuiltinType::Id:
506506
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId) \
507507
case BuiltinType::Id:
508-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
509-
case BuiltinType::Id:
510-
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
508+
#define SVE_TYPE(Name, Id, SingletonId)
511509
#include "clang/Basic/AArch64SVEACLETypes.def"
512510
{
513511
ASTContext::BuiltinVectorTypeInfo Info =
514512
Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(Ty));
515-
auto VTy =
516-
llvm::VectorType::get(ConvertType(Info.ElementType), Info.EC);
513+
// The `__mfp8` type maps to `<1 x i8>` which can't be used to build
514+
// a <N x i8> vector type, hence bypass the call to `ConvertType` for
515+
// the element type and create the vector type directly.
516+
auto *EltTy = Info.ElementType->isMFloat8Type()
517+
? llvm::Type::getInt8Ty(getLLVMContext())
518+
: ConvertType(Info.ElementType);
519+
auto *VTy = llvm::VectorType::get(EltTy, Info.EC);
517520
switch (Info.NumVectors) {
518521
default:
519522
llvm_unreachable("Expected 1, 2, 3 or 4 vectors!");
@@ -529,6 +532,9 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
529532
}
530533
case BuiltinType::SveCount:
531534
return llvm::TargetExtType::get(getLLVMContext(), "aarch64.svcount");
535+
case BuiltinType::MFloat8:
536+
return llvm::VectorType::get(llvm::Type::getInt8Ty(getLLVMContext()), 1,
537+
false);
532538
#define PPC_VECTOR_TYPE(Name, Id, Size) \
533539
case BuiltinType::Id: \
534540
ResultType = \
@@ -650,9 +656,9 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
650656
// An ext_vector_type of Bool is really a vector of bits.
651657
llvm::Type *IRElemTy = VT->isExtVectorBoolType()
652658
? llvm::Type::getInt1Ty(getLLVMContext())
653-
: (VT->getElementType()->isMFloat8Type()
654-
? llvm::Type::getInt8Ty(getLLVMContext())
655-
: ConvertType(VT->getElementType()));
659+
: VT->getElementType()->isMFloat8Type()
660+
? llvm::Type::getInt8Ty(getLLVMContext())
661+
: ConvertType(VT->getElementType());
656662
ResultType = llvm::FixedVectorType::get(IRElemTy, VT->getNumElements());
657663
break;
658664
}

‎clang/lib/CodeGen/Targets/AArch64.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ AArch64ABIInfo::convertFixedToScalableVectorType(const VectorType *VT) const {
244244

245245
case BuiltinType::SChar:
246246
case BuiltinType::UChar:
247+
case BuiltinType::MFloat8:
247248
return llvm::ScalableVectorType::get(
248249
llvm::Type::getInt8Ty(getVMContext()), 16);
249250

@@ -776,8 +777,10 @@ bool AArch64ABIInfo::passAsPureScalableType(
776777
NPred += Info.NumVectors;
777778
else
778779
NVec += Info.NumVectors;
779-
auto VTy = llvm::ScalableVectorType::get(CGT.ConvertType(Info.ElementType),
780-
Info.EC.getKnownMinValue());
780+
llvm::Type *EltTy = Info.ElementType->isMFloat8Type()
781+
? llvm::Type::getInt8Ty(getVMContext())
782+
: CGT.ConvertType(Info.ElementType);
783+
auto *VTy = llvm::ScalableVectorType::get(EltTy, Info.EC.getKnownMinValue());
781784

782785
if (CoerceToSeq.size() + Info.NumVectors > 12)
783786
return false;

‎clang/utils/TableGen/SveEmitter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,15 +449,15 @@ std::string SVEType::builtinBaseType() const {
449449
case TypeKind::PredicatePattern:
450450
return "i";
451451
case TypeKind::Fpm:
452-
return "Wi";
452+
return "UWi";
453453
case TypeKind::Predicate:
454454
return "b";
455455
case TypeKind::BFloat16:
456456
assert(ElementBitwidth == 16 && "Invalid BFloat16!");
457457
return "y";
458458
case TypeKind::MFloat8:
459459
assert(ElementBitwidth == 8 && "Invalid MFloat8!");
460-
return "c";
460+
return "m";
461461
case TypeKind::Float:
462462
switch (ElementBitwidth) {
463463
case 16:

0 commit comments

Comments
 (0)