*.c: Check for ARM64 SIMD before using the accelerated code.

I don't expect ARM64 processors to omit the SIMD instructions, but it's
convenient to have a way to inhibit the accelerated code (e.g., for
performance measurement).

diff --git a/symm/chacha.c b/symm/chacha.c
index 71522003daa005dae9aa342cde4eb10c3ebec23f..f70ee9fb155145530ef332f43819ee49f8e5eb2d 100644 (file)
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -93,7 +93,8 @@ static core__functype *pick_core(void)
                     cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
 #if CPUFAM_ARM64
                     cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
 #if CPUFAM_ARM64

-  DISPATCH_PICK_COND(chacha_core, chacha_core_arm64, 1);
+  DISPATCH_PICK_COND(chacha_core, chacha_core_arm64,
+                    cpu_feature_p(CPUFEAT_ARM_NEON));

 #endif
   DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
 }
 #endif
   DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
 }

diff --git a/symm/salsa20.c b/symm/salsa20.c
index 03fcf469e8f46dc5de86f5aafaf717a21b157c9d..f424b7461b474c76f2c443dfc54dcc459857ad49 100644 (file)
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -93,7 +93,8 @@ static core__functype *pick_core(void)
                     cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
 #if CPUFAM_ARM64
                     cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
 #if CPUFAM_ARM64

-  DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64, 1);
+  DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64,
+                    cpu_feature_p(CPUFEAT_ARM_NEON));

 #endif
   DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
 }
 #endif
   DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
 }