Skip to content

Commit d24a6aa

Browse files
davemgreengithub-actions[bot]
davemgreen
authored and
github-actions[bot]
committed
Automerge: [AArch64] Rename AArch64SVEACLETypes.def and add base SVE_TYPE.
2 parents 1345445 + 3a42cbd commit d24a6aa

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); \

0 commit comments

Comments
 (0)