add impulse tests for rust -ec -cm

format architecture files

tests/impulse-tests/Makefile

@@ -122,8 +122,9 @@ travis:
 #########################################################################
 # automatic github action test
 github_action:
-	$(MAKE) -f Make.rust outdir=rust/no CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -a archs/rust/architecture_normal.rs"
-	$(MAKE) -f Make.rust outdir=rust/rnt CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -rnt -a archs/rust/architecture.rs"
+	$(MAKE) -f Make.rust outdir=rust/rnt CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -cm -a archs/rust/architecture_cm.rs"
+	$(MAKE) -f Make.rust outdir=rust/rnt CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -ec -rnt -a archs/rust/architecture_ecrnt.rs"
+	$(MAKE) -f Make.rust outdir=rust/no CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -a archs/rust/architecture_trait.rs"
 	$(MAKE) -f Make.gcc outdir=cpp/double          lang=cpp arch=impulsearch.cpp FAUSTOPTIONS="-I ../../libraries/ -I dsp -double"
 
 #########################################################################
@@ -369,10 +370,12 @@ interp1:
 #########################################################################
 # Rust backend
 rust:
-	$(MAKE) -f Make.rust outdir=rust/no CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -rnt -a archs/rust/architecture.rs"
-	$(MAKE) -f Make.rust outdir=rust/fp FAUSTOPTIONS="-I ../../libraries/ -double -fp -a archs/rust/architecture_normal.rs"
-	$(MAKE) -f Make.rust outdir=rust/vec4 CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -vec -vs 4 -a archs/rust/architecture_normal.rs"
-	$(MAKE) -f Make.rust outdir=rust/vec32 FAUSTOPTIONS="-I ../../libraries/ -double -vec -vs 32 -a archs/rust/architecture_normal.rs"
+	$(MAKE) -f Make.rust outdir=rust/ec CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -cm -a archs/rust/architecture_cm.rs"
+	$(MAKE) -f Make.rust outdir=rust/ec CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -ec -rnt -a archs/rust/architecture_ecrnt.rs"
+	$(MAKE) -f Make.rust outdir=rust/no CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -a archs/rust/architecture_trait.rs"
+	$(MAKE) -f Make.rust outdir=rust/fp FAUSTOPTIONS="-I ../../libraries/ -double -fp -a archs/rust/architecture_trait.rs"
+	$(MAKE) -f Make.rust outdir=rust/vec4 CARGOOPTIONS="" FAUSTOPTIONS="-I ../../libraries/ -double -vec -vs 4 -a archs/rust/architecture_trait.rs"
+	$(MAKE) -f Make.rust outdir=rust/vec32 FAUSTOPTIONS="-I ../../libraries/ -double -vec -vs 32 -a archs/rust/architecture_trait.rs"
 
 #########################################################################
 # Cmajor backend

tests/impulse-tests/archs/rust/Cargo.toml

@@ -13,4 +13,4 @@ default-boxed = "0.2"
 default = ["default-boxed"]
 default-boxed = []
 
-[workspace]
+[workspace]

tests/impulse-tests/archs/rust/architecture_cm.rs

@@ -0,0 +1,294 @@
+/************************************************************************
+************************************************************************
+FAUST Architecture File
+Copyright (C) 2020 GRAME, Centre National de Creation Musicale
+---------------------------------------------------------------------
+
+This is sample code. This file is provided as an example of minimal
+FAUST architecture file. Redistribution and use in source and binary
+forms, with or without modification, in part or in full are permitted.
+In particular you can create a derived work of this FAUST architecture
+and distribute that work under terms of your choice.
+
+This sample code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+************************************************************************
+************************************************************************/
+
+#![allow(unused_parens)]
+#![allow(non_snake_case)]
+#![allow(non_camel_case_types)]
+#![allow(dead_code)]
+#![allow(unused_variables)]
+#![allow(unused_mut)]
+#![allow(non_upper_case_globals)]
+#![recursion_limit = "256"]
+
+extern crate libm;
+extern crate num_traits;
+/* extern crate fastfloat; */
+
+use std::env;
+use std::fs::File;
+use std::io::Write;
+
+use default_boxed::DefaultBoxed;
+use num_traits::{cast::FromPrimitive, float::Float};
+
+type F32 = f32;
+type F64 = f64;
+
+/*
+type F32 = Fast<f32>;
+type F64 = Fast<f64>;
+*/
+
+#[derive(Copy, Clone)]
+pub struct ParamIndex(i32);
+
+pub struct Soundfile<'a> {
+    fBuffers: &'a &'a F32,
+    fLength: &'a i32,
+    fSR: &'a i32,
+    fOffset: &'a i32,
+    fChannels: i32,
+}
+
+pub trait FaustDsp {
+    type T;
+
+    fn new() -> Self
+    where
+        Self: Sized;
+    fn metadata(&self, m: &mut dyn Meta);
+    fn get_sample_rate(&self) -> i32;
+    fn get_num_inputs(&self) -> i32;
+    fn get_num_outputs(&self) -> i32;
+    fn class_init(sample_rate: i32)
+    where
+        Self: Sized;
+    fn instance_reset_params(&mut self);
+    fn instance_clear(&mut self);
+    fn instance_constants(&mut self, sample_rate: i32);
+    fn instance_init(&mut self, sample_rate: i32);
+    fn init(&mut self, sample_rate: i32);
+    fn build_user_interface(&self, ui_interface: &mut dyn UI<Self::T>);
+    fn build_user_interface_static(ui_interface: &mut dyn UI<Self::T>)
+    where
+        Self: Sized;
+    fn get_param(&self, param: ParamIndex) -> Option<Self::T>;
+    fn set_param(&mut self, param: ParamIndex, value: Self::T);
+    fn compute(&mut self, count: i32, inputs: &[&[Self::T]], outputs: &mut [&mut [Self::T]]);
+}
+
+pub trait Meta {
+    // -- metadata declarations
+    fn declare(&mut self, key: &str, value: &str);
+}
+
+pub trait UI<T> {
+    // -- widget's layouts
+    fn open_tab_box(&mut self, label: &str);
+    fn open_horizontal_box(&mut self, label: &str);
+    fn open_vertical_box(&mut self, label: &str);
+    fn close_box(&mut self);
+
+    // -- active widgets
+    fn add_button(&mut self, label: &str, param: ParamIndex);
+    fn add_check_button(&mut self, label: &str, param: ParamIndex);
+    fn add_vertical_slider(
+        &mut self,
+        label: &str,
+        param: ParamIndex,
+        init: T,
+        min: T,
+        max: T,
+        step: T,
+    );
+    fn add_horizontal_slider(
+        &mut self,
+        label: &str,
+        param: ParamIndex,
+        init: T,
+        min: T,
+        max: T,
+        step: T,
+    );
+    fn add_num_entry(&mut self, label: &str, param: ParamIndex, init: T, min: T, max: T, step: T);
+
+    // -- passive widgets
+    fn add_horizontal_bargraph(&mut self, label: &str, param: ParamIndex, min: T, max: T);
+    fn add_vertical_bargraph(&mut self, label: &str, param: ParamIndex, min: T, max: T);
+
+    // -- metadata declarations
+    fn declare(&mut self, param: Option<ParamIndex>, key: &str, value: &str);
+}
+
+pub struct ButtonUI {
+    all_button_params: Vec<ParamIndex>,
+}
+
+impl ButtonUI {
+    fn set_button_parameters_to(&self, dsp: &mut dyn FaustDsp<T = f64>, value: f64) {
+        for button_param in &self.all_button_params {
+            dsp.set_param(*button_param, value);
+        }
+    }
+}
+
+impl<T: Float + FromPrimitive> UI<T> for ButtonUI {
+    // -- widget's layouts
+    fn open_tab_box(&mut self, label: &str) {}
+    fn open_horizontal_box(&mut self, label: &str) {}
+    fn open_vertical_box(&mut self, label: &str) {}
+    fn close_box(&mut self) {}
+
+    // -- active widgets
+    fn add_button(&mut self, label: &str, param: ParamIndex) {
+        self.all_button_params.push(param);
+    }
+    fn add_check_button(&mut self, label: &str, param: ParamIndex) {}
+    fn add_vertical_slider(
+        &mut self,
+        label: &str,
+        param: ParamIndex,
+        init: T,
+        min: T,
+        max: T,
+        step: T,
+    ) {
+    }
+    fn add_horizontal_slider(
+        &mut self,
+        label: &str,
+        param: ParamIndex,
+        init: T,
+        min: T,
+        max: T,
+        step: T,
+    ) {
+    }
+    fn add_num_entry(&mut self, label: &str, param: ParamIndex, init: T, min: T, max: T, step: T) {}
+
+    // -- passive widgets
+    fn add_horizontal_bargraph(&mut self, label: &str, param: ParamIndex, min: T, max: T) {}
+    fn add_vertical_bargraph(&mut self, label: &str, param: ParamIndex, min: T, max: T) {}
+
+    // -- metadata declarations
+    fn declare(&mut self, param: Option<ParamIndex>, key: &str, value: &str) {}
+}
+
+// // Generated intrinsics:
+// <<includeIntrinsic>>
+
+// // Generated class:
+// <<includeclass>>
+
+const SAMPLE_RATE: i32 = 44100;
+
+type Dsp64 = dyn FaustDsp<T = f64>;
+
+fn print_header(mut dsp: Box<Dsp64>, num_total_samples: usize, output_file: &mut File) {
+    dsp.init(SAMPLE_RATE);
+    writeln!(output_file, "number_of_inputs  : {}", dsp.get_num_inputs()).unwrap();
+    writeln!(output_file, "number_of_outputs : {}", dsp.get_num_outputs()).unwrap();
+    writeln!(output_file, "number_of_frames  : {}", num_total_samples).unwrap();
+}
+
+fn run_dsp(
+    mut dsp: Box<Dsp64>,
+    num_samples: usize,
+    line_num_offset: usize,
+    output_file: &mut File,
+) {
+    type T = <Dsp64 as FaustDsp>::T;
+
+    // Generation constants
+    let buffer_size = 64usize;
+
+    // Init dsp
+    dsp.init(SAMPLE_RATE);
+
+    let num_inputs = dsp.get_num_inputs() as usize;
+    let num_outputs = dsp.get_num_outputs() as usize;
+
+    // Prepare buffers
+    let mut in_buffer = vec![vec![0 as T; buffer_size]; num_inputs];
+    let mut out_buffer = vec![vec![0 as T; buffer_size]; num_outputs];
+
+    // Prepare UI
+    let mut ui = ButtonUI {
+        all_button_params: Vec::new(),
+    };
+    dsp.build_user_interface(&mut ui);
+
+    // Compute
+    let mut cycle = 0;
+    let mut num_samples_written = 0;
+    while num_samples_written < num_samples {
+        let buffer_size = buffer_size.min(num_samples - num_samples_written);
+
+        // handle inputs
+        for c in 0..num_inputs {
+            for j in 0..buffer_size {
+                let first_frame = num_samples_written == 0 && j == 0;
+                in_buffer[c][j] = if first_frame { 1.0 } else { 0.0 };
+            }
+        }
+
+        // Set button state
+        if cycle == 0 {
+            ui.set_button_parameters_to(&mut *dsp, 1.0);
+        } else {
+            ui.set_button_parameters_to(&mut *dsp, 0.0);
+        }
+
+        // right now the cm flag is only tested for the case that is the buffer is zeroed every time
+        let i = in_buffer
+            .iter()
+            .map(|buffer| buffer.as_slice())
+            .collect::<Vec<&[T]>>();
+        let mut o = out_buffer
+            .iter_mut()
+            .map(|buffer| {
+                buffer.iter_mut().for_each(|i| *i = 0.0);
+                buffer.as_mut_slice()
+            })
+            .collect::<Vec<&mut [T]>>();
+
+        dsp.compute(buffer_size as i32, i.as_slice(), o.as_mut_slice());
+
+        // handle outputs
+        for j in 0..buffer_size {
+            write!(output_file, "{:6} :", num_samples_written + line_num_offset).unwrap();
+            for c in 0..num_outputs {
+                write!(output_file, " {:8.6}", out_buffer[c][j]).unwrap();
+            }
+            writeln!(output_file).unwrap();
+            num_samples_written += 1;
+        }
+
+        cycle = cycle + 1;
+    }
+}
+
+fn new_dsp() -> Box<Dsp64> {
+    mydsp::default_boxed()
+}
+
+fn main() {
+    let num_total_samples = 60000;
+
+    let block_size = num_total_samples / 4;
+
+    // Open output file
+    let output_file_name = env::args()
+        .nth(1)
+        .expect("ERROR: Output file name expected.");
+    let mut output_file = File::create(output_file_name).expect("Cannot create output file");
+
+    print_header(new_dsp(), num_total_samples, &mut output_file);
+
+    run_dsp(mydsp::default_boxed(), block_size, 0, &mut output_file);
+}