add BLAKE3 hash

.github/actions/verify-generated-files/action.yml

@@ -12,4 +12,5 @@ runs:
         ext/tokenizer/tokenizer_data_gen.php
         build/gen_stub.php -f
         build/gen_stub.php --generate-optimizer-info
+        ext/hash/blake3/fetch_upstream_blake3.sh
         git add . -N && git diff --exit-code

README.REDIST.BINS

@@ -18,6 +18,7 @@
 18. avifinfo (ext/standard/libavifinfo) see ext/standard/libavifinfo/LICENSE
 19. xxHash (ext/hash/xxhash)
 20. Lexbor (ext/dom/lexbor/lexbor) see ext/dom/lexbor/LICENSE
+21. BLAKE3 (ext/hash/blake3) see ext/hash/blake3/upstream_blake3/LICENSE
 
 
 3. pcre2lib (ext/pcre)

build/php.m4

@@ -2830,3 +2830,98 @@ AC_DEFUN([PHP_CHECK_AVX512_VBMI_SUPPORTS], [
   AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_VBMI_SUPPORTS],
    [$have_avx512_vbmi_supports], [Whether the compiler supports AVX512 VBMI])
 ])
+
+
+dnl PHP_CHECK_ARM_NEON_SUPPORT
+dnl check if we're compiling for ARM NEON
+AC_DEFUN([PHP_CHECK_ARM_NEON_SUPPORT], [
+  AC_CACHE_CHECK([for ARM NEON support],ac_cv_target_arm_neon,[
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+int main(void) {
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
+    return 0;
+#else
+    return 1;
+#endif
+}
+]])],[
+  ac_cv_target_arm_neon=yes
+],[
+  ac_cv_target_arm_neon=no
+],[
+  ac_cv_target_arm_neon=no
+])])
+])
+
+
+dnl
+dnl PHP_CHECK_X86_TARGET
+dnl
+dnl check if we're compiling for x86/x86_64
+dnl
+AC_DEFUN([PHP_CHECK_X86_TARGET], [
+  AC_CACHE_CHECK([for x86 target],ac_cv_target_x86,[
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+int main(void) {
+#if defined(__x86_64__) || defined(__i386__)
+    return 0;
+#else
+    return 1;
+#endif
+}
+]])],[
+  ac_cv_target_x86=yes
+],[
+  ac_cv_target_x86=no
+],[
+  ac_cv_target_x86=no
+])])
+])
+
+dnl
+dnl PHP_CHECK_WINDOWS_TARGET
+dnl
+dnl check if we're compiling for windows
+dnl
+AC_DEFUN([PHP_CHECK_WINDOWS_TARGET], [
+  AC_CACHE_CHECK([for windows target],ac_cv_target_windows,[
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+int main(void) {
+#if defined(_WIN32)
+    return 0;
+#else
+    return 1;
+#endif
+}
+]])],[
+  ac_cv_target_windows=yes
+],[
+  ac_cv_target_windows=no
+],[
+  ac_cv_target_windows=no
+])])
+])
+
+dnl
+dnl PHP_CHECK_UNIX_TARGET
+dnl
+dnl check if we're compiling for a unix-ish target
+dnl
+AC_DEFUN([PHP_CHECK_UNIX_TARGET], [
+  AC_CACHE_CHECK([for unix-ish target],ac_cv_target_unix,[
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+int main(void) {
+#if defined(unix) || defined(__unix) || defined(__unix__)
+    return 0;
+#else
+    return 1;
+#endif
+}
+]])],[
+  ac_cv_target_unix=yes
+],[
+  ac_cv_target_unix=no
+],[
+  ac_cv_target_unix=no
+])])
+])

configure.ac

@@ -339,6 +339,19 @@ PHP_EBCDIC
 dnl Check whether the system byte ordering is bigendian.
 PHP_C_BIGENDIAN
 
+dnl Check if we're targeting x86 / x86_64
+PHP_CHECK_X86_TARGET
+
+dnl Check if we're targeting ARM Neon CPUs
+PHP_CHECK_ARM_NEON_SUPPORT
+
+
+dnl Check if we're targeting Windows
+PHP_CHECK_WINDOWS_TARGET
+
+dnl Check whether we're targeting a unix-ish system
+PHP_CHECK_UNIX_TARGET
+
 dnl Check whether writing to stdout works.
 PHP_TEST_WRITE_STDOUT
 

ext/hash/blake3/fetch_upstream_blake3.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# afaik the PHP project doesn't allow git submodules, so we do this fetcher script instead.
+cd "$(dirname "$0")"
+rm -rf upstream_blake3
+# fancy way of fetching only the files we want
+git clone --branch '1.5.0' -n --depth=1 --filter=tree:0 'https://github.com/BLAKE3-team/BLAKE3.git' 'upstream_blake3'
+cd upstream_blake3
+git sparse-checkout set --no-cone LICENSE c/blake3.c  c/blake3.h  c/blake3_avx2.c  c/blake3_avx2_x86-64_unix.S \
+ c/blake3_avx2_x86-64_windows_gnu.S  c/blake3_avx2_x86-64_windows_msvc.asm  c/blake3_avx512.c \
+ c/blake3_avx512_x86-64_unix.S  c/blake3_avx512_x86-64_windows_gnu.S  c/blake3_avx512_x86-64_windows_msvc.asm \
+ c/blake3_dispatch.c  c/blake3_impl.h  c/blake3_neon.c  c/blake3_portable.c  c/blake3_sse2.c \
+ c/blake3_sse2_x86-64_unix.S  c/blake3_sse2_x86-64_windows_gnu.S  c/blake3_sse2_x86-64_windows_msvc.asm \
+ c/blake3_sse41.c  c/blake3_sse41_x86-64_unix.S  c/blake3_sse41_x86-64_windows_gnu.S \
+ c/blake3_sse41_x86-64_windows_msvc.asm
+git checkout
+rm -rf .git
+cd ..
+git apply patches.diff

ext/hash/blake3/patches.diff

@@ -0,0 +1,80 @@
+diff --git a/ext/hash/blake3/upstream_blake3/c/blake3.c b/ext/hash/blake3/upstream_blake3/c/blake3.c
+index 692f4b0216..3591ba245a 100644
+--- a/ext/hash/blake3/upstream_blake3/c/blake3.c
++++ b/ext/hash/blake3/upstream_blake3/c/blake3.c
+@@ -341,21 +341,23 @@ INLINE void compress_subtree_to_parent_node(
+   size_t num_cvs = blake3_compress_subtree_wide(input, input_len, key,
+                                                 chunk_counter, flags, cv_array);
+   assert(num_cvs <= MAX_SIMD_DEGREE_OR_2);
+-
+-  // If MAX_SIMD_DEGREE is greater than 2 and there's enough input,
+-  // compress_subtree_wide() returns more than 2 chaining values. Condense
+-  // them into 2 by forming parent nodes repeatedly.
+-  uint8_t out_array[MAX_SIMD_DEGREE_OR_2 * BLAKE3_OUT_LEN / 2];
+-  // The second half of this loop condition is always true, and we just
++  // https://github.com/BLAKE3-team/BLAKE3/pull/380
++  // This condition is always true, and we just
+   // asserted it above. But GCC can't tell that it's always true, and if NDEBUG
+   // is set on platforms where MAX_SIMD_DEGREE_OR_2 == 2, GCC emits spurious
+   // warnings here. GCC 8.5 is particularly sensitive, so if you're changing
+   // this code, test it against that version.
+-  while (num_cvs > 2 && num_cvs <= MAX_SIMD_DEGREE_OR_2) {
++#if MAX_SIMD_DEGREE_OR_2 > 2
++  // If MAX_SIMD_DEGREE_OR_2 is greater than 2 and there's enough input,
++  // compress_subtree_wide() returns more than 2 chaining values. Condense
++  // them into 2 by forming parent nodes repeatedly.
++  uint8_t out_array[MAX_SIMD_DEGREE_OR_2 * BLAKE3_OUT_LEN / 2];
++  while (num_cvs > 2) {
+     num_cvs =
+         compress_parents_parallel(cv_array, num_cvs, key, flags, out_array);
+     memcpy(cv_array, out_array, num_cvs * BLAKE3_OUT_LEN);
+   }
++#endif
+   memcpy(out, cv_array, 2 * BLAKE3_OUT_LEN);
+ }
+
+diff --git a/ext/hash/blake3/upstream_blake3/c/blake3_dispatch.c b/ext/hash/blake3/upstream_blake3/c/blake3_dispatch.c
+index af6c3dadc7..af3bf17bbe 100644
+--- a/ext/hash/blake3/upstream_blake3/c/blake3_dispatch.c
++++ b/ext/hash/blake3/upstream_blake3/c/blake3_dispatch.c
+@@ -86,7 +86,6 @@ static void cpuidex(uint32_t out[4], uint32_t id, uint32_t sid) {
+ #endif
+ }
+
+-#endif
+
+ enum cpu_feature {
+   SSE2 = 1 << 0,
+@@ -161,6 +160,8 @@ static
+ #endif
+   }
+ }
++// https://github.com/BLAKE3-team/BLAKE3/pull/382
++#endif
+
+ void blake3_compress_in_place(uint32_t cv[8],
+                               const uint8_t block[BLAKE3_BLOCK_LEN],
+diff --git a/ext/hash/blake3/upstream_blake3/c/blake3_neon.c b/ext/hash/blake3/upstream_blake3/c/blake3_neon.c
+index 8a818fc78f..c4b4548edf 100644
+--- a/ext/hash/blake3/upstream_blake3/c/blake3_neon.c
++++ b/ext/hash/blake3/upstream_blake3/c/blake3_neon.c
+@@ -9,15 +9,13 @@
+ #endif
+
+ INLINE uint32x4_t loadu_128(const uint8_t src[16]) {
+-  // vld1q_u32 has alignment requirements. Don't use it.
+-  uint32x4_t x;
+-  memcpy(&x, src, 16);
+-  return x;
++    // https://github.com/BLAKE3-team/BLAKE3/pull/384
++    return vreinterpretq_u32_u8(vld1q_u8(src));
+ }
+
+ INLINE void storeu_128(uint32x4_t src, uint8_t dest[16]) {
+-  // vst1q_u32 has alignment requirements. Don't use it.
+-  memcpy(dest, &src, 16);
++    // https://github.com/BLAKE3-team/BLAKE3/pull/384
++    vst1q_u8(dest, vreinterpretq_u8_u32(src));
+ }
+
+ INLINE uint32x4_t add_128(uint32x4_t a, uint32x4_t b) {