a77770f95d
Four items from one workflow, committed together because their build and CI
wiring genuinely interleaves — nisps/CMakeLists.txt, run-all-tests.sh and
ci.yml each carry hunks from two of them, and the stage renumbering (1/5 ->
1/6) touches every line. Splitting would produce commits that do not build,
which is worse than a commit that does four things and says so.
S26 part 2 — the curve declaration now matches reality. params[].curve stays
the mode-wide DEFAULT; a voice_spaces entry may now be {name, curve_overrides}
declaring only the slots where THAT voice space deviates. The 6 modes with one
voice space are byte-identical. The values were derived MECHANICALLY by a new
codegen/curve-audit.ts that models the four idioms a p[N]*p[N] regex misses
(alias form, memlcelium's implicit-counter sq() lambda, loop-generated indices,
smooth_params_), inlines helpers, and RAISES rather than guessing when it
cannot reduce an expression. A drift gate cross-checks 1179 (voice space x
param) slots against engine source on every run and was proved to fail loudly
on three drift classes. Application stays in the engine: nisps/engines,
nisps/pipeline and nisps/core are untouched, generated output is pure insertion
(755 insertions, 0 deletions), and the rebuilt nisps.wasm was byte-identical.
S4 / 7.2 — firmware reads the active mode's driver config at mode start, and
mic/line is real. My brief assumed the engine owns this; the code disagreed and
the code was right. sound_analysis_midi's EngineT is NoOpEngine — the mic lives
on a separately-composed AnalysisEngine member — so engine-level wiring would
have compiled, passed every gate, and left the one mic mode on line input.
Hence a mode-level seam defaulting to engine().driver_config(). Separately,
DriverConfig's defaults (line_level 0, output_volume 1.0) had drifted from
memllib's actual 3/0.8 because nothing had ever read them; wiring them as-is
would have made every silent mode louder and its line input maximally
insensitive — a behaviour change disguised as plumbing. Now pinned by a test.
Also: GetSysClockSpeed() panic()s on unsupported sample rates and runs on the
first line of setup(), so sample_rate needed a fallback ahead of clock setup.
CI's firmware env list gains soundanalysismidi — it is the only mic variant and
nothing else compiles that path.
Plan 5e — telemetry is real. A loss_history C-API entry across the full 5-layer
chain lets the browser read the per-iteration loss the core already records.
The audit named one fabrication site; there were two — wasm-iml.ts's
synchronous train() published lossHistory: [loss] as well. A third, ctx.loss,
was not merely dead but actively synthetic (fallbacks of prev * 0.82 and a
literal 0.5, rendered by nothing) and is deleted. The firmware buffer stays
untouched, per the L25 call. EngineApi.lossHistory() reads spine state rather
than the MLP handle, because trainAsync() fits on the worker's mirror net and
the handle would give a subtly-wrong second answer.
Plan 5f — engine throughput is measurable. One source compiled twice (CMake
natively, emcc for WASM) so the targets compare directly and no WASM export is
added. Sequencers are driven into a working state, and every row prints its own
working-state evidence so a number produced by an idle engine is visible rather
than plausible. Reports, never asserts: a wall-clock threshold on shared
hardware is meaningless or flaky, same call as the firmware size job.
ALIGNMENT: the telemetry defect is deleted (built, not deferred); the
performance defect is rewritten to what is actually left — these are HOST
numbers, and nothing measures the RP2350 at 150 MHz, which is the target the
mission's constraint is about. Q4 (memllib ownership) and Q5 (legacy feedback
modes) are closed.
Corrections to my own earlier claims, both found by agents contradicting the
brief: manifold/ONBOARDING.md was NOT "now accurate" — its primitives list
still named five deleted primitives and cited a seededGradient() that does not
exist. And the parity harness misses the sequencer engines because it runs 128
frames while their sequencers evaluate every 400-500 samples, NOT because
all-params-0.5 fails to trigger them (it does trigger: 0.5 maps to ratio 2,
firing three times per bar). The fix is a longer window, not different params.
Gates: run-all-tests.sh ALL GREEN — 4/4 ctest, parity PASS, lint clean, curve
drift 1179 slots ok, 39 e2e (was 33). Firmware: 5 envs built including the mic
variant.
191 lines
8.4 KiB
C++
191 lines
8.4 KiB
C++
// tests/cpp/test_mode_driver_config.cpp — the mic/line wiring, minus the
|
|
// hardware.
|
|
//
|
|
// Two halves, both of which are the parts that can actually be wrong:
|
|
//
|
|
// 1. SELECTION — what `Mode::driver_config()` resolves to per mode. This is
|
|
// the logic the firmware reads at mode start (src/main.cpp →
|
|
// glue/audio_driver.hpp). The interesting case is SoundAnalysisMIDIMode,
|
|
// whose audio ENGINE is a silent NoOp while its AnalysisEngine is what
|
|
// actually consumes the microphone; taking the engine's config there
|
|
// would silently leave the codec on line input and defeat the mode.
|
|
//
|
|
// 2. CLAMPING — `glue/codec_config.hpp`, the only firmware-side logic in the
|
|
// chain. Included directly (it is deliberately Arduino-free) so the
|
|
// sample-rate resolution, which can `panic()` the device if it hands
|
|
// `AudioDriver::GetSysClockSpeed()` a rate it has no divider for, is
|
|
// pinned on the host.
|
|
//
|
|
// What is NOT proven here: that the SGTL5000 actually switches its input mux.
|
|
// That needs hardware.
|
|
|
|
#include "test_helpers.hpp"
|
|
|
|
#include "../../nisps/modes/breakor.hpp"
|
|
#include "../../nisps/modes/channel_strip.hpp"
|
|
#include "../../nisps/modes/elysiamorf.hpp"
|
|
#include "../../nisps/modes/external_synth_midi.hpp"
|
|
#include "../../nisps/modes/memlcelium.hpp"
|
|
#include "../../nisps/modes/paf_synth.hpp"
|
|
#include "../../nisps/modes/slp_workshop.hpp"
|
|
#include "../../nisps/modes/sound_analysis_midi.hpp"
|
|
#include "../../nisps/modes/verb_fx.hpp"
|
|
#include "../../nisps/modes/xiasri.hpp"
|
|
|
|
#include "../../firmware/MEMLNaut-NISPS/glue/codec_config.hpp"
|
|
|
|
using namespace nisps;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// 1. Per-mode selection
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// The mode that exists to listen: mic input, with the analyser's pre-amp gain.
|
|
NISPS_TEST(driver_config_sound_analysis_midi_selects_mic) {
|
|
const modes::SoundAnalysisMIDIMode mode{};
|
|
const DriverConfig c = mode.driver_config();
|
|
NISPS_EXPECT(c.mic_input == true);
|
|
NISPS_EXPECT(c.mic_gain_db == 20u);
|
|
// ...and it must NOT be the (NoOp) engine's config, which is line input.
|
|
NISPS_EXPECT(mode.engine().driver_config().mic_input == false);
|
|
// Same object the mode delegates to.
|
|
NISPS_EXPECT(c.mic_input == mode.analysis().driver_config().mic_input);
|
|
NISPS_EXPECT(c.mic_gain_db == mode.analysis().driver_config().mic_gain_db);
|
|
}
|
|
|
|
// The two input-processing modes: line input, at the level their engines ask
|
|
// for (louder than the default step, i.e. a real instrument/line source).
|
|
NISPS_TEST(driver_config_channel_strip_selects_line) {
|
|
const modes::ChannelStripMode mode{};
|
|
const DriverConfig c = mode.driver_config();
|
|
NISPS_EXPECT(c.mic_input == false);
|
|
NISPS_EXPECT(c.line_level == 6u);
|
|
NISPS_EXPECT_NEAR(c.output_volume, 0.9f, 1e-6f);
|
|
}
|
|
|
|
NISPS_TEST(driver_config_verb_fx_selects_line) {
|
|
const modes::VerbFXMode mode{};
|
|
const DriverConfig c = mode.driver_config();
|
|
NISPS_EXPECT(c.mic_input == false);
|
|
NISPS_EXPECT(c.line_level == 6u);
|
|
NISPS_EXPECT_NEAR(c.output_volume, 0.9f, 1e-6f);
|
|
}
|
|
|
|
NISPS_TEST(driver_config_xiasri_selects_line) {
|
|
const DriverConfig c = modes::XIASRIMode{}.driver_config();
|
|
NISPS_EXPECT(c.mic_input == false);
|
|
NISPS_EXPECT(c.line_level == 6u);
|
|
}
|
|
|
|
// Synth modes: no input opinion beyond the default, own output level.
|
|
NISPS_TEST(driver_config_synth_modes_default_line) {
|
|
for (const DriverConfig c : {modes::PAFSynthMode{}.driver_config(),
|
|
modes::MEMLCeliumMode{}.driver_config(),
|
|
modes::SLPWorkshopMode{}.driver_config()}) {
|
|
NISPS_EXPECT(c.mic_input == false);
|
|
NISPS_EXPECT(c.line_level == DriverConfig{}.line_level);
|
|
NISPS_EXPECT_NEAR(c.output_volume, 0.9f, 1e-6f);
|
|
}
|
|
}
|
|
|
|
// Modes that say nothing get exactly the struct defaults — which are, by
|
|
// construction, the codec setup the firmware used before any of this was
|
|
// wired. Wiring them up is a no-op, not a silent behaviour change.
|
|
NISPS_TEST(driver_config_silent_modes_get_defaults) {
|
|
const DriverConfig def{};
|
|
const modes::BreakOrMode breakor{};
|
|
const modes::ElysiamorfMode elysiamorf{};
|
|
const modes::ExternalSynthMIDIMode<midi::generated::kMoogSub37, 8u> ext{};
|
|
for (const DriverConfig c : {breakor.driver_config(),
|
|
elysiamorf.driver_config(),
|
|
ext.driver_config()}) {
|
|
NISPS_EXPECT(c.mic_input == def.mic_input);
|
|
NISPS_EXPECT(c.line_level == def.line_level);
|
|
NISPS_EXPECT(c.mic_gain_db == def.mic_gain_db);
|
|
NISPS_EXPECT_NEAR(c.output_volume, def.output_volume, 1e-6f);
|
|
NISPS_EXPECT_NEAR(c.sample_rate, 0.f, 1e-6f);
|
|
}
|
|
}
|
|
|
|
// The defaults are load-bearing (see above): pin them to memllib's historical
|
|
// `AudioDriver::Setup()` values so a future edit has to be deliberate.
|
|
NISPS_TEST(driver_config_defaults_match_legacy_firmware_setup) {
|
|
const DriverConfig def{};
|
|
NISPS_EXPECT(def.mic_input == false);
|
|
NISPS_EXPECT(def.line_level == 3u);
|
|
NISPS_EXPECT(def.mic_gain_db == 0u);
|
|
NISPS_EXPECT_NEAR(def.output_volume, 0.8f, 1e-6f);
|
|
NISPS_EXPECT_NEAR(def.sample_rate, 0.f, 1e-6f);
|
|
}
|
|
|
|
// No mode may request a rate the driver cannot clock (that would panic() at
|
|
// boot). Every mode currently says "don't care"; this holds the line.
|
|
NISPS_TEST(driver_config_every_mode_requests_a_clockable_rate) {
|
|
const float rates[] = {
|
|
modes::PAFSynthMode{}.driver_config().sample_rate,
|
|
modes::ChannelStripMode{}.driver_config().sample_rate,
|
|
modes::XIASRIMode{}.driver_config().sample_rate,
|
|
modes::VerbFXMode{}.driver_config().sample_rate,
|
|
modes::MEMLCeliumMode{}.driver_config().sample_rate,
|
|
modes::SLPWorkshopMode{}.driver_config().sample_rate,
|
|
modes::BreakOrMode{}.driver_config().sample_rate,
|
|
modes::ElysiamorfMode{}.driver_config().sample_rate,
|
|
modes::SoundAnalysisMIDIMode{}.driver_config().sample_rate,
|
|
};
|
|
for (const float r : rates) {
|
|
const std::uint32_t resolved = nisps_firmware::select_sample_rate(r);
|
|
NISPS_EXPECT(r <= 0.f || resolved == static_cast<std::uint32_t>(r + 0.5f));
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// 2. Firmware-side clamping (glue/codec_config.hpp)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
NISPS_TEST(codec_config_clamp_passes_through_valid_values) {
|
|
DriverConfig in{};
|
|
in.mic_input = true;
|
|
in.mic_gain_db = 20u;
|
|
in.line_level = 6u;
|
|
in.output_volume = 0.9f;
|
|
const DriverConfig c = nisps_firmware::clamp_driver_config(in);
|
|
NISPS_EXPECT(c.mic_input == true);
|
|
NISPS_EXPECT(c.mic_gain_db == 20u);
|
|
NISPS_EXPECT(c.line_level == 6u);
|
|
NISPS_EXPECT_NEAR(c.output_volume, 0.9f, 1e-6f);
|
|
}
|
|
|
|
NISPS_TEST(codec_config_clamp_bounds_out_of_range_values) {
|
|
DriverConfig hi{};
|
|
hi.mic_gain_db = 200u;
|
|
hi.line_level = 99u;
|
|
hi.output_volume = 4.f;
|
|
const DriverConfig c = nisps_firmware::clamp_driver_config(hi);
|
|
NISPS_EXPECT(c.mic_gain_db == nisps_firmware::kMaxMicGainDb);
|
|
NISPS_EXPECT(c.line_level == nisps_firmware::kMaxLineLevel);
|
|
NISPS_EXPECT_NEAR(c.output_volume, nisps_firmware::kMaxOutputVolume, 1e-6f);
|
|
|
|
DriverConfig lo{};
|
|
lo.output_volume = -1.f;
|
|
NISPS_EXPECT_NEAR(nisps_firmware::clamp_driver_config(lo).output_volume, 0.f, 1e-6f);
|
|
}
|
|
|
|
NISPS_TEST(codec_config_sample_rate_dont_care_is_48k) {
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(0.f) == 48000u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(-1.f) == 48000u);
|
|
}
|
|
|
|
NISPS_TEST(codec_config_sample_rate_supported_rates_pass_through) {
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(24000.f) == 24000u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(32000.f) == 32000u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(44100.f) == 44100u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(48000.f) == 48000u);
|
|
}
|
|
|
|
// The one that keeps the device bootable: GetSysClockSpeed() panics on these.
|
|
NISPS_TEST(codec_config_sample_rate_unsupported_falls_back_to_48k) {
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(96000.f) == 48000u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(22050.f) == 48000u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(1.f) == 48000u);
|
|
NISPS_EXPECT(nisps_firmware::select_sample_rate(48001.f) == 48000u);
|
|
}
|