This reverts commit
da5d00ad0cf4d45e38287280c670b08e84e27411.
This caused -Wmacro-redefined
```
.../libc/src/string/memory_utils/op_x86.h:31:9: error: '_mm512_cmpneq_epi8_mask' macro redefined [-Werror,-Wmacro-redefined]
^
.../lib/clang/google3-trunk/include/avx512bwintrin.h:294:9: note: previous definition is here
^
```
set(ALL_CPU_FEATURES "")
if(${LIBC_TARGET_ARCHITECTURE_IS_X86})
- set(ALL_CPU_FEATURES SSE2 SSE4_2 AVX2 AVX512F AVX512BW FMA)
+ set(ALL_CPU_FEATURES SSE2 SSE4_2 AVX2 AVX512F FMA)
set(LIBC_COMPILE_OPTIONS_NATIVE -march=native)
elseif(${LIBC_TARGET_ARCHITECTURE_IS_AARCH64})
set(LIBC_COMPILE_OPTIONS_NATIVE -mcpu=native)
add_bcmp(bcmp_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2)
add_bcmp(bcmp_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2)
add_bcmp(bcmp_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2)
- add_bcmp(bcmp_x86_64_opt_avx512 COMPILE_OPTIONS -march=skylake-avx512 REQUIRE AVX512BW)
+ add_bcmp(bcmp_x86_64_opt_avx512 COMPILE_OPTIONS -march=skylake-avx512 REQUIRE AVX512F)
add_bcmp(bcmp_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE})
add_bcmp(bcmp)
else()
add_memcmp(memcmp_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2)
add_memcmp(memcmp_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2)
add_memcmp(memcmp_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2)
- add_memcmp(memcmp_x86_64_opt_avx512 COMPILE_OPTIONS -march=skylake-avx512 REQUIRE AVX512BW)
+ add_memcmp(memcmp_x86_64_opt_avx512 COMPILE_OPTIONS -march=skylake-avx512 REQUIRE AVX512F)
add_memcmp(memcmp_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE})
add_memcmp(memcmp)
elseif(${LIBC_TARGET_ARCHITECTURE_IS_AARCH64})
#include "src/string/memory_utils/op_builtin.h"
#include "src/string/memory_utils/op_generic.h"
-#if defined(__AVX512BW__) || defined(__AVX512F__) || defined(__AVX2__) || \
- defined(__SSE2__)
+#ifdef __SSE2__
#include <immintrin.h>
-#endif
-
+#else
// Define fake functions to prevent the compiler from failing on undefined
-// functions in case the CPU extension is not present.
-#ifndef __AVX512BW__
+// functions in case SSE2 is not present.
#define _mm512_cmpneq_epi8_mask(A, B) 0
-#endif
-#ifndef __AVX2__
-#define _mm256_movemask_epi8(A) 0
-#endif
-#ifndef __SSE2__
#define _mm_movemask_epi8(A) 0
-#endif
+#define _mm256_movemask_epi8(A) 0
+#endif // __SSE2__
namespace __llvm_libc::x86 {