drewcassidy/quicktex
1
0
Fork 0
mirror of https://github.com/drewcassidy/quicktex.git synced 2024-09-13 06:37:34 +00:00
Code Issues Projects Releases Activity

Begin integrating xsimd

Browse Source
This commit is contained in:
Andrew Cassidy 2022-05-20 20:46:45 -07:00
parent 79f77a24b2
commit 8c77356aca
6 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -0,0 +1,3 @@
[submodule "external/xsimd"]
path = external/xsimd
url = https://github.com/xtensor-stack/xsimd.git

6
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.18)
include(tools/CompilerWarnings.cmake)
include(tools/CPUFeatures.cmake)
include(tools/SIMDFlags.cmake)
set(CMAKE_VERBOSE_MAKEFILE ON)
project(quicktex)
@ -10,6 +10,8 @@ find_package(Python COMPONENTS Interpreter Development.Module)
find_package(pybind11 CONFIG REQUIRED)
find_package(OpenMP)
add_subdirectory(external/xsimd)
# Collect source files
file(GLOB SOURCE_FILES
"quicktex/*.cpp"
@ -51,7 +53,7 @@ if (OpenMP_CXX_FOUND)
target_link_libraries(_quicktex PUBLIC OpenMP::OpenMP_CXX)
endif ()
target_link_libraries(_quicktex PUBLIC hwy)
target_link_libraries(_quicktex PUBLIC xsimd)
# Set module features, like C/C++ standards
target_compile_features(_quicktex PUBLIC cxx_std_17 c_std_11)

1
external/xsimd vendored Submodule

@ -0,0 +1 @@
Subproject commit 1577b02d549cca52aa5e943c16f2600950480289

2
quicktex/tests/_bindings.cpp
View File

@ -39,6 +39,6 @@ using namespace quicktex::tests;
void InitCTests(py::module_ &quicktex) {
py::module_ ctests = quicktex.def_submodule("_ctests", "Internal tests for C-level functions");
ctests.def("test_WidenSumS16", &TestWidenSumS16);
// ctests.def("test_WidenSumS16", &TestWidenSumS16);
}
} // namespace quicktex::bindings

70
tools/CPUFeatures.cmake
View File

@ -1,70 +0,0 @@
function(set_simd_flags target_name)
if (DEFINED ENV{QUICKTEX_HWY_MODE})
set(highway_mode $ENV{QUICKTEX_HWY_MODE})
message("Highway mode is ${highway_mode}")
else ()
message("Defaulting to AUTO highway mode")
set(highway_mode "AUTO")
endif ()
if ((CMAKE_OSX_ARCHITECTURES MATCHES ".*x86_64.*") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)"))
set(X86 TRUE)
message("X86 Detected")
else ()
set(X86 FALSE)
endif ()
if ((CMAKE_OSX_ARCHITECTURES MATCHES ".*arm64.*") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)|(aarch64)"))
set(ARM TRUE)
message("ARM Detected")
else ()
set(ARM FALSE)
endif ()
if (highway_mode STREQUAL "SCALAR")
# force Highway to use scalar ops. This should really only be used for testing
if (MSVC)
target_compile_options(${target_name} PUBLIC /DHWY_COMPILE_ONLY_SCALAR=1)
else ()
target_compile_options(${target_name} PUBLIC -DHWY_COMPILE_ONLY_SCALAR=1)
endif ()
return()
endif ()
# dynamic disbatch is not supported
if (MSVC)
target_compile_options(${target_name} PUBLIC /DHWY_COMPILE_ONLY_STATIC=1)
else ()
target_compile_options(${target_name} PUBLIC -DHWY_COMPILE_ONLY_STATIC=1)
endif ()
if (X86)
if (highway_mode STREQUAL "AUTO")
# setting -march=native on an M1 causes Clang to freak out
if (MSVC)
#MSVC has no -march=native equivalent. womp
message(WARNING "Compiling using MSVC without settig an explicit QUICKTEX_HWY_MODE defaults to serial operations. Please compile with Clang if you need vectorization")
elseif (!ARM)
target_compile_options(${target_name} PUBLIC -march=native)
endif ()
elseif (highway_mode STREQUAL "SSSE3")
if (MSVC)
message(SEND_ERROR "Compiling using SSSE3 is not supported with the MSVC compiler. Please use AVX or compile withClang")
else ()
target_compile_options(${target_name} PUBLIC -mssse3)
endif ()
elseif (highway_mode STREQUAL "SSE4")
if (MSVC)
message(SEND_ERROR "Compiling using SSE4 is not supported with the MSVC compiler. Please use AVX or compile with Clang")
else ()
target_compile_options(${target_name} PUBLIC -msse4)
endif ()
elseif (highway_mode STREQUAL "AVX2")
if (MSVC)
target_compile_options(${target_name} PUBLIC /arch:AVX2)
else ()
target_compile_options(${target_name} PUBLIC -mavx2)
endif ()
endif ()
endif ()
endfunction()

64
tools/SIMDFlags.cmake Normal file
View File

@ -0,0 +1,64 @@
function(set_simd_flags target_name)
if (DEFINED ENV{QUICKTEX_SIMD_MODE})
set(simd_mode $ENV{QUICKTEX_SIMD_MODE})
message("SIMD mode is ${simd_mode}")
else ()
message("Defaulting to AUTO SIMD mode. Resulting binary is not fit for distributing to other computers!")
set(simd_mode "AUTO")
endif ()
if ((CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)"))
set(X86 TRUE)
message("X86 Detected")
else ()
set(X86 FALSE)
endif ()
if ((CMAKE_OSX_ARCHITECTURES MATCHES "arm64") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)|(aarch64)"))
set(ARM TRUE)
message("ARM Detected")
else ()
set(ARM FALSE)
endif ()
if (simd_mode STREQUAL "SCALAR")
# force xsimd to use scalar ops. This should really only be used for testing,
# since SSE2 and NEON are guranteed on 64-bit platforms
if (MSVC)
target_compile_options(${target_name} PUBLIC /DXSIMD_NO_SUPPORTED_ARCHITECTURE=1)
else ()
target_compile_options(${target_name} PUBLIC -DXSIMD_NO_SUPPORTED_ARCHITECTURE=1)
endif ()
return()
endif ()
if (X86)
if (simd_mode STREQUAL "AUTO")
if (MSVC)
#MSVC has no -march=native equivalent. womp
elseif (!ARM)
# setting -march=native on an M1 causes Clang to freak out,
# and arm64 is pretty samey instruction set wise (arm9 and SVE2 notwithstanding)
target_compile_options(${target_name} PUBLIC -march=native)
endif ()
elseif (simd_mode STREQUAL "SSSE3")
if (MSVC)
target_compile_options(${target_name} PUBLIC /DXSIMD_WITH_SSSE3)
else ()
target_compile_options(${target_name} PUBLIC -mssse3)
endif ()
elseif (simd_mode STREQUAL "SSE4")
if (MSVC)
target_compile_options(${target_name} PUBLIC /DXSIMD_WITH_SSE4_2 /d2archSSE42)
else ()
target_compile_options(${target_name} PUBLIC -msse4)
endif ()
elseif (simd_mode STREQUAL "AVX2")
if (MSVC)
target_compile_options(${target_name} PUBLIC /arch:AVX2)
else ()
target_compile_options(${target_name} PUBLIC -mavx2)
endif ()
endif ()
endif ()
endfunction()