From cebb66f290c483f3e2037838e8161d43d39df0b8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 29 Dec 2022 10:53:26 +0000 Subject: [PATCH] SIMD must always be enabled, even in debug builds Signed-off-by: falkTX --- deps/Makefile | 8 +++++--- plugins/Makefile | 11 ++++++++++- src/Makefile | 11 ++++++++++- src/Makefile.cardinal.mk | 11 ++++++++++- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 764e00d..4540c8e 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -324,14 +324,16 @@ endif # unwanted in this build SURGE_CXX_FLAGS += -DJUCE_DSP_ENABLE_SNAP_TO_ZERO=0 -# required by JUCE -ifneq ($(NOSIMD),true) +# SIMD must always be enabled, even in debug builds +ifeq ($(NOSIMD),true) +SURGE_CXX_FLAGS += -DCARDINAL_NOSIMD +else ifeq ($(DEBUG),true) ifeq ($(WASM),true) SURGE_CXX_FLAGS += -msse -msse2 -msse3 -msimd128 else ifeq ($(CPU_ARM32),true) SURGE_CXX_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard else ifeq ($(CPU_I386_OR_X86_64),true) -SURGE_CXX_FLAGS += -msse -msse2 +SURGE_CXX_FLAGS += -msse -msse2 -mfpmath=sse endif endif diff --git a/plugins/Makefile b/plugins/Makefile index 09bd940..3f59508 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1187,8 +1187,17 @@ ifeq ($(HEADLESS),true) BASE_FLAGS += -DHEADLESS endif -ifneq (,$(findstring true,$(DEBUG)$(NOSIMD))) +# SIMD must always be enabled, even in debug builds +ifeq ($(NOSIMD),true) BASE_FLAGS += -DCARDINAL_NOSIMD +else ifeq ($(DEBUG),true) +ifeq ($(WASM),true) +BASE_FLAGS += -msse -msse2 -msse3 -msimd128 +else ifeq ($(CPU_ARM32),true) +BASE_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard +else ifeq ($(CPU_I386_OR_X86_64),true) +BASE_FLAGS += -msse -msse2 -mfpmath=sse +endif endif ifeq ($(BSD)$(WASM),true) diff --git a/src/Makefile b/src/Makefile index d610fef..ea787fe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -83,8 +83,17 @@ ifeq ($(HEADLESS),true) BASE_FLAGS += -DHEADLESS endif -ifneq (,$(findstring true,$(DEBUG)$(NOSIMD))) +# SIMD must always be enabled, even in debug builds +ifeq ($(NOSIMD),true) BASE_FLAGS += -DCARDINAL_NOSIMD +else ifeq ($(DEBUG),true) +ifeq ($(WASM),true) +BASE_FLAGS += -msse -msse2 -msse3 -msimd128 +else ifeq ($(CPU_ARM32),true) +BASE_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard +else ifeq ($(CPU_I386_OR_X86_64),true) +BASE_FLAGS += -msse -msse2 -mfpmath=sse +endif endif ifeq ($(BSD),true) diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index eaf683e..0dbf35d 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -298,8 +298,17 @@ ifeq ($(HEADLESS),true) BASE_FLAGS += -DHEADLESS endif -ifneq (,$(findstring true,$(DEBUG)$(NOSIMD))) +# SIMD must always be enabled, even in debug builds +ifeq ($(NOSIMD),true) BASE_FLAGS += -DCARDINAL_NOSIMD +else ifeq ($(DEBUG),true) +ifeq ($(WASM),true) +BASE_FLAGS += -msse -msse2 -msse3 -msimd128 +else ifeq ($(CPU_ARM32),true) +BASE_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard +else ifeq ($(CPU_I386_OR_X86_64),true) +BASE_FLAGS += -msse -msse2 -mfpmath=sse +endif endif ifeq ($(MOD_BUILD),true)