~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/perftest.c: Rename `c_start', `c_stop' to `c0', c1'.
[catacomb]
/
symm
/
chacha.c
diff --git
a/symm/chacha.c
b/symm/chacha.c
index
655ecd0
..
9b83eea
100644
(file)
--- a/
symm/chacha.c
+++ b/
symm/chacha.c
@@
-72,15
+72,22
@@
static void simple_core(unsigned r, const chacha_matrix src,
#if CPUFAM_X86 || CPUFAM_AMD64
extern core__functype chacha_core_x86ish_sse2;
#if CPUFAM_X86 || CPUFAM_AMD64
extern core__functype chacha_core_x86ish_sse2;
+extern core__functype chacha_core_x86ish_avx;
#endif
#if CPUFAM_ARMEL
extern core__functype chacha_core_arm_neon;
#endif
#endif
#if CPUFAM_ARMEL
extern core__functype chacha_core_arm_neon;
#endif
+#if CPUFAM_ARM64
+extern core__functype chacha_core_arm64;
+#endif
+
static core__functype *pick_core(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
static core__functype *pick_core(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(chacha_core, chacha_core_x86ish_avx,
+ cpu_feature_p(CPUFEAT_X86_AVX));
DISPATCH_PICK_COND(chacha_core, chacha_core_x86ish_sse2,
cpu_feature_p(CPUFEAT_X86_SSE2));
#endif
DISPATCH_PICK_COND(chacha_core, chacha_core_x86ish_sse2,
cpu_feature_p(CPUFEAT_X86_SSE2));
#endif
@@
-88,6
+95,9
@@
static core__functype *pick_core(void)
DISPATCH_PICK_COND(chacha_core, chacha_core_arm_neon,
cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
DISPATCH_PICK_COND(chacha_core, chacha_core_arm_neon,
cpu_feature_p(CPUFEAT_ARM_NEON));
#endif
+#if CPUFAM_ARM64
+ DISPATCH_PICK_COND(chacha_core, chacha_core_arm64, 1);
+#endif
DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
}
DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
}
@@
-747,7
+757,7
@@
static grand *grinit(const void *k, size_t ksz, const void *n,
g->r.r.ops = ops;
g->r.ops = myops;
chacha_init(&g->ctx, k, ksz, 0);
g->r.r.ops = ops;
g->r.ops = myops;
chacha_init(&g->ctx, k, ksz, 0);
- myops->setnonce(g, n);
+
if (n)
myops->setnonce(g, n);
return (&g->r.r);
}
return (&g->r.r);
}