From 6e512a3b1ad215a992532740124568a67c72988f Mon Sep 17 00:00:00 2001
From: Alexander Wagner <alexander.wagner@ulal.de>
Date: Sun, 30 Apr 2023 18:25:27 +0200
Subject: [PATCH] keccak: Add keccak_p fns for [200, 400, 800, 1600] (#55)

Due to the generics approach of the keccak_p routine, the performance
degrades significantly. To encounter this the commonly used functions
are now defined by macros.
---
 keccak/src/lib.rs | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/keccak/src/lib.rs b/keccak/src/lib.rs
index f3c42db..0e35a3b 100644
--- a/keccak/src/lib.rs
+++ b/keccak/src/lib.rs
@@ -160,20 +160,32 @@ impl_lanesize!(u32, 22, |rc: u64| {
 impl_lanesize!(u64, 24, |rc: u64| { rc });
 
 macro_rules! impl_keccak {
-    ($name:ident, $type:ty) => {
+    ($pname:ident, $fname:ident, $type:ty) => {
+
+        /// Keccak-p sponge function
+        pub fn $pname(state: &mut [$type; PLEN], round_count: usize) {
+            keccak_p(state, round_count);
+        }
+
         /// Keccak-f sponge function
-        pub fn $name(state: &mut [$type; PLEN]) {
+        pub fn $fname(state: &mut [$type; PLEN]) {
             keccak_p(state, <$type>::KECCAK_F_ROUND_COUNT);
         }
     };
 }
 
-impl_keccak!(f200, u8);
-impl_keccak!(f400, u16);
-impl_keccak!(f800, u32);
+impl_keccak!(p200, f200, u8);
+impl_keccak!(p400, f400, u16);
+impl_keccak!(p800, f800, u32);
 
 #[cfg(not(all(target_arch = "aarch64", feature = "asm")))]
-impl_keccak!(f1600, u64);
+impl_keccak!(p1600, f1600, u64);
+
+/// Keccak-p[1600, rc] permutation.
+#[cfg(all(target_arch = "aarch64", feature = "asm"))]
+pub fn p1600(state: &mut [u64; PLEN], round_count: usize) {
+    keccak_p(state, round_count);
+}
 
 /// Keccak-f[1600] permutation.
 #[cfg(all(target_arch = "aarch64", feature = "asm"))]
@@ -211,9 +223,9 @@ pub mod simd {
     impl_lanesize_simd_u64xn!(u64x4);
     impl_lanesize_simd_u64xn!(u64x8);
 
-    impl_keccak!(f1600x2, u64x2);
-    impl_keccak!(f1600x4, u64x4);
-    impl_keccak!(f1600x8, u64x8);
+    impl_keccak!(p1600x2, f1600x2, u64x2);
+    impl_keccak!(p1600x4, f1600x4, u64x4);
+    impl_keccak!(p1600x8, f1600x8, u64x8);
 }
 
 #[allow(unused_assignments)]