Changes to allow a lua-free arm64ec build (#7832)

These diffs allow surge to build arm64ec standalone and clap in a way that works. Loads of caveats though which I will outline in #7830 

---------

Co-authored-by: Paul Walker (Baconpaul) <[email protected]>

Author: baconpaul

.github/workflows/build-pr.yml

@@ -27,6 +27,13 @@ jobs:
             cmakeOpt: DEBUG
             runTests: false
 
+          - name: "windows msvc arm64ec"
+            os: windows-latest
+            target: surge-xt_Standalone
+            cmakeConfig: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 -DSURGE_SKIP_LUA=TRUE
+            cmakeOpt: DEBUG
+            runTests: false
+
           - name: "windows clang"
             os: windows-latest
             target: surge-xt_Standalone

CMakeLists.txt

@@ -160,8 +160,13 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
 endif()
 
 if(MSVC)
+  if (("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64ec") OR ("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64"))
+    message(STATUS "Skipping warning as error (-WX) on arm64ec for now")
+  else()
+    add_compile_options(-WX)
+  endif()
+
   add_compile_options(
-    -WX       # treat all warnings as errors
 
     # MSVC-only warnings, Clang-cl silently ignores these
     /wd4244   # float to double

libs/sst/sst-plugininfra

@@ -336,6 +336,10 @@ elseif(WIN32)
     UNICODE
     _UNICODE
   )
+
+  message(STATUS "Adding simde interface library on windows")
+  target_link_libraries(${PROJECT_NAME} PUBLIC surge::simde)
+
 endif()
 
 option(SURGE_RELIABLE_VERSION_INFO "Update version info on every build (off: generate only at configuration time)" ON)

src/common/CMakeLists.txt

@@ -1178,11 +1178,18 @@ void Parameter::set_type(int ctrltype)
         break;
     case ct_ensemble_stages:
     {
+#if defined(_M_ARM64EC)
+        valtype = vt_int;
+        val_min.i = 0;
+        val_max.i = 1;
+        val_default.i = 0;
+#else
         extern int ensemble_stage_count();
         valtype = vt_int;
         val_min.i = 0;
         val_max.i = ensemble_stage_count() - 1;
         val_default.i = 0;
+#endif
         break;
     }
     case ct_stringosc_excitation_model:
@@ -4064,8 +4071,12 @@ std::string Parameter::get_display(bool external, float ef) const
         break;
         case ct_ensemble_stages:
         {
+#if defined(_M_ARM64EC)
+            txt = "name";
+#else
             extern std::string ensemble_stage_name(int);
             txt = ensemble_stage_name(i);
+#endif
         }
         break;
         case ct_reson_mode:

src/common/Parameter.cpp

@@ -20,6 +20,7 @@
  * https://github.com/surge-synthesizer/surge
  */
 
+#include "globals.h"
 #include "DSPExternalAdapterUtils.h"
 #include "sst/filters/FilterPlotter.h"
 

src/common/dsp/DSPExternalAdapterUtils.cpp

@@ -19,7 +19,11 @@
  * All source for Surge XT is available at
  * https://github.com/surge-synthesizer/surge
  */
+
+#if !defined(_M_ARM64EC)
 #include "BBDEnsembleEffect.h"
+#endif
+
 #include "BonsaiEffect.h"
 #include "ChorusEffectImpl.h"
 #include "CombulatorEffect.h"
@@ -104,7 +108,11 @@ Effect *spawn_effect(int id, SurgeStorage *storage, FxStorage *fxdata, pdata *pd
     case fxt_tape:
         return new chowdsp::TapeEffect(storage, fxdata, pd);
     case fxt_ensemble:
+#if defined(_M_ARM64EC)
+        return nullptr;
+#else
         return new BBDEnsembleEffect(storage, fxdata, pd);
+#endif
     case fxt_treemonster:
         return new TreemonsterEffect(storage, fxdata, pd);
     case fxt_waveshaper:

src/common/dsp/Effect.cpp

@@ -23,6 +23,7 @@
 #ifndef SURGE_SRC_COMMON_DSP_EFFECT_H
 #define SURGE_SRC_COMMON_DSP_EFFECT_H
 
+#include "globals.h"
 #include "DSPUtils.h"
 #include "SurgeStorage.h"
 #include "lipol.h"

src/common/dsp/Effect.h

@@ -20,6 +20,8 @@
  * https://github.com/surge-synthesizer/surge
  */
 
+#if !defined(_M_ARM64EC)
+
 #include "BBDEnsembleEffect.h"
 
 #include "sst/basic-blocks/mechanics/block-ops.h"
@@ -568,4 +570,6 @@ void BBDEnsembleEffect::handleStreamingMismatches(int streamingRevision,
         fxdata->p[ens_output_filter].val.f = defaultFilterCut;
         fxdata->p[ens_output_filter].deactivated = true;
     }
-}
+}
+
+#endif

src/common/dsp/effects/BBDEnsembleEffect.cpp

@@ -22,6 +22,9 @@
 
 #ifndef SURGE_SRC_COMMON_DSP_EFFECTS_BBDENSEMBLEEFFECT_H
 #define SURGE_SRC_COMMON_DSP_EFFECTS_BBDENSEMBLEEFFECT_H
+
+#if !defined(_M_ARM64EC)
+
 #include "Effect.h"
 #include "BiquadFilter.h"
 #include "DSPUtils.h"
@@ -108,4 +111,6 @@ class BBDEnsembleEffect : public Effect
     BiquadFilter sincInputFilter;
 };
 
+#endif
+
 #endif // SURGE_SRC_COMMON_DSP_EFFECTS_BBDENSEMBLEEFFECT_H

src/common/dsp/effects/BBDEnsembleEffect.h

@@ -205,7 +205,12 @@ class BBDNonlin
         S2.incident(D1.reflected());
         Vp = Cpk->voltage();
 
-        return vAdd(vMul(Vp, vLoad1(drive)), vMul(Vg, vLoad1(1.0f - drive)));
+        auto vd = vLoad1(drive);
+        auto vdm = vLoad1(1.0f - drive);
+        auto a1 = vMul(Vp, vd);
+        auto a2 = vMul(Vg, vdm);
+        auto res = vAdd(a1, a2);
+        return res;
     }
 
   private:

src/common/dsp/effects/chowdsp/bbd_utils/BBDNonlin.h

@@ -26,7 +26,11 @@
 #include "globals.h"
 #include "sst/basic-blocks/dsp/FastMath.h"
 
+#if defined(_M_ARM64EC)
+#define CHOWTAPE_HYSTERESIS_USE_SIMD 0
+#else
 #define CHOWTAPE_HYSTERESIS_USE_SIMD 1
+#endif
 
 namespace HysteresisOps
 {

src/common/dsp/effects/chowdsp/tape/HysteresisOps.h

@@ -383,7 +383,8 @@ template <bool FM> void ClassicOscillator::convolute(int voice, bool stereo)
     */
     unsigned int m = ((ipos >> 16) & 0xff) * (FIRipol_N << 1);
     unsigned int lipolui16 = (ipos & 0xffff);
-    __m128 lipol128 = _mm_cvtsi32_ss(lipol128, lipolui16);
+    __m128 lipol128 = _mm_setzero_ps();
+    lipol128 = _mm_cvtsi32_ss(lipol128, lipolui16);
     lipol128 = _mm_shuffle_ps(lipol128, lipol128, _MM_SHUFFLE(0, 0, 0, 0));
 
     int k;

src/common/dsp/oscillators/ClassicOscillator.cpp

@@ -226,7 +226,8 @@ void SampleAndHoldOscillator::convolute(int voice, bool FM, bool stereo)
 
     unsigned int m = ((ipos >> 16) & 0xff) * (FIRipol_N << 1);
     unsigned int lipolui16 = (ipos & 0xffff);
-    __m128 lipol128 = _mm_cvtsi32_ss(lipol128, lipolui16);
+    __m128 lipol128 = _mm_setzero_ps();
+    lipol128 = _mm_cvtsi32_ss(lipol128, lipolui16);
     lipol128 = _mm_shuffle_ps(lipol128, lipol128, _MM_SHUFFLE(0, 0, 0, 0));
 
     int k;

src/common/dsp/oscillators/SampleAndHoldOscillator.cpp

@@ -353,7 +353,8 @@ void WavetableOscillator::convolute(int voice, bool FM, bool stereo)
 
     unsigned int m = ((ipos >> 16) & 0xff) * (FIRipol_N << 1);
     unsigned int lipolui16 = (ipos & 0xffff);
-    __m128 lipol128 = _mm_cvtsi32_ss(lipol128, lipolui16);
+    __m128 lipol128 = _mm_setzero_ps();
+    lipol128 = _mm_cvtsi32_ss(lipol128, lipolui16);
     lipol128 = _mm_shuffle_ps(lipol128, lipol128, _MM_SHUFFLE(0, 0, 0, 0));
 
     float g, gR;

src/common/dsp/oscillators/WavetableOscillator.cpp

@@ -38,14 +38,7 @@ inline bool _BitScanReverse(unsigned long *result, unsigned long bits)
 }
 } // anonymous namespace
 #endif
-int Float2Int(float x)
-{
-#ifdef ARM_NEON
-    return int(x + 0.5f);
-#else
-    return _mm_cvt_ss2si(_mm_load_ss(&x));
-#endif
-}
+int Float2Int(float x) { return int(x + 0.5f); }
 WindowOscillator::WindowOscillator(SurgeStorage *storage, OscillatorStorage *oscdata,
                                    pdata *localcopy)
     : Oscillator(storage, oscdata, localcopy), lp(storage), hp(storage)
@@ -188,11 +181,7 @@ void WindowOscillator::init_default_values()
 inline unsigned int BigMULr16(unsigned int a, unsigned int b)
 {
     // 64-bit unsigned multiply with right shift by 16 bits
-#ifdef _MSC_VER
-    const auto c{__emulu(a, b)};
-#else
     const auto c{std::uint64_t{a} * std::uint64_t{b}};
-#endif
     return c >> 16u;
 }
 

src/common/dsp/oscillators/WindowOscillator.cpp

@@ -32,23 +32,8 @@
 // if you hit this on msvc and pass the above, you probably need /Zc:__cplusplus
 static_assert(__cplusplus == 201703L, "Surge requires C++17; please update your build");
 
-#if MAC
-
-#if defined(__x86_64__)
-#else
-#define ARM_NEON 1
-#endif
-
-#endif
-
-#if LINUX
-#if defined(__aarch64__) || defined(__arm__)
-#define ARM_NEON 1
-#endif
-#endif
-
-#if defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64) ||                                   \
-    (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
+#if (defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64) ||                                  \
+     (defined(_M_IX86_FP) && _M_IX86_FP >= 2)) //&& !defined(_M_ARM64EC)
 #include <emmintrin.h>
 #else
 // With the upgrade to simde 0.8.2 and subsequent conversations
@@ -58,6 +43,7 @@ static_assert(__cplusplus == 201703L, "Surge requires C++17; please update your
 // #if defined(__arm__) || defined(__aarch64__) || defined(__riscv)
 //
 // and just always include this in the else side
+#include <cmath>
 #define SIMDE_ENABLE_NATIVE_ALIASES
 #include "simde/x86/sse2.h"
 #endif

src/common/globals.h

@@ -171,6 +171,11 @@ void AboutScreen::populateData()
     std::string platform = "macOS";
 #elif WINDOWS
     std::string platform = "Windows";
+#if defined(_M_ARM64EC)
+    platform += " (arm64ec)";
+#elif defined(_M_ARM64)
+    platform += " (arm64)";
+#endif
 #elif LINUX
     std::string platform = "Linux";
 #else