From a9b70a8b7b373fba340a2b6abf85032f028aac5c Mon Sep 17 00:00:00 2001
From: Argyrios Kyrtzidis <kyrtzidis@apple.com>
Date: Thu, 24 Mar 2022 11:40:28 -0700
Subject: [PATCH] [Support/BLAKE3] Temporarily disable building neon file to
get builders back to green
---
llvm/lib/Support/BLAKE3/CMakeLists.txt | 4 ++--
llvm/lib/Support/CMakeLists.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt
index 4746c2f38f16..51a6ee84768d 100644
--- a/llvm/lib/Support/BLAKE3/CMakeLists.txt
+++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt
@@ -11,7 +11,7 @@ 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."
-# FIXME: Figure out what is wrong with the builders when using the assembly files.
+# FIXME: Figure out what is wrong with the builders when using the assembly files and neon.
if (FALSE)#CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
if (MSVC)
list(APPEND LLVM_BLAKE3_FILES
@@ -37,7 +37,7 @@ if (FALSE)#CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
endif()
endif()
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|aarch)")
+if (FALSE)#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 b4ae4e89dab6..edaf5db2867e 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -107,7 +107,7 @@ 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_definitions(-DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 -DBLAKE3_NO_SSE2 -DBLAKE3_USE_NEON=0)
add_llvm_component_library(LLVMSupport
--
GitLab