Adjust ChowTape and Ensemble for MSVC AMR64EC crash

compiler crash that is
surge-synthesizer · Oct 31, 2024 · 1e31afa · 1e31afa
1 parent faf754f
commit 1e31afa
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 4 deletions.
diff --git a/src/common/Parameter.cpp b/src/common/Parameter.cpp
@@ -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:

diff --git a/src/common/dsp/Effect.cpp b/src/common/dsp/Effect.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:

diff --git a/src/common/dsp/effects/BBDEnsembleEffect.cpp b/src/common/dsp/effects/BBDEnsembleEffect.cpp
@@ -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
diff --git a/src/common/dsp/effects/BBDEnsembleEffect.h b/src/common/dsp/effects/BBDEnsembleEffect.h
@@ -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
diff --git a/src/common/dsp/effects/chowdsp/bbd_utils/BBDNonlin.h b/src/common/dsp/effects/chowdsp/bbd_utils/BBDNonlin.h
@@ -196,7 +196,7 @@ class BBDNonlin
 
     void setDrive(float newDrive) { drive = newDrive; }
 
-    inline __m128 processSample(__m128 Vg) noexcept
+    inline __m128 processSample(__m128 Vg) noexcept 
     {
         Vin->setVoltage(Vg);
         Is->setCurrent(getCurrent(Vg, Vp));
@@ -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:

diff --git a/src/common/dsp/effects/chowdsp/tape/HysteresisOps.h b/src/common/dsp/effects/chowdsp/tape/HysteresisOps.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
 {

diff --git a/src/common/dsp/effects/chowdsp/tape/HysteresisProcessing.h b/src/common/dsp/effects/chowdsp/tape/HysteresisProcessing.h
@@ -77,7 +77,6 @@ class HysteresisProcessing
             M = _mm_set1_pd(0.0);
 #else
             M = 0.0;
-#endif
         };
 
         // check for instability
@@ -97,6 +96,7 @@ class HysteresisProcessing
         H_d_n1 = H_d;
 
         return M;
+#endif
     }
 
   private: