Support AVX on ARM via SIMDe

Author: ruberith

CMake/Common.cmake

@@ -17,11 +17,8 @@ if (USE_DOUBLE_PRECISION)
 endif (USE_DOUBLE_PRECISION)
 
 cmake_dependent_option(USE_AVX "Use AVX" ON "NOT USE_DOUBLE_PRECISION" OFF)
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-	set(USE_AVX OFF)
-endif()
 if (USE_AVX)
-	message(STATUS "If your CPU does not support AVX, turn off the USE_AVX flag.")
+	message(STATUS "If your CPU does not support SIMD, turn off the USE_AVX flag.")
 	add_definitions(-DUSE_AVX)
 endif()
 
@@ -88,17 +85,21 @@ if (UNIX OR MINGW)
 	if (CI_BUILD)
 		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64")
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=x86-64")
-	elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=apple-m1")
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -mcpu=apple-m1")
+	elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=native")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -mcpu=native")
 	else()
 		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native")
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=native")
 	endif ()
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
 	if (USE_AVX)
-		add_compile_options("-mavx")
-		add_compile_options("-mfma")
+		if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+			add_compile_options("-mcpu=native+fp+simd")
+		else()
+			add_compile_options("-mavx")
+			add_compile_options("-mfma")
+		endif()
 	endif()
 endif (UNIX OR MINGW)
 if(MINGW)

SPlisHSPlasH/Utilities/AVX_math.h

@@ -5,7 +5,9 @@
 #include <iomanip>
 #include <vector>
 #include <memory>
-#include <immintrin.h>
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include "extern/simde/x86/avx.h"
+#include "extern/simde/x86/fma.h"
 
 #include "SPlisHSPlasH/Common.h"
 
@@ -1014,7 +1016,7 @@ class AlignmentAllocator {
 	inline pointer allocate(size_type n) {
 #ifdef _WIN32
 		return (pointer)_aligned_malloc(n * sizeof(value_type), N);
-#elif __linux__
+#elif defined(__linux__) || defined(__APPLE__)
 		// NB! Argument order is opposite from MSVC/Windows
 		return (pointer) aligned_alloc(N, n * sizeof(value_type));
 #else
@@ -1025,7 +1027,7 @@ class AlignmentAllocator {
 	inline void deallocate(pointer p, size_type) {
 #ifdef _WIN32
 		_aligned_free(p);
-#elif __linux__
+#elif defined(__linux__) || defined(__APPLE__)
 		free(p);
 #else
 #error "Unknown platform"

extern/simde/COPYING.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2017 Evan Nemerson <evan@nemerson.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.