From bcb5eaadd0b810b399fbdb133253bbc9ec7f060e Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Wed, 11 May 2016 15:14:49 +0100 Subject: [PATCH] [Fix] Fix compilation issue --- contrib/mumhash/mum.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/mumhash/mum.h b/contrib/mumhash/mum.h index 9391de0a6..a9a661661 100644 --- a/contrib/mumhash/mum.h +++ b/contrib/mumhash/mum.h @@ -232,7 +232,7 @@ _mum_final (uint64_t h) { } #if defined(__x86_64__) && defined(__GNUC__) - +#if 0 /* We want to use AVX2 insn MULX instead of generic x86-64 MULQ where it is possible. Although on modern Intel processors MULQ takes 3-cycles vs. 4 for MULX, MULX permits more freedom in insn @@ -242,6 +242,7 @@ _mum_hash_avx2 (const void * key, size_t len, uint64_t seed) { return _mum_final (_mum_hash_aligned (seed + len, key, len)); } #endif +#endif #ifndef _MUM_UNALIGNED_ACCESS #if defined(__x86_64__) || defined(__i386__) || defined(__PPC64__) \ @@ -350,11 +351,12 @@ mum_hash64 (uint64_t key, uint64_t seed) { static inline uint64_t mum_hash (const void *key, size_t len, uint64_t seed) { #if defined(__x86_64__) && defined(__GNUC__) - static int avx2_support = 0; +#if 0 + static int avx2_support = 0; if (avx2_support > 0) return _mum_hash_avx2 (key, len, seed); -#if 0 + else if (! avx2_support) { __builtin_cpu_init (); avx2_support = __builtin_cpu_supports ("avx2") ? 1 : -1; -- 2.39.5