Skip to content

Commit 2e8a196

Browse files
author
Paul Walker (Baconpaul)
committed
Re-enable Ensemble and Tape SIMD Hysteresis ARM64
Now we moved to actual neon rather than emulated simd, msvc 2022 no longer dumps core, so turn these back on.
1 parent 5c59802 commit 2e8a196

File tree

5 files changed

+0
-29
lines changed

5 files changed

+0
-29
lines changed

src/common/Parameter.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,18 +1178,11 @@ void Parameter::set_type(int ctrltype)
11781178
break;
11791179
case ct_ensemble_stages:
11801180
{
1181-
#if defined(_M_ARM64EC)
1182-
valtype = vt_int;
1183-
val_min.i = 0;
1184-
val_max.i = 1;
1185-
val_default.i = 0;
1186-
#else
11871181
extern int ensemble_stage_count();
11881182
valtype = vt_int;
11891183
val_min.i = 0;
11901184
val_max.i = ensemble_stage_count() - 1;
11911185
val_default.i = 0;
1192-
#endif
11931186
break;
11941187
}
11951188
case ct_stringosc_excitation_model:
@@ -4071,12 +4064,8 @@ std::string Parameter::get_display(bool external, float ef) const
40714064
break;
40724065
case ct_ensemble_stages:
40734066
{
4074-
#if defined(_M_ARM64EC)
4075-
txt = "name";
4076-
#else
40774067
extern std::string ensemble_stage_name(int);
40784068
txt = ensemble_stage_name(i);
4079-
#endif
40804069
}
40814070
break;
40824071
case ct_reson_mode:

src/common/dsp/Effect.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
* https://github.com/surge-synthesizer/surge
2121
*/
2222

23-
#if !defined(_M_ARM64EC)
2423
#include "BBDEnsembleEffect.h"
25-
#endif
26-
2724
#include "BonsaiEffect.h"
2825
#include "ChorusEffectImpl.h"
2926
#include "CombulatorEffect.h"
@@ -108,11 +105,7 @@ Effect *spawn_effect(int id, SurgeStorage *storage, FxStorage *fxdata, pdata *pd
108105
case fxt_tape:
109106
return new chowdsp::TapeEffect(storage, fxdata, pd);
110107
case fxt_ensemble:
111-
#if defined(_M_ARM64EC)
112-
return nullptr;
113-
#else
114108
return new BBDEnsembleEffect(storage, fxdata, pd);
115-
#endif
116109
case fxt_treemonster:
117110
return new TreemonsterEffect(storage, fxdata, pd);
118111
case fxt_waveshaper:

src/common/dsp/effects/BBDEnsembleEffect.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* https://github.com/surge-synthesizer/surge
2121
*/
2222

23-
#if !defined(_M_ARM64EC)
24-
2523
#include "BBDEnsembleEffect.h"
2624

2725
#include "sst/basic-blocks/mechanics/block-ops.h"
@@ -571,5 +569,3 @@ void BBDEnsembleEffect::handleStreamingMismatches(int streamingRevision,
571569
fxdata->p[ens_output_filter].deactivated = true;
572570
}
573571
}
574-
575-
#endif

src/common/dsp/effects/BBDEnsembleEffect.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#ifndef SURGE_SRC_COMMON_DSP_EFFECTS_BBDENSEMBLEEFFECT_H
2424
#define SURGE_SRC_COMMON_DSP_EFFECTS_BBDENSEMBLEEFFECT_H
2525

26-
#if !defined(_M_ARM64EC)
27-
2826
#include "Effect.h"
2927
#include "BiquadFilter.h"
3028
#include "DSPUtils.h"
@@ -111,6 +109,5 @@ class BBDEnsembleEffect : public Effect
111109
BiquadFilter sincInputFilter;
112110
};
113111

114-
#endif
115112

116113
#endif // SURGE_SRC_COMMON_DSP_EFFECTS_BBDENSEMBLEEFFECT_H

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@
2626
#include "globals.h"
2727
#include "sst/basic-blocks/dsp/FastMath.h"
2828

29-
#if defined(_M_ARM64EC)
30-
#define CHOWTAPE_HYSTERESIS_USE_SIMD 0
31-
#else
3229
#define CHOWTAPE_HYSTERESIS_USE_SIMD 1
33-
#endif
3430

3531
namespace HysteresisOps
3632
{

0 commit comments

Comments
 (0)