Skip to content

Commit 3a42cbd

Browse files
davemgreendavemgreen
committed
[AArch64] Rename AArch64SVEACLETypes.def and add base SVE_TYPE.
1 parent 6c86b7d commit 3a42cbd

24 files changed

+36
-37
lines changed

‎clang/include/clang/AST/ASTContext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
12191219
#include "clang/Basic/OpenCLExtensionTypes.def"
12201220
#define SVE_TYPE(Name, Id, SingletonId) \
12211221
CanQualType SingletonId;
1222-
#include "clang/Basic/AArch64SVEACLETypes.def"
1222+
#include "clang/Basic/AArch64ACLETypes.def"
12231223
#define PPC_VECTOR_TYPE(Name, Id, Size) \
12241224
CanQualType Id##Ty;
12251225
#include "clang/Basic/PPCTypes.def"

‎clang/include/clang/AST/Type.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3094,7 +3094,7 @@ class BuiltinType : public Type {
30943094
#include "clang/Basic/OpenCLExtensionTypes.def"
30953095
// SVE Types
30963096
#define SVE_TYPE(Name, Id, SingletonId) Id,
3097-
#include "clang/Basic/AArch64SVEACLETypes.def"
3097+
#include "clang/Basic/AArch64ACLETypes.def"
30983098
// PPC MMA Types
30993099
#define PPC_VECTOR_TYPE(Name, Id, Size) Id,
31003100
#include "clang/Basic/PPCTypes.def"

‎clang/include/clang/AST/TypeProperties.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ let Class = BuiltinType in {
881881

882882
#define SVE_TYPE(NAME, ID, SINGLETON_ID) \
883883
case BuiltinType::ID: return ctx.SINGLETON_ID;
884-
#include "clang/Basic/AArch64SVEACLETypes.def"
884+
#include "clang/Basic/AArch64ACLETypes.def"
885885

886886
#define PPC_VECTOR_TYPE(NAME, ID, SIZE) \
887887
case BuiltinType::ID: return ctx.ID##Ty;

‎clang/include/clang/Basic/AArch64SVEACLETypes.def renamed to ‎clang/include/clang/Basic/AArch64ACLETypes.def

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- AArch64SVEACLETypes.def - Metadata about SVE types ------*- C++ -*-===//
1+
//===-- AArch64ACLETypes.def - Metadata about SVE types ---------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -57,6 +57,10 @@
5757
// - IsBF true for vector of brain float elements.
5858
//===----------------------------------------------------------------------===//
5959

60+
#ifndef SVE_TYPE
61+
#define SVE_TYPE(Name, Id, SingletonId)
62+
#endif
63+
6064
#ifndef SVE_SCALAR_TYPE
6165
#define SVE_SCALAR_TYPE(Name, MangledName, Id, SingletonId, Bits) \
6266
SVE_TYPE(Name, Id, SingletonId)

‎clang/include/clang/Serialization/ASTBitCodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ enum PredefinedTypeIDs {
11291129
#include "clang/Basic/OpenCLExtensionTypes.def"
11301130
// \brief SVE types with auto numeration
11311131
#define SVE_TYPE(Name, Id, SingletonId) PREDEF_TYPE_##Id##_ID,
1132-
#include "clang/Basic/AArch64SVEACLETypes.def"
1132+
#include "clang/Basic/AArch64ACLETypes.def"
11331133
// \brief PowerPC MMA types with auto numeration
11341134
#define PPC_VECTOR_TYPE(Name, Id, Size) PREDEF_TYPE_##Id##_ID,
11351135
#include "clang/Basic/PPCTypes.def"

‎clang/include/module.modulemap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module Clang_Basic {
3636
requires cplusplus
3737
umbrella "clang/Basic"
3838

39-
textual header "clang/Basic/AArch64SVEACLETypes.def"
39+
textual header "clang/Basic/AArch64ACLETypes.def"
4040
textual header "clang/Basic/AMDGPUTypes.def"
4141
textual header "clang/Basic/BuiltinHeaders.def"
4242
textual header "clang/Basic/BuiltinsAArch64.def"

‎clang/lib/AST/ASTContext.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
14521452
(AuxTarget && AuxTarget->hasAArch64SVETypes())) {
14531453
#define SVE_TYPE(Name, Id, SingletonId) \
14541454
InitBuiltinType(SingletonId, BuiltinType::Id);
1455-
#include "clang/Basic/AArch64SVEACLETypes.def"
1455+
#include "clang/Basic/AArch64ACLETypes.def"
14561456
}
14571457

14581458
if (Target.getTriple().isPPC64()) {
@@ -2303,7 +2303,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const {
23032303
Width = Bits; \
23042304
Align = Bits; \
23052305
break;
2306-
#include "clang/Basic/AArch64SVEACLETypes.def"
2306+
#include "clang/Basic/AArch64ACLETypes.def"
23072307
#define PPC_VECTOR_TYPE(Name, Id, Size) \
23082308
case BuiltinType::Id: \
23092309
Width = Size; \
@@ -3473,7 +3473,7 @@ static void encodeTypeForFunctionPointerAuth(const ASTContext &Ctx,
34733473
#define SVE_TYPE(Name, Id, SingletonId) \
34743474
case BuiltinType::Id: \
34753475
return;
3476-
#include "clang/Basic/AArch64SVEACLETypes.def"
3476+
#include "clang/Basic/AArch64ACLETypes.def"
34773477
#define HLSL_INTANGIBLE_TYPE(Name, Id, SingletonId) \
34783478
case BuiltinType::Id: \
34793479
return;
@@ -4491,8 +4491,7 @@ ASTContext::getBuiltinVectorTypeInfo(const BuiltinType *Ty) const {
44914491
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF) \
44924492
case BuiltinType::Id: \
44934493
return {BoolTy, llvm::ElementCount::getScalable(NumEls), NF};
4494-
#define SVE_TYPE(Name, Id, SingletonId)
4495-
#include "clang/Basic/AArch64SVEACLETypes.def"
4494+
#include "clang/Basic/AArch64ACLETypes.def"
44964495

44974496
#define RVV_VECTOR_TYPE_INT(Name, Id, SingletonId, NumEls, ElBits, NF, \
44984497
IsSigned) \
@@ -4562,8 +4561,7 @@ QualType ASTContext::getScalableVectorType(QualType EltTy, unsigned NumElts,
45624561
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF) \
45634562
if (EltTy->isBooleanType() && NumElts == (NumEls * NF) && NumFields == 1) \
45644563
return SingletonId;
4565-
#define SVE_TYPE(Name, Id, SingletonId)
4566-
#include "clang/Basic/AArch64SVEACLETypes.def"
4564+
#include "clang/Basic/AArch64ACLETypes.def"
45674565
} else if (Target->hasRISCVVTypes()) {
45684566
uint64_t EltTySize = getTypeSize(EltTy);
45694567
#define RVV_VECTOR_TYPE(Name, Id, SingletonId, NumEls, ElBits, NF, IsSigned, \
@@ -9019,7 +9017,7 @@ static char getObjCEncodingForPrimitiveType(const ASTContext *C,
90199017

90209018
#define SVE_TYPE(Name, Id, SingletonId) \
90219019
case BuiltinType::Id:
9022-
#include "clang/Basic/AArch64SVEACLETypes.def"
9020+
#include "clang/Basic/AArch64ACLETypes.def"
90239021
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
90249022
#include "clang/Basic/RISCVVTypes.def"
90259023
#define WASM_TYPE(Name, Id, SingletonId) case BuiltinType::Id:

‎clang/lib/AST/ASTImporter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ ExpectedType ASTNodeImporter::VisitBuiltinType(const BuiltinType *T) {
11251125
#define SVE_TYPE(Name, Id, SingletonId) \
11261126
case BuiltinType::Id: \
11271127
return Importer.getToContext().SingletonId;
1128-
#include "clang/Basic/AArch64SVEACLETypes.def"
1128+
#include "clang/Basic/AArch64ACLETypes.def"
11291129
#define PPC_VECTOR_TYPE(Name, Id, Size) \
11301130
case BuiltinType::Id: \
11311131
return Importer.getToContext().Id##Ty;

‎clang/lib/AST/ExprConstant.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12393,7 +12393,7 @@ GCCTypeClass EvaluateBuiltinClassifyType(QualType T,
1239312393
case BuiltinType::OCLReserveID:
1239412394
#define SVE_TYPE(Name, Id, SingletonId) \
1239512395
case BuiltinType::Id:
12396-
#include "clang/Basic/AArch64SVEACLETypes.def"
12396+
#include "clang/Basic/AArch64ACLETypes.def"
1239712397
#define PPC_VECTOR_TYPE(Name, Id, Size) \
1239812398
case BuiltinType::Id:
1239912399
#include "clang/Basic/PPCTypes.def"

‎clang/lib/AST/ItaniumMangle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3488,7 +3488,7 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
34883488
type_name = #MangledName; \
34893489
Out << (type_name == #Name ? "u" : "") << type_name.size() << type_name; \
34903490
break;
3491-
#include "clang/Basic/AArch64SVEACLETypes.def"
3491+
#include "clang/Basic/AArch64ACLETypes.def"
34923492
#define PPC_VECTOR_TYPE(Name, Id, Size) \
34933493
case BuiltinType::Id: \
34943494
mangleVendorType(#Name); \

‎clang/lib/AST/NSAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ NSAPI::getNSNumberFactoryMethodKind(QualType T) const {
445445
case BuiltinType::OCLReserveID:
446446
#define SVE_TYPE(Name, Id, SingletonId) \
447447
case BuiltinType::Id:
448-
#include "clang/Basic/AArch64SVEACLETypes.def"
448+
#include "clang/Basic/AArch64ACLETypes.def"
449449
#define PPC_VECTOR_TYPE(Name, Id, Size) \
450450
case BuiltinType::Id:
451451
#include "clang/Basic/PPCTypes.def"

‎clang/lib/AST/PrintfFormatString.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ bool PrintfSpecifier::fixType(QualType QT, const LangOptions &LangOpt,
857857
#include "clang/Basic/OpenCLExtensionTypes.def"
858858
#define SVE_TYPE(Name, Id, SingletonId) \
859859
case BuiltinType::Id:
860-
#include "clang/Basic/AArch64SVEACLETypes.def"
860+
#include "clang/Basic/AArch64ACLETypes.def"
861861
#define PPC_VECTOR_TYPE(Name, Id, Size) \
862862
case BuiltinType::Id:
863863
#include "clang/Basic/PPCTypes.def"

‎clang/lib/AST/Type.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2581,8 +2581,7 @@ bool Type::isSVESizelessBuiltinType() const {
25812581
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId) \
25822582
case BuiltinType::Id: \
25832583
return true;
2584-
#define SVE_TYPE(Name, Id, SingletonId)
2585-
#include "clang/Basic/AArch64SVEACLETypes.def"
2584+
#include "clang/Basic/AArch64ACLETypes.def"
25862585
default:
25872586
return false;
25882587
}
@@ -3523,7 +3522,7 @@ StringRef BuiltinType::getName(const PrintingPolicy &Policy) const {
35233522
#define SVE_TYPE(Name, Id, SingletonId) \
35243523
case Id: \
35253524
return #Name;
3526-
#include "clang/Basic/AArch64SVEACLETypes.def"
3525+
#include "clang/Basic/AArch64ACLETypes.def"
35273526
#define PPC_VECTOR_TYPE(Name, Id, Size) \
35283527
case Id: \
35293528
return #Name;
@@ -4997,7 +4996,7 @@ bool Type::canHaveNullability(bool ResultIfUnknown) const {
49974996
case BuiltinType::OCLQueue:
49984997
case BuiltinType::OCLReserveID:
49994998
#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
5000-
#include "clang/Basic/AArch64SVEACLETypes.def"
4999+
#include "clang/Basic/AArch64ACLETypes.def"
50015000
#define PPC_VECTOR_TYPE(Name, Id, Size) case BuiltinType::Id:
50025001
#include "clang/Basic/PPCTypes.def"
50035002
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:

‎clang/lib/AST/TypeLoc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ TypeSpecifierType BuiltinTypeLoc::getWrittenTypeSpec() const {
420420
case BuiltinType::OCLReserveID:
421421
#define SVE_TYPE(Name, Id, SingletonId) \
422422
case BuiltinType::Id:
423-
#include "clang/Basic/AArch64SVEACLETypes.def"
423+
#include "clang/Basic/AArch64ACLETypes.def"
424424
#define PPC_VECTOR_TYPE(Name, Id, Size) \
425425
case BuiltinType::Id:
426426
#include "clang/Basic/PPCTypes.def"

‎clang/lib/CodeGen/CGDebugInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
876876
#include "clang/Basic/HLSLIntangibleTypes.def"
877877

878878
#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
879-
#include "clang/Basic/AArch64SVEACLETypes.def"
879+
#include "clang/Basic/AArch64ACLETypes.def"
880880
{
881881
if (BT->getKind() == BuiltinType::MFloat8) {
882882
Encoding = llvm::dwarf::DW_ATE_unsigned_char;

‎clang/lib/CodeGen/CodeGenTypes.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
512512
case BuiltinType::Id:
513513
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId) \
514514
case BuiltinType::Id:
515-
#define SVE_TYPE(Name, Id, SingletonId)
516-
#include "clang/Basic/AArch64SVEACLETypes.def"
515+
#include "clang/Basic/AArch64ACLETypes.def"
517516
{
518517
ASTContext::BuiltinVectorTypeInfo Info =
519518
Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(Ty));

‎clang/lib/CodeGen/ItaniumCXXABI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ static bool TypeInfoIsInStandardLibrary(const BuiltinType *Ty) {
36473647
case BuiltinType::OCLReserveID:
36483648
#define SVE_TYPE(Name, Id, SingletonId) \
36493649
case BuiltinType::Id:
3650-
#include "clang/Basic/AArch64SVEACLETypes.def"
3650+
#include "clang/Basic/AArch64ACLETypes.def"
36513651
#define PPC_VECTOR_TYPE(Name, Id, Size) \
36523652
case BuiltinType::Id:
36533653
#include "clang/Basic/PPCTypes.def"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,8 +774,7 @@ bool AArch64ABIInfo::passAsPureScalableType(
774774
case BuiltinType::Id: \
775775
isPredicate = true; \
776776
break;
777-
#define SVE_TYPE(Name, Id, SingletonId)
778-
#include "clang/Basic/AArch64SVEACLETypes.def"
777+
#include "clang/Basic/AArch64ACLETypes.def"
779778
default:
780779
return false;
781780
}

‎clang/lib/Index/USRGeneration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ void USRGenerator::VisitType(QualType T) {
767767
case BuiltinType::Id: \
768768
Out << "@BT@" << #Name; \
769769
break;
770-
#include "clang/Basic/AArch64SVEACLETypes.def"
770+
#include "clang/Basic/AArch64ACLETypes.def"
771771
#define PPC_VECTOR_TYPE(Name, Id, Size) \
772772
case BuiltinType::Id: \
773773
Out << "@BT@" << #Name; break;

‎clang/lib/Sema/Sema.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ void Sema::Initialize() {
520520
Context.getAuxTargetInfo()->hasAArch64SVETypes())) {
521521
#define SVE_TYPE(Name, Id, SingletonId) \
522522
addImplicitTypedef(#Name, Context.SingletonId);
523-
#include "clang/Basic/AArch64SVEACLETypes.def"
523+
#include "clang/Basic/AArch64ACLETypes.def"
524524
}
525525

526526
if (Context.getTargetInfo().getTriple().isPPC64()) {

‎clang/lib/Sema/SemaExpr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6296,7 +6296,7 @@ static bool isPlaceholderToRemoveAsArg(QualType type) {
62966296
// via TypedefTypes rather than exposed directly as BuiltinTypes.
62976297
#define SVE_TYPE(Name, Id, SingletonId) \
62986298
case BuiltinType::Id:
6299-
#include "clang/Basic/AArch64SVEACLETypes.def"
6299+
#include "clang/Basic/AArch64ACLETypes.def"
63006300
#define PPC_VECTOR_TYPE(Name, Id, Size) \
63016301
case BuiltinType::Id:
63026302
#include "clang/Basic/PPCTypes.def"
@@ -21540,7 +21540,7 @@ ExprResult Sema::CheckPlaceholderExpr(Expr *E) {
2154021540
#include "clang/Basic/OpenCLExtensionTypes.def"
2154121541
#define SVE_TYPE(Name, Id, SingletonId) \
2154221542
case BuiltinType::Id:
21543-
#include "clang/Basic/AArch64SVEACLETypes.def"
21543+
#include "clang/Basic/AArch64ACLETypes.def"
2154421544
#define PPC_VECTOR_TYPE(Name, Id, Size) \
2154521545
case BuiltinType::Id:
2154621546
#include "clang/Basic/PPCTypes.def"

‎clang/lib/Serialization/ASTCommon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ serialization::TypeIdxFromBuiltin(const BuiltinType *BT) {
245245
case BuiltinType::Id: \
246246
ID = PREDEF_TYPE_##Id##_ID; \
247247
break;
248-
#include "clang/Basic/AArch64SVEACLETypes.def"
248+
#include "clang/Basic/AArch64ACLETypes.def"
249249
#define PPC_VECTOR_TYPE(Name, Id, Size) \
250250
case BuiltinType::Id: \
251251
ID = PREDEF_TYPE_##Id##_ID; \

‎clang/lib/Serialization/ASTReader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7765,7 +7765,7 @@ QualType ASTReader::GetType(TypeID ID) {
77657765
case PREDEF_TYPE_##Id##_ID: \
77667766
T = Context.SingletonId; \
77677767
break;
7768-
#include "clang/Basic/AArch64SVEACLETypes.def"
7768+
#include "clang/Basic/AArch64ACLETypes.def"
77697769
#define PPC_VECTOR_TYPE(Name, Id, Size) \
77707770
case PREDEF_TYPE_##Id##_ID: \
77717771
T = Context.Id##Ty; \

‎clang/tools/libclang/CIndex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ bool CursorVisitor::VisitBuiltinTypeLoc(BuiltinTypeLoc TL) {
16381638
case BuiltinType::OCLQueue:
16391639
case BuiltinType::OCLReserveID:
16401640
#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
1641-
#include "clang/Basic/AArch64SVEACLETypes.def"
1641+
#include "clang/Basic/AArch64ACLETypes.def"
16421642
#define PPC_VECTOR_TYPE(Name, Id, Size) case BuiltinType::Id:
16431643
#include "clang/Basic/PPCTypes.def"
16441644
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:

0 commit comments

Comments
 (0)