diff --git a/CMakeLists.txt b/CMakeLists.txt index 928b6cb1..afa0dddb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -952,15 +952,15 @@ else () set (DISPATCHER_DEFINE "${DISPATCHER_DEFINE} -DDISABLE_AVX512VBMI_DISPATCH") endif (NOT BUILD_AVX512VBMI) if(BUILD_SSE2_SIMDE) - set (DISPATCHER_DEFINE "${DISPATCHER_DEFINE} -DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2") + set (DISPATCHER_DEFINE "${DISPATCHER_DEFINE} -DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2") endif(BUILD_SSE2_SIMDE) set_source_files_properties(src/dispatcher.c PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-unused-function ${DISPATCHER_DEFINE}") if(BUILD_SSE2_SIMDE AND NOT BUILD_AVX2 AND NOT BUILD_AVX512 AND NOT BUILD_AVX512VBMI) set_source_files_properties(src/crc32.c PROPERTIES - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2") + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2") set_source_files_properties(src/hs.cpp PROPERTIES - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2") + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2") string(REGEX REPLACE "-msse4.2" "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE "-msse4.2" "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") @@ -981,7 +981,7 @@ else () set_target_properties(hs_exec_core2 PROPERTIES string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2" RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} core2 ${CMAKE_MODULE_PATH}/keep.syms.in" ) else() @@ -1049,12 +1049,12 @@ else () set_target_properties(hs_compile PROPERTIES string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2" ) set_target_properties(hs PROPERTIES string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2" ) endif (BUILD_SSE2_SIMDE) @@ -1078,14 +1078,14 @@ else () set_target_properties(hs_exec_shared_core2 PROPERTIES string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2" POSITION_INDEPENDENT_CODE TRUE RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} core2 ${CMAKE_MODULE_PATH}/keep.syms.in" ) set_target_properties(hs_compile_shared PROPERTIES string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REGEX REPLACE "-msse4.2" "-msse2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -march=core2 -msse2" + COMPILE_FLAGS "-DVS_SIMDE_BACKEND -DVS_SIMDE_NATIVE -DSIMDE_ENABLE_NATIVE_ALIASES -march=core2 -msse2" ) else() add_library(hs_exec_shared_core2 OBJECT ${hs_exec_SRCS}) diff --git a/cmake/simde.cmake b/cmake/simde.cmake index 9b15e177..998e858f 100644 --- a/cmake/simde.cmake +++ b/cmake/simde.cmake @@ -26,8 +26,8 @@ if (SIMDE_SSE42_H_FOUND) set(ARCH_C_FLAGS "-msse2") set(ARCH_CXX_FLAGS "-msse2") set(X86_ARCH "x86-64") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVS_SIMDE_NATIVE -DVS_SIMDE_BACKEND") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVS_SIMDE_NATIVE -DVS_SIMDE_BACKEND") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVS_SIMDE_NATIVE -DVS_SIMDE_BACKEND -DSIMDE_ENABLE_NATIVE_ALIASES") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVS_SIMDE_NATIVE -DVS_SIMDE_BACKEND -DSIMDE_ENABLE_NATIVE_ALIASES") endif() if (SIMDE_NATIVE AND NOT BUILD_SSE2_SIMDE) diff --git a/src/util/arch/x86/crc32.h b/src/util/arch/x86/crc32.h index 61bdbf6f..158bf43b 100644 --- a/src/util/arch/x86/crc32.h +++ b/src/util/arch/x86/crc32.h @@ -30,8 +30,12 @@ #ifndef UTIL_ARCH_X86_CRC32_H_ #define UTIL_ARCH_X86_CRC32_H_ +#if defined(VS_SIMDE_BACKEN) +#include "util/simd_types.h" +#else #include "util/arch/x86/x86.h" #include "util/intrinsics.h" +#endif #ifdef ARCH_64_BIT #define CRC_WORD 8 diff --git a/src/util/simd_types.h b/src/util/simd_types.h index 5290680f..5f7a35e2 100644 --- a/src/util/simd_types.h +++ b/src/util/simd_types.h @@ -39,7 +39,10 @@ #ifndef VECTORSIZE #define VECTORSIZE 16 #endif + +#ifndef SIMDE_ENABLE_NATIVE_ALIASES #define SIMDE_ENABLE_NATIVE_ALIASES +#endif #if !defined(VS_SIMDE_NATIVE) #define SIMDE_NO_NATIVE #endif