FIPS202 ASM: Sync filenames and function symbol names

Signed-off-by: Hanno Becker <beckphan@amazon.co.uk>
pq-code-package · Oct 2, 2024 · 3226337 · 3226337
1 parent 958350f
commit 3226337
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/.../aarch64/keccak_f1600_x1_scalar_opt_a55.S → .../aarch64/keccak_f1600_x1_scalar_asm_opt.S b/.../aarch64/keccak_f1600_x1_scalar_opt_a55.S → .../aarch64/keccak_f1600_x1_scalar_asm_opt.S
@@ -194,11 +194,11 @@ round_constants:
 
 .text
 .balign 16
-.global keccak_f1600_x1_scalar_slothy_opt_a55
-.global _keccak_f1600_x1_scalar_slothy_opt_a55
+.global keccak_f1600_x1_scalar_asm_opt
+.global _keccak_f1600_x1_scalar_asm_opt
 
-keccak_f1600_x1_scalar_slothy_opt_a55:
-_keccak_f1600_x1_scalar_slothy_opt_a55:
+keccak_f1600_x1_scalar_asm_opt:
+_keccak_f1600_x1_scalar_asm_opt:
  alloc_stack
  save_gprs
 

diff --git a/.../asm/aarch64/keccak_f1600_x1_v84a_clean.S → .../aarch64/keccak_f1600_x1_v84a_asm_clean.S b/.../asm/aarch64/keccak_f1600_x1_v84a_clean.S → .../aarch64/keccak_f1600_x1_v84a_asm_clean.S
diff --git a/.../asm/aarch64/keccak_f1600_x2_v48a_clean.S → .../aarch64/keccak_f1600_x2_v84a_asm_clean.S b/.../asm/aarch64/keccak_f1600_x2_v48a_clean.S → .../aarch64/keccak_f1600_x2_v84a_asm_clean.S
diff --git a/...aarch64/keccak_f1600_x2_v8a_v84a_hybrid.S → ...h64/keccak_f1600_x2_v8a_v84a_asm_hybrid.S b/...aarch64/keccak_f1600_x2_v8a_v84a_hybrid.S → ...h64/keccak_f1600_x2_v8a_v84a_asm_hybrid.S
diff --git a/.../keccak_f1600_x4_v84a_scalar_hybrid_opt.S → ...cak_f1600_x4_scalar_v84a_asm_hybrid_opt.S b/.../keccak_f1600_x4_v84a_scalar_hybrid_opt.S → ...cak_f1600_x4_scalar_v84a_asm_hybrid_opt.S
diff --git a/...4/keccak_f1600_x4_v8a_scalar_hybrid_opt.S → ...ccak_f1600_x4_v8a_scalar_hybrid_asm_opt.S b/...4/keccak_f1600_x4_v8a_scalar_hybrid_opt.S → ...ccak_f1600_x4_v8a_scalar_hybrid_asm_opt.S
diff --git a/...cak_f1600_x4_v8a_v84a_scalar_hybrid_opt.S → ...f1600_x4_v8a_v84a_scalar_hybrid_asm_opt.S b/...cak_f1600_x4_v8a_v84a_scalar_hybrid_opt.S → ...f1600_x4_v8a_v84a_scalar_hybrid_asm_opt.S
@@ -904,13 +904,13 @@ round_constants:
  ror sAsu, sAsu,#(64-55)
 .endm
 
-.global keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_opt
-.global _keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_opt
+.global keccak_f1600_x4_scalar_v8a_v84a_hybrid_asm_opt
+.global _keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_asm_opt
 .text
 .align 4
 
-keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_opt:
-_keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_opt:
+keccak_f1600_x4_scalar_v8a_v84a_hybrid_asm_opt:
+_keccak_f1600_x4_scalar_v8a_v84a_hybrid_asm_opt:
  alloc_stack
  save_gprs
  save_vregs

diff --git a/fips202/asm/asm.h b/fips202/asm/asm.h
@@ -7,13 +7,13 @@
 #include "config.h"
 
 #ifdef MLKEM_USE_AARCH64_ASM
-void keccak_f1600_x1_scalar_slothy_opt_a55(uint64_t *state);
+void keccak_f1600_x1_scalar_asm_opt(uint64_t *state);
 void keccak_f1600_x1_v84a_asm_clean(uint64_t *state);
 void keccak_f1600_x2_v84a_asm_clean(uint64_t *state);
 void keccak_f1600_x2_v8a_v84a_asm_hybrid(uint64_t *state);
 void keccak_f1600_x4_scalar_v8a_asm_hybrid_opt(uint64_t *state);
 void keccak_f1600_x4_scalar_v84a_asm_hybrid_opt(uint64_t *state);
-void keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_opt(uint64_t *state);
+void keccak_f1600_x4_scalar_v8a_v84a_hybrid_asm_opt(uint64_t *state);
 
 /*
  * The FIPS202 ASM profile decides which implementation(s) of FIPS202 to use.

diff --git a/fips202/asm/profiles/cortex_a55.h b/fips202/asm/profiles/cortex_a55.h
@@ -10,6 +10,6 @@
 // On Cortex-A55, we use lazy rotation assembly for Keccak-x1,
 // but no batched assembly implementation.
 #define MLKEM_USE_FIPS202_X1_ASM
-#define keccak_f1600_x1_asm keccak_f1600_x1_scalar_slothy_opt_a55
+#define keccak_f1600_x1_asm keccak_f1600_x1_scalar_asm_opt
 
 #endif /* FIPS202_ASM_PROFILE_H */
diff --git a/fips202/asm/profiles/default.h b/fips202/asm/profiles/default.h
@@ -27,7 +27,7 @@
 #define keccak_f1600_x1_asm keccak_f1600_x1_v84a_asm_clean
 #elif !defined(SYS_AARCH64_SLOW_BARREL_SHIFTER)
 #define MLKEM_USE_FIPS202_X1_ASM
-#define keccak_f1600_x1_asm keccak_f1600_x1_scalar_slothy_opt_a55
+#define keccak_f1600_x1_asm keccak_f1600_x1_scalar_asm_opt
 #endif /* !SYS_AARCH64_SLOW_BARREL_SHIFTER */
 
 // Keccak-f1600x2/x4
@@ -50,7 +50,7 @@
 #define keccak_f1600_x2_asm keccak_f1600_x2_v84a_asm_clean
 #else /* __APPLE__ */
 #define MLKEM_USE_FIPS202_X4_ASM
-#define keccak_f1600_x4_asm keccak_f1600_x4_scalar_v8a_v84a_asm_hybrid_opt
+#define keccak_f1600_x4_asm keccak_f1600_x4_scalar_v8a_v84a_hybrid_asm_opt
 #endif /* __APPLE__ */
 
 #else /* __ARM_FEATURE_SHA3 */