[llvm][AArch64] Drop an ignored field on AArch64CPUTestParams. NFC (#98338)

AFAICT, the only use of the field was for the ARM side of this shared
struct.

1 files changed, 83 insertions, 86 deletions

diff --git a/llvm/unittests/TargetParser/TargetParserTest.cpp b/llvm/unittests/TargetParser/TargetParserTest.cpp
index 62be718..716ad26 100644
--- a/llvm/unittests/TargetParser/TargetParserTest.cpp
+++ b/llvm/unittests/TargetParser/TargetParserTest.cpp
@@ -1074,10 +1074,10 @@ TEST(TargetParserTest, ARMPrintSupportedExtensions) {
 struct AArch64CPUTestParams
     : public ARMCPUTestParams<AArch64::ExtensionBitset> {
   AArch64CPUTestParams(StringRef CPUName, StringRef ExpectedArch,
-                       StringRef ExpectedFPU,
                        AArch64::ExtensionBitset ExpectedFlags)
       : ARMCPUTestParams<AArch64::ExtensionBitset>(CPUName, ExpectedArch,
-                                                   ExpectedFPU, ExpectedFlags,
+                                                   /*ignored*/ "",
+                                                   ExpectedFlags,
                                                    /*ignored*/ "") {}
   /// Print a gtest-compatible facsimile of the CPUName, to make the test's name
   /// human-readable.
@@ -1111,25 +1111,25 @@ TEST_P(AArch64CPUTestFixture, testAArch64CPU) {
 INSTANTIATE_TEST_SUITE_P(
     AArch64CPUTests, AArch64CPUTestFixture,
     ::testing::Values(
-        AArch64CPUTestParams("cortex-a34", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a34", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("cortex-a35", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a35", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("cortex-a53", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a53", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a55", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a55", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_SIMD, AArch64::AEK_RAS,
              AArch64::AEK_LSE, AArch64::AEK_RDM, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("cortex-a510", "armv9-a", "neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a510", "armv9-a",
                              {AArch64::AEK_CRC,         AArch64::AEK_FP,
                               AArch64::AEK_SIMD,        AArch64::AEK_RAS,
                               AArch64::AEK_LSE,         AArch64::AEK_RDM,
@@ -1142,7 +1142,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_SB,          AArch64::AEK_JSCVT,
                               AArch64::AEK_FCMA,        AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,         AArch64::AEK_AM}),
-        AArch64CPUTestParams("cortex-a520", "armv9.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a520", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1158,7 +1158,6 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_PERFMON,     AArch64::AEK_AM,
                               AArch64::AEK_ETE}),
         AArch64CPUTestParams("cortex-a520ae", "armv9.2-a",
-                             "crypto-neon-fp-armv8",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1173,75 +1172,75 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_JSCVT,       AArch64::AEK_FCMA,
                               AArch64::AEK_PERFMON,     AArch64::AEK_AM,
                               AArch64::AEK_ETE}),
-        AArch64CPUTestParams("cortex-a57", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a57", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a65", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a65", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_FP16,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RCPC,
              AArch64::AEK_RDM, AArch64::AEK_SIMD, AArch64::AEK_SSBS,
              AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a65ae", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a65ae", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_FP16,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RCPC,
              AArch64::AEK_RDM, AArch64::AEK_SIMD, AArch64::AEK_SSBS,
              AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("cortex-a72", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a72", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("cortex-a73", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a73", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a75", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a75", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_SIMD, AArch64::AEK_RAS,
              AArch64::AEK_LSE, AArch64::AEK_RDM, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a76", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a76", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_RDM, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_SSBS,
              AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a76ae", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a76ae", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_RDM, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_SSBS,
              AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a77", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a77", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_RDM, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_SSBS,
              AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a78", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a78", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_RDM, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_SSBS,
              AArch64::AEK_PROFILE, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a78ae", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a78ae", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_FP, AArch64::AEK_RDM, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_FP16,
              AArch64::AEK_DOTPROD, AArch64::AEK_RCPC, AArch64::AEK_SSBS,
              AArch64::AEK_PROFILE, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a78c", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-a78c", "armv8.2-a",
             {AArch64::AEK_RAS, AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_RDM,
@@ -1249,7 +1248,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_SSBS, AArch64::AEK_PROFILE, AArch64::AEK_FLAGM,
              AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-a710", "armv9-a", "neon-fp-armv8",
+            "cortex-a710", "armv9-a",
             {AArch64::AEK_CRC,     AArch64::AEK_FP,          AArch64::AEK_SIMD,
              AArch64::AEK_RAS,     AArch64::AEK_LSE,         AArch64::AEK_RDM,
              AArch64::AEK_RCPC,    AArch64::AEK_DOTPROD,     AArch64::AEK_MTE,
@@ -1258,7 +1257,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_FLAGM,   AArch64::AEK_SB,          AArch64::AEK_I8MM,
              AArch64::AEK_BF16,    AArch64::AEK_JSCVT,       AArch64::AEK_FCMA,
              AArch64::AEK_PERFMON, AArch64::AEK_ETE}),
-        AArch64CPUTestParams("cortex-a715", "armv9-a", "neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a715", "armv9-a",
                              {AArch64::AEK_CRC,     AArch64::AEK_FP,
                               AArch64::AEK_BF16,    AArch64::AEK_SIMD,
                               AArch64::AEK_RAS,     AArch64::AEK_LSE,
@@ -1273,7 +1272,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FLAGM,   AArch64::AEK_JSCVT,
                               AArch64::AEK_FCMA,    AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,     AArch64::AEK_TRBE}),
-        AArch64CPUTestParams("cortex-a720", "armv9.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a720", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1290,7 +1289,6 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_ETE,         AArch64::AEK_SPE_EEF,
                               AArch64::AEK_TRBE}),
         AArch64CPUTestParams("cortex-a720ae", "armv9.2-a",
-                             "crypto-neon-fp-armv8",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1306,7 +1304,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FCMA,        AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,         AArch64::AEK_SPE_EEF,
                               AArch64::AEK_TRBE}),
-        AArch64CPUTestParams("cortex-a725", "armv9.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-a725", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1322,7 +1320,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FCMA,        AArch64::AEK_ETE,
                               AArch64::AEK_SPE_EEF,     AArch64::AEK_TRBE}),
         AArch64CPUTestParams(
-            "neoverse-v1", "armv8.4-a", "crypto-neon-fp-armv8",
+            "neoverse-v1", "armv8.4-a",
             {AArch64::AEK_RAS,     AArch64::AEK_SVE,     AArch64::AEK_SSBS,
              AArch64::AEK_RCPC,    AArch64::AEK_CRC,     AArch64::AEK_FP,
              AArch64::AEK_SIMD,    AArch64::AEK_RAS,     AArch64::AEK_LSE,
@@ -1332,7 +1330,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_PROFILE, AArch64::AEK_RAND,    AArch64::AEK_FP16FML,
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON, AArch64::AEK_CCDP}),
-        AArch64CPUTestParams("neoverse-v2", "armv9-a", "neon-fp-armv8",
+        AArch64CPUTestParams("neoverse-v2", "armv9-a",
                              {AArch64::AEK_RAS,         AArch64::AEK_SVE,
                               AArch64::AEK_SSBS,        AArch64::AEK_RCPC,
                               AArch64::AEK_CRC,         AArch64::AEK_FP,
@@ -1346,7 +1344,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_JSCVT,       AArch64::AEK_FCMA,
                               AArch64::AEK_PAUTH,       AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE}),
-        AArch64CPUTestParams("neoverse-v3", "armv9.2-a", "neon-fp-armv8",
+        AArch64CPUTestParams("neoverse-v3", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1363,7 +1361,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_PROFILE,     AArch64::AEK_JSCVT,
                               AArch64::AEK_FCMA,        AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,         AArch64::AEK_SPE_EEF}),
-        AArch64CPUTestParams("neoverse-v3ae", "armv9.2-a", "neon-fp-armv8",
+        AArch64CPUTestParams("neoverse-v3ae", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1381,7 +1379,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FCMA,        AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,         AArch64::AEK_SPE_EEF}),
         AArch64CPUTestParams(
-            "cortex-r82", "armv8-r", "crypto-neon-fp-armv8",
+            "cortex-r82", "armv8-r",
             {AArch64::AEK_CRC, AArch64::AEK_RDM, AArch64::AEK_SSBS,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_FP16, AArch64::AEK_FP16FML, AArch64::AEK_RAS,
@@ -1390,7 +1388,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_FLAGM, AArch64::AEK_PERFMON, AArch64::AEK_PREDRES,
              AArch64::AEK_CCDP}),
         AArch64CPUTestParams(
-            "cortex-r82ae", "armv8-r", "crypto-neon-fp-armv8",
+            "cortex-r82ae", "armv8-r",
             {AArch64::AEK_CRC, AArch64::AEK_RDM, AArch64::AEK_SSBS,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_FP16, AArch64::AEK_FP16FML, AArch64::AEK_RAS,
@@ -1399,14 +1397,14 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_FLAGM, AArch64::AEK_PERFMON, AArch64::AEK_PREDRES,
              AArch64::AEK_CCDP}),
         AArch64CPUTestParams(
-            "cortex-x1", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-x1", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_RDM,
              AArch64::AEK_SIMD, AArch64::AEK_RAS, AArch64::AEK_LSE,
              AArch64::AEK_FP16, AArch64::AEK_DOTPROD, AArch64::AEK_RCPC,
              AArch64::AEK_SSBS, AArch64::AEK_PROFILE, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "cortex-x1c", "armv8.2-a", "crypto-neon-fp-armv8",
+            "cortex-x1c", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_RDM,
              AArch64::AEK_SIMD, AArch64::AEK_RAS, AArch64::AEK_LSE,
@@ -1414,7 +1412,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_SSBS, AArch64::AEK_PAUTH, AArch64::AEK_PROFILE,
              AArch64::AEK_FLAGM, AArch64::AEK_PERFMON, AArch64::AEK_LSE2,
              AArch64::AEK_RCPC_IMMO}),
-        AArch64CPUTestParams("cortex-x2", "armv9-a", "neon-fp-armv8",
+        AArch64CPUTestParams("cortex-x2", "armv9-a",
                              {AArch64::AEK_CRC,         AArch64::AEK_FP,
                               AArch64::AEK_SIMD,        AArch64::AEK_RAS,
                               AArch64::AEK_LSE,         AArch64::AEK_RDM,
@@ -1428,7 +1426,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_JSCVT,       AArch64::AEK_FCMA,
                               AArch64::AEK_PERFMON,     AArch64::AEK_AM,
                               AArch64::AEK_ETE}),
-        AArch64CPUTestParams("cortex-x3", "armv9-a", "neon-fp-armv8",
+        AArch64CPUTestParams("cortex-x3", "armv9-a",
                              {AArch64::AEK_CRC,     AArch64::AEK_FP,
                               AArch64::AEK_BF16,    AArch64::AEK_SIMD,
                               AArch64::AEK_RAS,     AArch64::AEK_LSE,
@@ -1443,7 +1441,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_SSBS,    AArch64::AEK_JSCVT,
                               AArch64::AEK_FCMA,    AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,     AArch64::AEK_TRBE}),
-        AArch64CPUTestParams("cortex-x4", "armv9.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-x4", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1459,7 +1457,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FCMA,        AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,         AArch64::AEK_SPE_EEF,
                               AArch64::AEK_TRBE}),
-        AArch64CPUTestParams("cortex-x925", "armv9.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cortex-x925", "armv9.2-a",
                              {AArch64::AEK_BF16,        AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,         AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,        AArch64::AEK_DOTPROD,
@@ -1474,64 +1472,64 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_PROFILE,     AArch64::AEK_JSCVT,
                               AArch64::AEK_FCMA,        AArch64::AEK_ETE,
                               AArch64::AEK_SPE_EEF,     AArch64::AEK_TRBE}),
-        AArch64CPUTestParams("cyclone", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("cyclone", "armv8-a",
                              {AArch64::AEK_AES, AArch64::AEK_SHA2,
                               AArch64::AEK_FP, AArch64::AEK_SIMD,
                               AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("apple-a7", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-a7", "armv8-a",
                              {AArch64::AEK_AES, AArch64::AEK_SHA2,
                               AArch64::AEK_FP, AArch64::AEK_SIMD,
                               AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("apple-a8", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-a8", "armv8-a",
                              {AArch64::AEK_AES, AArch64::AEK_SHA2,
                               AArch64::AEK_FP, AArch64::AEK_SIMD,
                               AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("apple-a9", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-a9", "armv8-a",
                              {AArch64::AEK_AES, AArch64::AEK_SHA2,
                               AArch64::AEK_FP, AArch64::AEK_SIMD,
                               AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("apple-a10", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-a10", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_RDM, AArch64::AEK_SIMD,
                               AArch64::AEK_PERFMON, AArch64::AEK_PAN,
                               AArch64::AEK_LOR, AArch64::AEK_VH}),
-        AArch64CPUTestParams("apple-a11", "armv8.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-a11", "armv8.2-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_LSE, AArch64::AEK_RAS,
                               AArch64::AEK_RDM, AArch64::AEK_SIMD,
                               AArch64::AEK_FP16, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "apple-a12", "armv8.3-a", "crypto-neon-fp-armv8",
+            "apple-a12", "armv8.3-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RDM,
              AArch64::AEK_RCPC, AArch64::AEK_FP16, AArch64::AEK_JSCVT,
              AArch64::AEK_FCMA, AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "apple-s4", "armv8.3-a", "crypto-neon-fp-armv8",
+            "apple-s4", "armv8.3-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RDM,
              AArch64::AEK_RCPC, AArch64::AEK_FP16, AArch64::AEK_JSCVT,
              AArch64::AEK_FCMA, AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "apple-s5", "armv8.3-a", "crypto-neon-fp-armv8",
+            "apple-s5", "armv8.3-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RDM,
              AArch64::AEK_RCPC, AArch64::AEK_FP16, AArch64::AEK_JSCVT,
              AArch64::AEK_FCMA, AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "apple-a13", "armv8.4-a", "crypto-neon-fp-armv8",
+            "apple-a13", "armv8.4-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_SHA3, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RDM,
              AArch64::AEK_RCPC, AArch64::AEK_DOTPROD, AArch64::AEK_FP16,
              AArch64::AEK_FP16FML, AArch64::AEK_SHA3, AArch64::AEK_JSCVT,
              AArch64::AEK_FCMA, AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("apple-a14", "armv8.4-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-a14", "armv8.4-a",
                              {AArch64::AEK_CRC,
                               AArch64::AEK_AES,
                               AArch64::AEK_SHA2,
@@ -1557,7 +1555,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FRINT3264,
                               AArch64::AEK_SPECRESTRICT,
                               AArch64::AEK_ALTERNATIVENZCV}),
-        AArch64CPUTestParams("apple-m1", "armv8.4-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-m1", "armv8.4-a",
                              {AArch64::AEK_CRC,
                               AArch64::AEK_AES,
                               AArch64::AEK_SHA2,
@@ -1584,7 +1582,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_SPECRESTRICT,
                               AArch64::AEK_ALTERNATIVENZCV}),
         AArch64CPUTestParams(
-            "apple-a15", "armv8.6-a", "crypto-neon-fp-armv8",
+            "apple-a15", "armv8.6-a",
             {AArch64::AEK_CRC,     AArch64::AEK_AES,     AArch64::AEK_SHA2,
              AArch64::AEK_SHA3,    AArch64::AEK_FP,      AArch64::AEK_SIMD,
              AArch64::AEK_LSE,     AArch64::AEK_RAS,     AArch64::AEK_RDM,
@@ -1593,7 +1591,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "apple-m2", "armv8.6-a", "crypto-neon-fp-armv8",
+            "apple-m2", "armv8.6-a",
             {AArch64::AEK_CRC,     AArch64::AEK_AES,     AArch64::AEK_SHA2,
              AArch64::AEK_SHA3,    AArch64::AEK_FP,      AArch64::AEK_SIMD,
              AArch64::AEK_LSE,     AArch64::AEK_RAS,     AArch64::AEK_RDM,
@@ -1602,7 +1600,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "apple-a16", "armv8.6-a", "crypto-neon-fp-armv8",
+            "apple-a16", "armv8.6-a",
             {AArch64::AEK_CRC,     AArch64::AEK_AES,     AArch64::AEK_SHA2,
              AArch64::AEK_SHA3,    AArch64::AEK_FP,      AArch64::AEK_SIMD,
              AArch64::AEK_LSE,     AArch64::AEK_RAS,     AArch64::AEK_RDM,
@@ -1611,7 +1609,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON, AArch64::AEK_HCX}),
         AArch64CPUTestParams(
-            "apple-m3", "armv8.6-a", "crypto-neon-fp-armv8",
+            "apple-m3", "armv8.6-a",
             {AArch64::AEK_CRC,     AArch64::AEK_AES,     AArch64::AEK_SHA2,
              AArch64::AEK_SHA3,    AArch64::AEK_FP,      AArch64::AEK_SIMD,
              AArch64::AEK_LSE,     AArch64::AEK_RAS,     AArch64::AEK_RDM,
@@ -1620,7 +1618,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON, AArch64::AEK_HCX}),
         AArch64CPUTestParams(
-            "apple-a17", "armv8.6-a", "crypto-neon-fp-armv8",
+            "apple-a17", "armv8.6-a",
             {AArch64::AEK_CRC,     AArch64::AEK_AES,     AArch64::AEK_SHA2,
              AArch64::AEK_SHA3,    AArch64::AEK_FP,      AArch64::AEK_SIMD,
              AArch64::AEK_LSE,     AArch64::AEK_RAS,     AArch64::AEK_RDM,
@@ -1628,7 +1626,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_FP16FML, AArch64::AEK_SHA3,    AArch64::AEK_BF16,
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON, AArch64::AEK_HCX}),
-        AArch64CPUTestParams("apple-m4", "armv8.7-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("apple-m4", "armv8.7-a",
                              {AArch64::AEK_CRC,       AArch64::AEK_AES,
                               AArch64::AEK_SHA2,      AArch64::AEK_SHA3,
                               AArch64::AEK_FP,        AArch64::AEK_SIMD,
@@ -1641,46 +1639,46 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_SME,       AArch64::AEK_SME2,
                               AArch64::AEK_SMEF64F64, AArch64::AEK_SMEI16I64,
                               AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("exynos-m3", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("exynos-m3", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "exynos-m4", "armv8.2-a", "crypto-neon-fp-armv8",
+            "exynos-m4", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_FP16,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RDM,
              AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "exynos-m5", "armv8.2-a", "crypto-neon-fp-armv8",
+            "exynos-m5", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_FP16,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RDM,
              AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("falkor", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("falkor", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_RDM,
                               AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("kryo", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("kryo", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "neoverse-e1", "armv8.2-a", "crypto-neon-fp-armv8",
+            "neoverse-e1", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_FP16,
              AArch64::AEK_LSE, AArch64::AEK_RAS, AArch64::AEK_RCPC,
              AArch64::AEK_RDM, AArch64::AEK_SIMD, AArch64::AEK_SSBS,
              AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "neoverse-n1", "armv8.2-a", "crypto-neon-fp-armv8",
+            "neoverse-n1", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
              AArch64::AEK_DOTPROD, AArch64::AEK_FP, AArch64::AEK_FP16,
              AArch64::AEK_LSE, AArch64::AEK_PROFILE, AArch64::AEK_RAS,
              AArch64::AEK_RCPC, AArch64::AEK_RDM, AArch64::AEK_SIMD,
              AArch64::AEK_SSBS, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("neoverse-n2", "armv9-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("neoverse-n2", "armv9-a",
                              {AArch64::AEK_CRC,         AArch64::AEK_FP,
                               AArch64::AEK_SIMD,        AArch64::AEK_FP16,
                               AArch64::AEK_RAS,         AArch64::AEK_LSE,
@@ -1693,7 +1691,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_FCMA,        AArch64::AEK_PAUTH,
                               AArch64::AEK_FP16FML,     AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,         AArch64::AEK_TRBE}),
-        AArch64CPUTestParams("neoverse-n3", "armv9.2-a", "neon-fp-armv8",
+        AArch64CPUTestParams("neoverse-n3", "armv9.2-a",
                              {AArch64::AEK_BF16,    AArch64::AEK_I8MM,
                               AArch64::AEK_SVE,     AArch64::AEK_SVE2,
                               AArch64::AEK_FP16,    AArch64::AEK_DOTPROD,
@@ -1710,7 +1708,7 @@ INSTANTIATE_TEST_SUITE_P(
                               AArch64::AEK_JSCVT,   AArch64::AEK_PERFMON,
                               AArch64::AEK_ETE,     AArch64::AEK_SPE_EEF}),
         AArch64CPUTestParams(
-            "ampere1", "armv8.6-a", "crypto-neon-fp-armv8",
+            "ampere1", "armv8.6-a",
             {AArch64::AEK_CRC,  AArch64::AEK_FP,    AArch64::AEK_FP16,
              AArch64::AEK_SIMD, AArch64::AEK_RAS,   AArch64::AEK_LSE,
              AArch64::AEK_RDM,  AArch64::AEK_RCPC,  AArch64::AEK_DOTPROD,
@@ -1719,7 +1717,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_SB,   AArch64::AEK_RAND,  AArch64::AEK_JSCVT,
              AArch64::AEK_FCMA, AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "ampere1a", "armv8.6-a", "crypto-neon-fp-armv8",
+            "ampere1a", "armv8.6-a",
             {AArch64::AEK_CRC,   AArch64::AEK_FP,     AArch64::AEK_FP16,
              AArch64::AEK_SIMD,  AArch64::AEK_RAS,    AArch64::AEK_LSE,
              AArch64::AEK_RDM,   AArch64::AEK_RCPC,   AArch64::AEK_DOTPROD,
@@ -1729,7 +1727,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_MTE,   AArch64::AEK_JSCVT,  AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "ampere1b", "armv8.7-a", "crypto-neon-fp-armv8",
+            "ampere1b", "armv8.7-a",
             {AArch64::AEK_CRC,   AArch64::AEK_FP,    AArch64::AEK_FP16,
              AArch64::AEK_SIMD,  AArch64::AEK_RAS,   AArch64::AEK_LSE,
              AArch64::AEK_RDM,   AArch64::AEK_RCPC,  AArch64::AEK_DOTPROD,
@@ -1740,7 +1738,7 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_PAUTH, AArch64::AEK_CSSC,  AArch64::AEK_PERFMON,
              AArch64::AEK_WFXT}),
         AArch64CPUTestParams(
-            "neoverse-512tvb", "armv8.4-a", "crypto-neon-fp-armv8",
+            "neoverse-512tvb", "armv8.4-a",
             {AArch64::AEK_RAS,     AArch64::AEK_SVE,     AArch64::AEK_SSBS,
              AArch64::AEK_RCPC,    AArch64::AEK_CRC,     AArch64::AEK_FP,
              AArch64::AEK_SIMD,    AArch64::AEK_RAS,     AArch64::AEK_LSE,
@@ -1751,58 +1749,57 @@ INSTANTIATE_TEST_SUITE_P(
              AArch64::AEK_I8MM,    AArch64::AEK_JSCVT,   AArch64::AEK_FCMA,
              AArch64::AEK_PAUTH,   AArch64::AEK_PERFMON, AArch64::AEK_CCDP}),
         AArch64CPUTestParams("thunderx2t99", "armv8.1-a",
-                             "crypto-neon-fp-armv8",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_LSE,
                               AArch64::AEK_RDM, AArch64::AEK_FP,
                               AArch64::AEK_SIMD}),
-        AArch64CPUTestParams(
-            "thunderx3t110",
-            "armv8.3-a", "crypto-neon-fp-armv8",
-            {AArch64::AEK_CRC, AArch64::AEK_AES, AArch64::AEK_SHA2,
-             AArch64::AEK_LSE, AArch64::AEK_RDM, AArch64::AEK_FP,
-             AArch64::AEK_SIMD, AArch64::AEK_RAS, AArch64::AEK_RCPC,
-             AArch64::AEK_JSCVT, AArch64::AEK_FCMA, AArch64::AEK_PAUTH,
-             AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("thunderx", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("thunderx3t110", "armv8.3-a",
+                             {AArch64::AEK_CRC, AArch64::AEK_AES,
+                              AArch64::AEK_SHA2, AArch64::AEK_LSE,
+                              AArch64::AEK_RDM, AArch64::AEK_FP,
+                              AArch64::AEK_SIMD, AArch64::AEK_RAS,
+                              AArch64::AEK_RCPC, AArch64::AEK_JSCVT,
+                              AArch64::AEK_FCMA, AArch64::AEK_PAUTH,
+                              AArch64::AEK_PERFMON}),
+        AArch64CPUTestParams("thunderx", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_SIMD,
                               AArch64::AEK_FP, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("thunderxt81", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("thunderxt81", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_SIMD,
                               AArch64::AEK_FP, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("thunderxt83", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("thunderxt83", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_SIMD,
                               AArch64::AEK_FP, AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("thunderxt88", "armv8-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("thunderxt88", "armv8-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_SIMD,
                               AArch64::AEK_FP, AArch64::AEK_PERFMON}),
         AArch64CPUTestParams(
-            "tsv110", "armv8.2-a", "crypto-neon-fp-armv8",
+            "tsv110", "armv8.2-a",
             {AArch64::AEK_CRC, AArch64::AEK_AES,
              AArch64::AEK_SHA2, AArch64::AEK_FP, AArch64::AEK_SIMD,
              AArch64::AEK_RAS, AArch64::AEK_LSE, AArch64::AEK_RDM,
              AArch64::AEK_PROFILE, AArch64::AEK_JSCVT, AArch64::AEK_FCMA,
              AArch64::AEK_FP16, AArch64::AEK_FP16FML, AArch64::AEK_DOTPROD,
              AArch64::AEK_PERFMON}),
-        AArch64CPUTestParams("a64fx", "armv8.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("a64fx", "armv8.2-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_FP16,
                               AArch64::AEK_RAS, AArch64::AEK_LSE,
                               AArch64::AEK_SVE, AArch64::AEK_RDM,
                               AArch64::AEK_PERFMON, AArch64::AEK_FCMA}),
-        AArch64CPUTestParams("carmel", "armv8.2-a", "crypto-neon-fp-armv8",
+        AArch64CPUTestParams("carmel", "armv8.2-a",
                              {AArch64::AEK_CRC, AArch64::AEK_AES,
                               AArch64::AEK_SHA2, AArch64::AEK_FP,
                               AArch64::AEK_SIMD, AArch64::AEK_FP16,
                               AArch64::AEK_RAS, AArch64::AEK_LSE,
                               AArch64::AEK_RDM}),
         AArch64CPUTestParams(
-            "oryon-1", "armv8.6-a", "crypto-neon-fp-armv8",
+            "oryon-1", "armv8.6-a",
             {AArch64::AEK_CRC,     AArch64::AEK_FP,      AArch64::AEK_PAUTH,
              AArch64::AEK_FCMA,    AArch64::AEK_JSCVT,   AArch64::AEK_SIMD,
              AArch64::AEK_RAS,     AArch64::AEK_LSE,     AArch64::AEK_RDM,