From bdc428dd78fe13d759b5cc6fc8e5e2a77860baf5 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Wed, 19 Oct 2022 17:51:06 -0400
Subject: [PATCH] Replace sse2neon with simde.

---
 .gitmodules             | 6 +++---
 dep/Makefile            | 8 ++++----
 dep/simde               | 1 +
 dep/sse2neon            | 1 -
 include/simd/common.hpp | 9 ++-------
 5 files changed, 10 insertions(+), 15 deletions(-)
 create mode 160000 dep/simde
 delete mode 160000 dep/sse2neon

diff --git a/.gitmodules b/.gitmodules
index 7c93c563..c2d7ad37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,12 +34,12 @@
 [submodule "dep/rtmidi"]
 	path = dep/rtmidi
 	url = https://github.com/VCVRack/rtmidi.git
-[submodule "dep/sse2neon"]
-	path = dep/sse2neon
-	url = https://github.com/DLTcollab/sse2neon.git
 [submodule "dep/tinyexpr"]
 	path = dep/tinyexpr
 	url = https://github.com/codeplea/tinyexpr.git
 [submodule "dep/speexdsp"]
 	path = dep/speexdsp
 	url = https://gitlab.xiph.org/xiph/speexdsp.git
+[submodule "dep/simde"]
+	path = dep/simde
+	url = https://github.com/simd-everywhere/simde.git
diff --git a/dep/Makefile b/dep/Makefile
index 7d2964cc..87c1278b 100755
--- a/dep/Makefile
+++ b/dep/Makefile
@@ -56,7 +56,7 @@ pffft = include/pffft.h
 fuzzysearchdatabase = include/FuzzySearchDatabase.hpp
 ghcfilesystem = include/ghc/filesystem.hpp
 tinyexpr = include/tinyexpr.h
-sse2neon = include/sse2neon.h
+simde = include/simde
 
 DEPS += $(glew)
 DEPS += $(glfw)
@@ -75,7 +75,7 @@ DEPS += $(pffft)
 DEPS += $(fuzzysearchdatabase)
 DEPS += $(ghcfilesystem)
 DEPS += $(tinyexpr)
-DEPS += $(sse2neon)
+DEPS += $(simde)
 
 
 DEP_LOCAL := .
@@ -258,9 +258,9 @@ $(tinyexpr): tinyexpr/tinyexpr.h
 	mkdir -p include
 	cp $^ include/
 
-$(sse2neon): sse2neon/sse2neon.h
+$(simde): simde/simde
 	mkdir -p include
-	cp $^ include/
+	cp -R $^ include/
 
 # Helpers
 
diff --git a/dep/simde b/dep/simde
new file mode 160000
index 00000000..dd0b662f
--- /dev/null
+++ b/dep/simde
@@ -0,0 +1 @@
+Subproject commit dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4
diff --git a/dep/sse2neon b/dep/sse2neon
deleted file mode 160000
index 988782cb..00000000
--- a/dep/sse2neon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 988782cbadf95c2072b4b1b2b8fa0afa81b01c36
diff --git a/include/simd/common.hpp b/include/simd/common.hpp
index 718414a9..aa687cfc 100644
--- a/include/simd/common.hpp
+++ b/include/simd/common.hpp
@@ -1,9 +1,4 @@
 #pragma once
 
-#if defined ARCH_X64
-	// Intel intrinsics header
-	#include <x86intrin.h>
-#elif defined ARCH_ARM64
-	// Translation header for using SSE3 intrinsics on ARM64 NEON
-	#include <sse2neon.h>
-#endif
+#define SIMDE_ENABLE_NATIVE_ALIASES
+#include <simde/x86/sse3.h>