github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace USE_ARM_SVE with HAVE_SVE.

Browse Source 
Change-Id: I469efaac197cba93201f2ca6eca78ca61be3054d
This commit is contained in:
George Wort 2021-07-16 13:21:14 +01:00 committed by Konstantinos Margaritis
parent 8242f46ed7
commit ab5d4d9279
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -312,6 +312,9 @@ elseif (ARCH_ARM32 OR ARCH_AARCH64)
CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_C_ARM_NEON_H) CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_C_ARM_NEON_H)
if (BUILD_SVE OR BUILD_SVE2 OR BUILD_SVE2_BITPERM) if (BUILD_SVE OR BUILD_SVE2 OR BUILD_SVE2_BITPERM)
CHECK_INCLUDE_FILE_CXX(arm_sve.h HAVE_C_ARM_SVE_H) CHECK_INCLUDE_FILE_CXX(arm_sve.h HAVE_C_ARM_SVE_H)
if (NOT HAVE_C_ARM_SVE_H)
message(FATAL_ERROR "arm_sve.h is required to build for SVE.")
endif()
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flax-vector-conversions") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flax-vector-conversions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions")

8
cmake/arch.cmake
View File

@ -41,10 +41,10 @@ if (ARCH_AARCH64)
svuint8_t a = svbsl(svdup_u8(1), svdup_u8(2), svdup_u8(3)); svuint8_t a = svbsl(svdup_u8(1), svdup_u8(2), svdup_u8(3));
(void)a; (void)a;
}" HAVE_SVE2) }" HAVE_SVE2)
if (HAVE_SVE2) endif()
if (HAVE_SVE2 OR HAVE_SVE2_BITPERM)
add_definitions(-DHAVE_SVE2) add_definitions(-DHAVE_SVE2)
endif () endif ()
endif()
if (BUILD_SVE) if (BUILD_SVE)
set(CMAKE_C_FLAGS "-march=${GNUCC_ARCH} ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-march=${GNUCC_ARCH} ${CMAKE_C_FLAGS}")
CHECK_C_SOURCE_COMPILES("#include <arm_sve.h> CHECK_C_SOURCE_COMPILES("#include <arm_sve.h>
@ -52,9 +52,9 @@ if (ARCH_AARCH64)
svuint8_t a = svdup_u8(1); svuint8_t a = svdup_u8(1);
(void)a; (void)a;
}" HAVE_SVE) }" HAVE_SVE)
if (HAVE_SVE)
add_definitions(-DHAVE_SVE)
endif () endif ()
if (HAVE_SVE OR HAVE_SVE2 OR HAVE_SVE2_BITPERM)
add_definitions(-DHAVE_SVE)
endif () endif ()
set(CMAKE_C_FLAGS "${PREV_FLAGS}") set(CMAKE_C_FLAGS "${PREV_FLAGS}")
endif() endif()

11
src/util/intrinsics.h
View File

@ -47,15 +47,6 @@
#if defined(HAVE_C_ARM_NEON_H) #if defined(HAVE_C_ARM_NEON_H)
# define USE_ARM_NEON_H # define USE_ARM_NEON_H
# if defined(HAVE_C_ARM_SVE_H)
# define USE_ARM_SVE
# if defined(BUILD_SVE2)
# define USE_ARM_SVE2
# if defined(BUILD_SVE2_BITPERM)
# define USE_ARM_SVE2_BITPERM
# endif
# endif
# endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
@ -74,7 +65,7 @@
#include <intrin.h> #include <intrin.h>
#elif defined(USE_ARM_NEON_H) #elif defined(USE_ARM_NEON_H)
#include <arm_neon.h> #include <arm_neon.h>
# if defined(USE_ARM_SVE) # if defined(HAVE_SVE)
# include <arm_sve.h> # include <arm_sve.h>
# endif # endif
#else #else