Skip to content

Commit ecb7076

Browse files
tmatheson-armtmatheson-arm
committed
[NFC] rename macros in AArch64Types.def
SVE_TYPE --> AARCH64_TYPE AARCH64_VECTOR_TYPE --> -AARCH64_VECTOR_TYPE AARCH64_VECTOR_TYPE_MFLOAT --> -AARCH64_VECTOR_TYPE_MFLOAT
1 parent 63159e8 commit ecb7076

File tree

25 files changed

+48
-48
lines changed

25 files changed

+48
-48
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
12021202
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
12031203
CanQualType Id##Ty;
12041204
#include "clang/Basic/OpenCLExtensionTypes.def"
1205-
#define SVE_TYPE(Name, Id, SingletonId) \
1205+
#define AARCH64_TYPE(Name, Id, SingletonId) \
12061206
CanQualType SingletonId;
12071207
#include "clang/Basic/AArch64Types.def"
12081208
#define PPC_VECTOR_TYPE(Name, Id, Size) \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3041,7 +3041,7 @@ class BuiltinType : public Type {
30413041
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) Id,
30423042
#include "clang/Basic/OpenCLExtensionTypes.def"
30433043
// SVE Types
3044-
#define SVE_TYPE(Name, Id, SingletonId) Id,
3044+
#define AARCH64_TYPE(Name, Id, SingletonId) Id,
30453045
#include "clang/Basic/AArch64Types.def"
30463046
// PPC MMA Types
30473047
#define PPC_VECTOR_TYPE(Name, Id, Size) Id,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ let Class = BuiltinType in {
884884
case BuiltinType::ID: return ctx.ID##Ty;
885885
#include "clang/Basic/OpenCLExtensionTypes.def"
886886

887-
#define SVE_TYPE(NAME, ID, SINGLETON_ID) \
887+
#define AARCH64_TYPE(NAME, ID, SINGLETON_ID) \
888888
case BuiltinType::ID: return ctx.SINGLETON_ID;
889889
#include "clang/Basic/AArch64Types.def"
890890

‎clang/include/clang/Basic/AArch64Types.def‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// This file defines various SVE builtin types. The macros are:
1010
//
11-
// SVE_TYPE:
11+
// AARCH64_TYPE:
1212
// - (Name, MangledName, Id, SingletonId)
1313
// A builtin type that has not been covered by any other #define. Defining
1414
// this macro covers all the builtin types.
@@ -59,7 +59,7 @@
5959

6060
#ifndef SVE_VECTOR_TYPE
6161
#define SVE_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
62-
SVE_TYPE(Name, Id, SingletonId)
62+
AARCH64_TYPE(Name, Id, SingletonId)
6363
#endif
6464

6565
#ifndef SVE_VECTOR_TYPE_DETAILS
@@ -84,7 +84,7 @@
8484

8585
#ifndef SVE_PREDICATE_TYPE
8686
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId) \
87-
SVE_TYPE(Name, Id, SingletonId)
87+
AARCH64_TYPE(Name, Id, SingletonId)
8888
#endif
8989

9090
#ifndef SVE_PREDICATE_TYPE_ALL
@@ -94,17 +94,17 @@
9494

9595
#ifndef SVE_OPAQUE_TYPE
9696
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId) \
97-
SVE_TYPE(Name, Id, SingletonId)
97+
AARCH64_TYPE(Name, Id, SingletonId)
9898
#endif
9999

100-
#ifndef AARCH64_VECTOR_TYPE
101-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
102-
SVE_TYPE(Name, Id, SingletonId)
100+
#ifndef NEON_VECTOR_TYPE
101+
#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
102+
AARCH64_TYPE(Name, Id, SingletonId)
103103
#endif
104104

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)
105+
#ifndef NEON_VECTOR_TYPE_MFLOAT
106+
#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, ElBits, NF) \
107+
NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
108108
#endif
109109

110110
//===- Vector point types -----------------------------------------------===//
@@ -200,9 +200,9 @@ SVE_PREDICATE_TYPE_ALL("__clang_svboolx4_t", "svboolx4_t", SveBoolx4, SveBoolx4T
200200

201201
SVE_OPAQUE_TYPE("__SVCount_t", "__SVCount_t", SveCount, SveCountTy)
202202

203-
AARCH64_VECTOR_TYPE_MFLOAT("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 1, 8, 1)
204-
AARCH64_VECTOR_TYPE_MFLOAT("__MFloat8x8_t", "__MFloat8x8_t", MFloat8x8, MFloat8x8Ty, 8, 8, 1)
205-
AARCH64_VECTOR_TYPE_MFLOAT("__MFloat8x16_t", "__MFloat8x16_t", MFloat8x16, MFloat8x16Ty, 16, 8, 1)
203+
NEON_VECTOR_TYPE_MFLOAT("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 1, 8, 1)
204+
NEON_VECTOR_TYPE_MFLOAT("__MFloat8x8_t", "__MFloat8x8_t", MFloat8x8, MFloat8x8Ty, 8, 8, 1)
205+
NEON_VECTOR_TYPE_MFLOAT("__MFloat8x16_t", "__MFloat8x16_t", MFloat8x16, MFloat8x16Ty, 16, 8, 1)
206206

207207
#undef SVE_VECTOR_TYPE
208208
#undef SVE_VECTOR_TYPE_BFLOAT
@@ -211,6 +211,6 @@ AARCH64_VECTOR_TYPE_MFLOAT("__MFloat8x16_t", "__MFloat8x16_t", MFloat8x16, MFloa
211211
#undef SVE_PREDICATE_TYPE
212212
#undef SVE_PREDICATE_TYPE_ALL
213213
#undef SVE_OPAQUE_TYPE
214-
#undef AARCH64_VECTOR_TYPE_MFLOAT
215-
#undef AARCH64_VECTOR_TYPE
216-
#undef SVE_TYPE
214+
#undef NEON_VECTOR_TYPE_MFLOAT
215+
#undef NEON_VECTOR_TYPE
216+
#undef AARCH64_TYPE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ enum PredefinedTypeIDs {
11281128
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) PREDEF_TYPE_##Id##_ID,
11291129
#include "clang/Basic/OpenCLExtensionTypes.def"
11301130
// \brief SVE types with auto numeration
1131-
#define SVE_TYPE(Name, Id, SingletonId) PREDEF_TYPE_##Id##_ID,
1131+
#define AARCH64_TYPE(Name, Id, SingletonId) PREDEF_TYPE_##Id##_ID,
11321132
#include "clang/Basic/AArch64Types.def"
11331133
// \brief PowerPC MMA types with auto numeration
11341134
#define PPC_VECTOR_TYPE(Name, Id, Size) PREDEF_TYPE_##Id##_ID,

‎clang/lib/AST/ASTContext.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
14401440

14411441
if (Target.hasAArch64SVETypes() ||
14421442
(AuxTarget && AuxTarget->hasAArch64SVETypes())) {
1443-
#define SVE_TYPE(Name, Id, SingletonId) \
1443+
#define AARCH64_TYPE(Name, Id, SingletonId) \
14441444
InitBuiltinType(SingletonId, BuiltinType::Id);
14451445
#include "clang/Basic/AArch64Types.def"
14461446
}
@@ -2269,7 +2269,7 @@ 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, \
2272+
#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
22732273
ElBits, NF) \
22742274
case BuiltinType::Id: \
22752275
Width = NumEls * ElBits * NF; \
@@ -3424,7 +3424,7 @@ static void encodeTypeForFunctionPointerAuth(const ASTContext &Ctx,
34243424
case BuiltinType::Id: \
34253425
return;
34263426
#include "clang/Basic/OpenCLExtensionTypes.def"
3427-
#define SVE_TYPE(Name, Id, SingletonId) \
3427+
#define AARCH64_TYPE(Name, Id, SingletonId) \
34283428
case BuiltinType::Id: \
34293429
return;
34303430
#include "clang/Basic/AArch64Types.def"
@@ -4398,7 +4398,7 @@ ASTContext::getBuiltinVectorTypeInfo(const BuiltinType *Ty) const {
43984398
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF) \
43994399
case BuiltinType::Id: \
44004400
return {BoolTy, llvm::ElementCount::getScalable(NumEls), NF};
4401-
#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
4401+
#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
44024402
ElBits, NF) \
44034403
case BuiltinType::Id: \
44044404
return {getIntTypeForBitwidth(ElBits, false), \
@@ -4469,7 +4469,7 @@ QualType ASTContext::getScalableVectorType(QualType EltTy, unsigned NumElts,
44694469
if (EltTy->isBooleanType() && NumElts == (NumEls * NF) && NumFields == 1) \
44704470
return SingletonId;
44714471
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
4472-
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
4472+
#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
44734473
#include "clang/Basic/AArch64Types.def"
44744474
} else if (Target->hasRISCVVTypes()) {
44754475
uint64_t EltTySize = getTypeSize(EltTy);
@@ -8777,7 +8777,7 @@ static char getObjCEncodingForPrimitiveType(const ASTContext *C,
87778777
// FIXME: potentially need @encodes for these!
87788778
return ' ';
87798779

8780-
#define SVE_TYPE(Name, Id, SingletonId) \
8780+
#define AARCH64_TYPE(Name, Id, SingletonId) \
87818781
case BuiltinType::Id:
87828782
#include "clang/Basic/AArch64Types.def"
87838783
#define RVV_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
@@ -1120,7 +1120,7 @@ ExpectedType ASTNodeImporter::VisitBuiltinType(const BuiltinType *T) {
11201120
case BuiltinType::Id: \
11211121
return Importer.getToContext().Id##Ty;
11221122
#include "clang/Basic/OpenCLExtensionTypes.def"
1123-
#define SVE_TYPE(Name, Id, SingletonId) \
1123+
#define AARCH64_TYPE(Name, Id, SingletonId) \
11241124
case BuiltinType::Id: \
11251125
return Importer.getToContext().SingletonId;
11261126
#include "clang/Basic/AArch64Types.def"

‎clang/lib/AST/ExprConstant.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12203,7 +12203,7 @@ GCCTypeClass EvaluateBuiltinClassifyType(QualType T,
1220312203
case BuiltinType::OCLClkEvent:
1220412204
case BuiltinType::OCLQueue:
1220512205
case BuiltinType::OCLReserveID:
12206-
#define SVE_TYPE(Name, Id, SingletonId) \
12206+
#define AARCH64_TYPE(Name, Id, SingletonId) \
1220712207
case BuiltinType::Id:
1220812208
#include "clang/Basic/AArch64Types.def"
1220912209
#define PPC_VECTOR_TYPE(Name, Id, Size) \

‎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 NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
34373437
case BuiltinType::Id: \
34383438
type_name = MangledName; \
34393439
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name; \

‎clang/lib/AST/MicrosoftMangle.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2806,7 +2806,7 @@ void MicrosoftCXXNameMangler::mangleType(const BuiltinType *T, Qualifiers,
28062806
break;
28072807
#include "clang/Basic/HLSLIntangibleTypes.def"
28082808

2809-
#define SVE_TYPE(Name, Id, SingletonId) \
2809+
#define AARCH64_TYPE(Name, Id, SingletonId) \
28102810
case BuiltinType::Id:
28112811
#include "clang/Basic/AArch64Types.def"
28122812
#define PPC_VECTOR_TYPE(Name, Id, Size) \

0 commit comments

Comments
 (0)