From 418ecaba3e6271a2b3bf2e202fa85085d67adc47 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Thu, 24 Mar 2022 11:28:24 -0700 Subject: [PATCH] [Support/BLAKE3] Temporarily disable building the assembly files to get the builders back to green --- llvm/lib/Support/BLAKE3/CMakeLists.txt | 5 +++-- llvm/lib/Support/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt index 763eba5..4746c2f3 100644 --- a/llvm/lib/Support/BLAKE3/CMakeLists.txt +++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt @@ -11,7 +11,8 @@ set(LLVM_BLAKE3_FILES # version using C intrinsics. The assembly versions are generally # preferred. They perform better, they perform more consistently across # different compilers, and they build more quickly." -if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$") +# FIXME: Figure out what is wrong with the builders when using the assembly files. +if (FALSE)#CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$") if (MSVC) list(APPEND LLVM_BLAKE3_FILES BLAKE3/blake3_sse2_x86-64_windows_msvc.asm @@ -36,7 +37,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$") endif() endif() -if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm") +if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|aarch)") list(APPEND LLVM_BLAKE3_FILES BLAKE3/blake3_neon.c ) diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index 4cc0a97..b4ae4e8 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -106,6 +106,9 @@ add_subdirectory(BLAKE3) if (MSVC) enable_language(ASM_MASM) endif() +# FIXME: Figure out what is wrong with the builders when using the assembly files. +add_definitions(-DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 -DBLAKE3_NO_SSE2) + add_llvm_component_library(LLVMSupport AArch64TargetParser.cpp -- 2.7.4