Patch AVX2 support: No Win for Sphincs+ (#1478)

2025-10-04 00:02:01 -04:00 · 2023-05-20 18:38:14 +02:00 · 2023-05-20 18:38:14 +02:00 · 6e1f49aa48
commit 6e1f49aa48
parent 36f3994388
3 changed files with 327 additions and 4 deletions
--- a/.CMake/alg_support.cmake
+++ b/.CMake/alg_support.cmake
@ -305,64 +305,88 @@ endif()

 option(OQS_ENABLE_SIG_SPHINCS "Enable sphincs algorithm family" ON)
 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_128f_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_128f_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_sha2_128f_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_128s_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_128s_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_sha2_128s_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_192f_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_192f_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_sha2_192f_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_192s_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_192s_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_sha2_192s_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_256f_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_256f_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_sha2_256f_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_256s_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_sha2_256s_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_sha2_256s_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_128f_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_128f_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_shake_128f_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_128s_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_128s_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_shake_128s_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_192f_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_192f_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_shake_192f_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_192s_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_192s_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_shake_192s_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_256f_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_256f_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_shake_256f_simple" OFF)
 endif()
+endif()

 cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_256s_simple "" ON "OQS_ENABLE_SIG_SPHINCS" OFF)
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
 if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))
    cmake_dependent_option(OQS_ENABLE_SIG_sphincs_shake_256s_simple_avx2 "" ON "OQS_ENABLE_SIG_sphincs_shake_256s_simple" OFF)
 endif()
+endif()

 ##### OQS_COPY_FROM_UPSTREAM_FRAGMENT_ADD_ENABLE_BY_ALG_END

--- a/appveyor_build.bat
+++ b/appveyor_build.bat
@ -2,19 +2,18 @@
 IF %COMPILER%==cygwin (
    @echo on
    SET "PATH=C:\cywin64\bin;c:\cygwin64;%PATH%"
-    c:\cygwin64\bin\bash.exe -lc "setup-x86_64.exe -qnNdO -R C:/cygwin64 -l C:/cygwin/var/cache/setup -P openssl -P libssl-devel -P ninja -P cmake -P gcc && cd ${APPVEYOR_BUILD_FOLDER} && openssl version && cygcheck -c && pwd && mkdir build && cd build && cmake .. -GNinja -DCMAKE_C_COMPILER=gcc -DOQS_DIST_BUILD=ON -DOQS_ENABLE_SIG_SPHINCS=OFF -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% && ninja "
+    c:\cygwin64\bin\bash.exe -lc "setup-x86_64.exe -qnNdO -R C:/cygwin64 -l C:/cygwin/var/cache/setup -P openssl -P libssl-devel -P ninja -P cmake -P gcc && cd ${APPVEYOR_BUILD_FOLDER} && openssl version && cygcheck -c && pwd && mkdir build && cd build && cmake .. -GNinja -DCMAKE_C_COMPILER=gcc -DOQS_DIST_BUILD=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% && ninja "
 )
 IF %COMPILER%==msys2 (
    @echo on
    SET "PATH=C:\msys64\mingw64\bin;%PATH%"
-    bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && mkdir build && cd build && cmake .. -GNinja -DOQS_DIST_BUILD=ON -DOQS_ENABLE_SIG_SPHINCS=OFF -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% && ninja"
+    bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && mkdir build && cd build && cmake .. -GNinja -DOQS_DIST_BUILD=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED% && ninja"
 )
 IF %COMPILER%==msvc2019 (
    @echo on
    CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
    mkdir build
    cd build
-    REM SPHINCS causes a big slowdown in the tests
-    cmake .. -GNinja -DOQS_DIST_BUILD=ON -DOQS_ENABLE_SIG_SPHINCS=OFF -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED%
+    cmake .. -GNinja -DOQS_DIST_BUILD=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED% -DOQS_USE_OPENSSL=%OQS_USE_OPENSSL% -DOQS_ALGS_ENABLED=%OQS_ALGS_ENABLED%
    ninja
 )
--- a/scripts/copy_from_upstream/patches/pqclean-sphincs.patch
+++ b/scripts/copy_from_upstream/patches/pqclean-sphincs.patch
@ -1,3 +1,149 @@
+diff --git a/crypto_sign/sphincs-sha2-128f-robust/META.yml b/crypto_sign/sphincs-sha2-128f-robust/META.yml
+index 6dfc899..f991e5b 100644
+--- a/crypto_sign/sphincs-sha2-128f-robust/META.yml
+++ b/crypto_sign/sphincs-sha2-128f-robust/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-128f-simple/META.yml b/crypto_sign/sphincs-sha2-128f-simple/META.yml
+index 08b3fcc..7752a6f 100644
+--- a/crypto_sign/sphincs-sha2-128f-simple/META.yml
+++ b/crypto_sign/sphincs-sha2-128f-simple/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-128s-robust/META.yml b/crypto_sign/sphincs-sha2-128s-robust/META.yml
+index dbe2ffd..70ac219 100644
+--- a/crypto_sign/sphincs-sha2-128s-robust/META.yml
+++ b/crypto_sign/sphincs-sha2-128s-robust/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-128s-simple/META.yml b/crypto_sign/sphincs-sha2-128s-simple/META.yml
+index c1d355a..d7c5b40 100644
+--- a/crypto_sign/sphincs-sha2-128s-simple/META.yml
+++ b/crypto_sign/sphincs-sha2-128s-simple/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-192f-robust/META.yml b/crypto_sign/sphincs-sha2-192f-robust/META.yml
+index 0d6f9fe..6b7167d 100644
+--- a/crypto_sign/sphincs-sha2-192f-robust/META.yml
+++ b/crypto_sign/sphincs-sha2-192f-robust/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-192f-simple/META.yml b/crypto_sign/sphincs-sha2-192f-simple/META.yml
+index e3de597..4865aac 100644
+--- a/crypto_sign/sphincs-sha2-192f-simple/META.yml
+++ b/crypto_sign/sphincs-sha2-192f-simple/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-192s-robust/META.yml b/crypto_sign/sphincs-sha2-192s-robust/META.yml
+index 0593604..7a0d6d8 100644
+--- a/crypto_sign/sphincs-sha2-192s-robust/META.yml
+++ b/crypto_sign/sphincs-sha2-192s-robust/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-192s-simple/META.yml b/crypto_sign/sphincs-sha2-192s-simple/META.yml
+index eea6ef5..1ca9aa8 100644
+--- a/crypto_sign/sphincs-sha2-192s-simple/META.yml
+++ b/crypto_sign/sphincs-sha2-192s-simple/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-256f-robust/META.yml b/crypto_sign/sphincs-sha2-256f-robust/META.yml
+index 1069de9..921056e 100644
+--- a/crypto_sign/sphincs-sha2-256f-robust/META.yml
+++ b/crypto_sign/sphincs-sha2-256f-robust/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-256f-simple/META.yml b/crypto_sign/sphincs-sha2-256f-simple/META.yml
+index 9dc3b5e..add1fa8 100644
+--- a/crypto_sign/sphincs-sha2-256f-simple/META.yml
+++ b/crypto_sign/sphincs-sha2-256f-simple/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-256s-robust/META.yml b/crypto_sign/sphincs-sha2-256s-robust/META.yml
+index 1930288..344d761 100644
+--- a/crypto_sign/sphincs-sha2-256s-robust/META.yml
+++ b/crypto_sign/sphincs-sha2-256s-robust/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-sha2-256s-simple/META.yml b/crypto_sign/sphincs-sha2-256s-simple/META.yml
+index a92feb7..0ffd034 100644
+--- a/crypto_sign/sphincs-sha2-256s-simple/META.yml
+++ b/crypto_sign/sphincs-sha2-256s-simple/META.yml
+@@ -34,3 +34,6 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+diff --git a/crypto_sign/sphincs-shake-128f-robust/META.yml b/crypto_sign/sphincs-shake-128f-robust/META.yml
+index 5fe71d5..abe113e 100644
+--- a/crypto_sign/sphincs-shake-128f-robust/META.yml
+++ b/crypto_sign/sphincs-shake-128f-robust/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-128f-robust/avx2/fips202x4.c b/crypto_sign/sphincs-shake-128f-robust/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -248,6 +394,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-128f-simple/META.yml b/crypto_sign/sphincs-shake-128f-simple/META.yml
+index ae8083d..c8497dc 100644
+--- a/crypto_sign/sphincs-shake-128f-simple/META.yml
+++ b/crypto_sign/sphincs-shake-128f-simple/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-128f-simple/avx2/fips202x4.c b/crypto_sign/sphincs-shake-128f-simple/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -498,6 +658,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-128s-robust/META.yml b/crypto_sign/sphincs-shake-128s-robust/META.yml
+index bff72cb..f7dc076 100644
+--- a/crypto_sign/sphincs-shake-128s-robust/META.yml
+++ b/crypto_sign/sphincs-shake-128s-robust/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-128s-robust/avx2/fips202x4.c b/crypto_sign/sphincs-shake-128s-robust/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -748,6 +922,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-128s-simple/META.yml b/crypto_sign/sphincs-shake-128s-simple/META.yml
+index 4effd0a..eb436b2 100644
+--- a/crypto_sign/sphincs-shake-128s-simple/META.yml
+++ b/crypto_sign/sphincs-shake-128s-simple/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-128s-simple/avx2/fips202x4.c b/crypto_sign/sphincs-shake-128s-simple/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -998,6 +1186,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-192f-robust/META.yml b/crypto_sign/sphincs-shake-192f-robust/META.yml
+index 2ec5f1b..370481e 100644
+--- a/crypto_sign/sphincs-shake-192f-robust/META.yml
+++ b/crypto_sign/sphincs-shake-192f-robust/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-192f-robust/avx2/fips202x4.c b/crypto_sign/sphincs-shake-192f-robust/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -1248,6 +1450,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-192f-simple/META.yml b/crypto_sign/sphincs-shake-192f-simple/META.yml
+index ad7e420..cb8385a 100644
+--- a/crypto_sign/sphincs-shake-192f-simple/META.yml
+++ b/crypto_sign/sphincs-shake-192f-simple/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-192f-simple/avx2/fips202x4.c b/crypto_sign/sphincs-shake-192f-simple/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -1498,6 +1714,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-192s-robust/META.yml b/crypto_sign/sphincs-shake-192s-robust/META.yml
+index 3003eac..6a4c03c 100644
+--- a/crypto_sign/sphincs-shake-192s-robust/META.yml
+++ b/crypto_sign/sphincs-shake-192s-robust/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-192s-robust/avx2/fips202x4.c b/crypto_sign/sphincs-shake-192s-robust/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -1748,6 +1978,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-192s-simple/META.yml b/crypto_sign/sphincs-shake-192s-simple/META.yml
+index 2c10b1e..df28047 100644
+--- a/crypto_sign/sphincs-shake-192s-simple/META.yml
+++ b/crypto_sign/sphincs-shake-192s-simple/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-192s-simple/avx2/fips202x4.c b/crypto_sign/sphincs-shake-192s-simple/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -1998,6 +2242,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-256f-robust/META.yml b/crypto_sign/sphincs-shake-256f-robust/META.yml
+index 92601fe..51da213 100644
+--- a/crypto_sign/sphincs-shake-256f-robust/META.yml
+++ b/crypto_sign/sphincs-shake-256f-robust/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-256f-robust/avx2/fips202x4.c b/crypto_sign/sphincs-shake-256f-robust/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -2248,6 +2506,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-256f-simple/META.yml b/crypto_sign/sphincs-shake-256f-simple/META.yml
+index 315495a..845b9ea 100644
+--- a/crypto_sign/sphincs-shake-256f-simple/META.yml
+++ b/crypto_sign/sphincs-shake-256f-simple/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-256f-simple/avx2/fips202x4.c b/crypto_sign/sphincs-shake-256f-simple/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -2498,6 +2770,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-256s-robust/META.yml b/crypto_sign/sphincs-shake-256s-robust/META.yml
+index 2bcff18..e332501 100644
+--- a/crypto_sign/sphincs-shake-256s-robust/META.yml
+++ b/crypto_sign/sphincs-shake-256s-robust/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-256s-robust/avx2/fips202x4.c b/crypto_sign/sphincs-shake-256s-robust/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000
@ -2748,6 +3034,20 @@ index 2b93c9c..0000000
 -                unsigned char *in3, unsigned long long inlen);
 -
 -#endif
+diff --git a/crypto_sign/sphincs-shake-256s-simple/META.yml b/crypto_sign/sphincs-shake-256s-simple/META.yml
+index 84898ac..544022e 100644
+--- a/crypto_sign/sphincs-shake-256s-simple/META.yml
+++ b/crypto_sign/sphincs-shake-256s-simple/META.yml
+@@ -34,6 +34,9 @@ implementations:
+     supported_platforms:
+       - architecture: x86_64
+         required_flags: ['avx2']
+        operating_systems:
+          - Linux
+          - Darwin
+   - name: aarch64
+     version: https://github.com/sphincs/sphincsplus/commit/ed15dd78658f63288c7492c00260d86154b84637
+     supported_platforms:
 diff --git a/crypto_sign/sphincs-shake-256s-simple/avx2/fips202x4.c b/crypto_sign/sphincs-shake-256s-simple/avx2/fips202x4.c
 deleted file mode 100644
 index 1e06fef..0000000