progs/perftest.c: Use from Glibc syscall numbers.

[catacomb] / symm / rijndael-base.c

diff --git a/symm/rijndael-base.c b/symm/rijndael-base.c
index 3d2bb8e..2f65191 100644 (file)
--- a/symm/rijndael-base.c
+++ b/symm/rijndael-base.c
@@ -112,20 +112,38 @@ static void simple_setup(rijndael_ctx *k, unsigned nb,
     k->wi[i] = k->w[j + jj++];
 }
 
-CPU_DISPATCH(static, EMPTY, void, setup, (rijndael_ctx *k, unsigned nb,
-                                         const void *buf, unsigned nk),
+CPU_DISPATCH(static, EMPTY, void, setup,
+            (rijndael_ctx *k, unsigned nb, const void *buf, unsigned nk),
             (k, nb, buf, nk), pick_setup, simple_setup)
 
-#ifdef CPUFAM_X86
-extern setup__functype rijndael_setup_x86_aesni;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern setup__functype rijndael_setup_x86ish_aesni;
+extern setup__functype rijndael_setup_x86ish_aesni_avx;
+#endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+extern setup__functype rijndael_setup_arm_crypto;
+#endif
+#if CPUFAM_ARM64
+extern setup__functype rijndael_setup_arm64_crypto;
 #endif
 
 static setup__functype *pick_setup(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86_aesni,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni_avx,
+                    cpu_feature_p(CPUFEAT_X86_AVX) &&
+                    cpu_feature_p(CPUFEAT_X86_AESNI));
+  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni,
                     cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_arm_crypto,
+                    cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
+#if CPUFAM_ARM64
+  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_arm64_crypto,
+                    cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
   DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
 }