Merge pull request #4151 from akyrtzi/reenable-blake3-simd

[Support/BLAKE3] Re-enable BLAKE3 assembly implementation

Author: akyrtzi

llvm/lib/Support/BLAKE3/CMakeLists.txt

@@ -4,9 +4,6 @@ set(LLVM_BLAKE3_FILES
   blake3_portable.c
 )
 
-# Temporary disable assembly until rdar://91050484 is investigated.
-set(CAN_USE_ASSEMBLER FALSE)
-
 # The BLAKE3 team recommends using the assembly versions, from the README:
 #
 # "For each of the x86 SIMD instruction sets, four versions are available:
@@ -21,9 +18,17 @@ if (MSVC)
 else()
   check_symbol_exists(__x86_64__ "" IS_X64)
   check_symbol_exists(__aarch64__ "" IS_ARM64)
+
+  if (IS_X64)
+    # Clang-6 needs this flag.
+    set_source_files_properties(blake3_avx512_x86-64_windows_gnu.S
+     PROPERTIES COMPILE_OPTIONS "-mavx512vl")
+    set_source_files_properties(blake3_avx512_x86-64_unix.S
+     PROPERTIES COMPILE_OPTIONS "-mavx512vl")
+  endif()
 endif()
 
-if (IS_X64 AND CAN_USE_ASSEMBLER)
+if (IS_X64)
   if (MSVC)
     enable_language(ASM_MASM)
     list(APPEND LLVM_BLAKE3_FILES
@@ -55,9 +60,5 @@ if (IS_ARM64)
   )
 endif()
 
-if (IS_X64 AND NOT CAN_USE_ASSEMBLER)
-  add_definitions(-DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 -DBLAKE3_NO_SSE2)
-endif()
-
 add_library(LLVMSupportBlake3 OBJECT EXCLUDE_FROM_ALL ${LLVM_BLAKE3_FILES})
 llvm_update_compile_flags(LLVMSupportBlake3)