Skip to content

Commit

Permalink
remove blake3 calls, hopefully fix compiling
Browse files Browse the repository at this point in the history
  • Loading branch information
SolDev69 committed Aug 29, 2024
1 parent 3735d02 commit 83db31f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 35 deletions.
9 changes: 0 additions & 9 deletions src/util/blake3/blake3_dispatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,6 @@ void blake3_hash_many(const uint8_t *const *inputs, size_t num_inputs,
#endif
#endif

#if BLAKE3_USE_NEON == 1
blake3_hash_many_neon(inputs, num_inputs, blocks, key, counter,
increment_counter, flags, flags_start, flags_end, out);
return;
#endif

blake3_hash_many_portable(inputs, num_inputs, blocks, key, counter,
increment_counter, flags, flags_start, flags_end,
out);
Expand Down Expand Up @@ -300,9 +294,6 @@ size_t blake3_simd_degree(void) {
return 4;
}
#endif
#endif
#if BLAKE3_USE_NEON == 1
return 4;
#endif
return 1;
}
26 changes: 0 additions & 26 deletions src/util/blake3/blake3_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,8 @@ enum blake3_flags {
#endif
#endif

#if !defined(BLAKE3_USE_NEON)
// If BLAKE3_USE_NEON not manually set, autodetect based on AArch64ness
#if defined(IS_AARCH64)
#if defined(__ARM_BIG_ENDIAN)
#define BLAKE3_USE_NEON 0
#else
#define BLAKE3_USE_NEON 1
#endif
#else
#define BLAKE3_USE_NEON 0
#endif
#endif

#if defined(IS_X86)
#define MAX_SIMD_DEGREE 16
#elif BLAKE3_USE_NEON == 1
#define MAX_SIMD_DEGREE 4
#else
#define MAX_SIMD_DEGREE 1
#endif

// There are some places where we want a static size that's equal to the
Expand Down Expand Up @@ -273,13 +256,4 @@ void blake3_hash_many_avx512(const uint8_t *const *inputs, size_t num_inputs,
#endif
#endif

#if BLAKE3_USE_NEON == 1
void blake3_hash_many_neon(const uint8_t *const *inputs, size_t num_inputs,
size_t blocks, const uint32_t key[8],
uint64_t counter, bool increment_counter,
uint8_t flags, uint8_t flags_start,
uint8_t flags_end, uint8_t *out);
#endif


#endif /* BLAKE3_IMPL_H */

0 comments on commit 83db31f

Please sign in to comment.