fixup: cleanup based on review

Author: SamTebbs33

clang/lib/Sema/SemaChecking.cpp

@@ -3185,9 +3185,6 @@ bool Sema::CheckSMEBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
 #define GET_SME_STREAMING_ATTRS
 #include "clang/Basic/arm_sme_streaming_attrs.inc"
 #undef GET_SME_STREAMING_ATTRS
-#define GET_SVE_STREAMING_ATTRS
-#include "clang/Basic/arm_sve_streaming_attrs.inc"
-#undef GET_SVE_STREAMING_ATTRS
     }
 
     if (BuiltinType)
@@ -3211,6 +3208,7 @@ bool Sema::CheckSMEBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
 bool Sema::CheckSVEBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
   if (const FunctionDecl *FD = getCurFunctionDecl()) {
     std::optional<ArmStreamingType> BuiltinType;
+
     switch (BuiltinID) {
     default:
       break;
@@ -3230,9 +3228,6 @@ bool Sema::CheckSVEBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
 #define GET_SVE_IMMEDIATE_CHECK
 #include "clang/Basic/arm_sve_sema_rangechecks.inc"
 #undef GET_SVE_IMMEDIATE_CHECK
-#define GET_SME_IMMEDIATE_CHECK
-#include "clang/Basic/arm_sme_sema_rangechecks.inc"
-#undef GET_SME_IMMEDIATE_CHECK
   }
 
   return ParseSVEImmChecks(TheCall, ImmChecks);

clang/utils/TableGen/SveEmitter.cpp

@@ -1717,15 +1717,18 @@ void SVEEmitter::createStreamingAttrs(raw_ostream &OS, ACLEKind Kind) {
     return A->getMangledName() < B->getMangledName();
   });
 
+  StringRef ExtensionKind;
   switch (Kind) {
   case ACLEKind::SME:
-    OS << "#ifdef GET_SME_STREAMING_ATTRS\n";
+    ExtensionKind = "SME";
     break;
   case ACLEKind::SVE:
-    OS << "#ifdef GET_SVE_STREAMING_ATTRS\n";
+    ExtensionKind = "SVE";
     break;
   }
 
+  OS << "#ifdef GET_" << ExtensionKind << "_STREAMING_ATTRS\n";
+
   // Ensure these are only emitted once.
   std::set<std::string> Emitted;
 
@@ -1736,14 +1739,7 @@ void SVEEmitter::createStreamingAttrs(raw_ostream &OS, ACLEKind Kind) {
     if (Emitted.find(Def->getMangledName()) != Emitted.end())
       continue;
 
-    switch (Kind) {
-    case ACLEKind::SME:
-      OS << "case SME::BI__builtin_sme_";
-      break;
-    case ACLEKind::SVE:
-      OS << "case SVE::BI__builtin_sve_";
-      break;
-    }
+    OS << "case " << ExtensionKind << "::BI__builtin_" << ExtensionKind.lower() << "_";
     OS << Def->getMangledName() << ":\n";
 
     if (Def->isFlagSet(IsStreamingFlag))