Update cpu_model.c and clang AArch64 targets

Author: MDevereau

clang/lib/Basic/Targets/AArch64.cpp

@@ -677,6 +677,7 @@ bool AArch64TargetInfo::hasFeature(StringRef Feature) const {
       .Case("sme", HasSME)
       .Case("sme-f64f64", HasSMEF64F64)
       .Case("sme-i16i64", HasSMEI16I64)
+      .Case("sme-fa64", HasSMEFA64)
       .Cases("memtag", "memtag2", HasMTE)
       .Case("sb", HasSB)
       .Case("predres", HasPredRes)
@@ -806,6 +807,10 @@ bool AArch64TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
       HasBFloat16 = true;
       HasFullFP16 = true;
     }
+    if (Feature == "+sme-fa64") {
+      HasSME = true;
+      HasSMEFA64 = true;
+    }
     if (Feature == "+sb")
       HasSB = true;
     if (Feature == "+predres")

clang/lib/Basic/Targets/AArch64.h

@@ -70,6 +70,7 @@ class LLVM_LIBRARY_VISIBILITY AArch64TargetInfo : public TargetInfo {
   bool HasSME = false;
   bool HasSMEF64F64 = false;
   bool HasSMEI16I64 = false;
+  bool HasSMEFA64 = false;
   bool HasSB = false;
   bool HasPredRes = false;
   bool HasSSBS = false;

compiler-rt/lib/builtins/cpu_model.c

@@ -1134,7 +1134,7 @@ typedef struct __ifunc_arg_t {
 #define HWCAP2_SME_F64F64 (1 << 25)
 #endif
 #ifndef HWCAP2_SME_FA64
-#define HWCAP2_SME_FA64 (1 << 26)
+#define HWCAP2_SME_FA64 (1 << 30)
 #endif
 #ifndef HWCAP2_WFXT
 #define HWCAP2_WFXT (1UL << 31)

llvm/lib/Target/AArch64/AArch64.td

@@ -799,7 +799,7 @@ def SME2Unsupported : AArch64Unsupported {
 }
 
 def SMEUnsupported : AArch64Unsupported {
-  let F = !listconcat([HasSME, HasSMEI16I64, HasSMEF16F16, HasSMEF64F64],
+  let F = !listconcat([HasSME, HasSMEI16I64, HasSMEF16F16, HasSMEF64F64, HasSMEFA64],
                       SME2Unsupported.F);
 }
 

llvm/lib/Target/AArch64/AArch64Subtarget.cpp

@@ -499,15 +499,13 @@ bool AArch64Subtarget::isStreamingCompatible() const {
 }
 
 bool AArch64Subtarget::isNeonAvailable() const {
-  if (hasSMEFA64())
-    return true;
-  return (hasNEON() && !isStreaming() && !isStreamingCompatible());
+  return hasNEON() &&
+         (hasSMEFA64() || (!isStreaming() && !isStreamingCompatible()));
 }
 
 bool AArch64Subtarget::isSVEAvailable() const {
-  if (hasSMEFA64())
-    return true;
-  return (hasSVE() && !isStreaming() && !isStreamingCompatible());
+  return hasSVE() &&
+         (hasSMEFA64() || (!isStreaming() && !isStreamingCompatible()));
 }
 
 // If return address signing is enabled, tail calls are emitted as follows: