RISC-V 64: Add assembly code for SHA-512

Cleanup RISC-V 64 SHA-256 by removing unused rev_idx.
wolfSSL · Aug 6, 2024 · 05a5dd2 · 05a5dd2
1 parent 9aa0742
commit 05a5dd2
Show file tree

Hide file tree

Showing 5 changed files with 1,743 additions and 15 deletions.
diff --git a/src/include.am b/src/include.am
@@ -234,6 +234,9 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha256
 endif BUILD_RISCV_ASM
 
 if BUILD_SHA512
+if BUILD_RISCV_ASM
+src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha512.c
+else
 if BUILD_ARMASM_NEON
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512.c
 if BUILD_ARMASM_INLINE
@@ -262,6 +265,7 @@ endif BUILD_INTELASM
 endif !BUILD_X86_ASM
 endif !BUILD_ARMASM
 endif !BUILD_ARMASM_NEON
+endif !BUILD_RISCV_ASM
 endif BUILD_SHA512
 
 if BUILD_SHA3
@@ -393,6 +397,9 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha256
 endif BUILD_RISCV_ASM
 
 if BUILD_SHA512
+if BUILD_RISCV_ASM
+src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha512.c
+else
 if BUILD_ARMASM_NEON
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512.c
 if BUILD_ARMASM_INLINE
@@ -419,6 +426,7 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512_asm.S
 endif BUILD_INTELASM
 endif !BUILD_ARMASM
 endif !BUILD_ARMASM_NEON
+endif !BUILD_RISCV_ASM
 endif BUILD_SHA512
 
 if BUILD_SHA3
@@ -738,6 +746,9 @@ endif !BUILD_FIPS_CURRENT
 
 if !BUILD_FIPS_CURRENT
 if BUILD_SHA512
+if BUILD_RISCV_ASM
+src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha512.c
+else
 if BUILD_ARMASM_NEON
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512.c
 if BUILD_ARMASM_INLINE
@@ -766,6 +777,7 @@ endif BUILD_INTELASM
 endif !BUILD_X86_ASM
 endif !BUILD_ARMASM
 endif !BUILD_ARMASM_NEON
+endif !BUILD_RISCV_ASM
 endif BUILD_SHA512
 endif !BUILD_FIPS_CURRENT
 

diff --git a/wolfcrypt/src/port/riscv/riscv-64-sha256.c b/wolfcrypt/src/port/riscv/riscv-64-sha256.c
@@ -600,13 +600,6 @@ static WC_INLINE void Sha256Transform(wc_Sha256* sha256, const byte* data,
              (0b010 << 12) | (0b1110111 << 0) |     \
              (vd << 7) | (vs1 << 15) | (vs2 << 20))
 
-#ifndef WOLFSSL_RISCV_VECTOR_BASE_BIT_MANIPULATION
-/* Indecies to use with gather vector instruction to reverse bytes. */
-static const word32 rev_idx[4] = {
-    0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f
-};
-#endif /* !WOLFSSL_RISCV_VECTOR_BASE_BIT_MANIPULATION */
-
 #define RND4(w0, w1, w2, w3, k)                     \
     /* Four rounds of compression. */               \
     VADD_VV(REG_V7, w0, k)                          \
@@ -690,9 +683,6 @@ static void Sha256Transform(wc_Sha256* sha256, const byte* data,
 
         : [blocks] "+r" (blocks), [data] "+r" (data), [k] "+r" (k)
         : [digest] "r" (sha256->digest)
-#ifndef WOLFSSL_RISCV_VECTOR_BASE_BIT_MANIPULATION
-          , [rev_idx] "r" (rev_idx)
-#endif
         : "cc", "memory", "t0", "t1"
     );
 }
@@ -884,10 +874,6 @@ static WC_INLINE void Sha256Final(wc_Sha256* sha256, byte* hash)
 #endif
         :
         : [digest] "r" (sha256->digest), [hash] "r" (hash)
-#if defined(WOLFSSL_RISCV_VECTOR_CRYPTO_ASM) && \
-    !defined(WOLFSSL_RISCV_VECTOR_BASE_BIT_MANIPULATION)
-          , [rev_idx] "r" (rev_idx)
-#endif
         : "cc", "memory", "t0", "t1", "t2", "t3", "t4", "t5", "t6",
           "a4", "a5", "a6", "a7"
     );