chore: interpret all execution_success programs

compiler/noirc_driver/src/abi_gen.rs

@@ -23,7 +23,7 @@ use noirc_frontend::{
 
 /// Arranges a function signature and a generated circuit's return witnesses into a
 /// `noirc_abi::Abi`.
-pub(super) fn gen_abi(
+pub fn gen_abi(
     context: &Context,
     func_id: &FuncId,
     return_visibility: Visibility,

compiler/noirc_driver/src/lib.rs

@@ -38,6 +38,7 @@ mod stdlib;
 
 use debug::filter_relevant_files;
 
+pub use abi_gen::gen_abi;
 pub use contract::{CompiledContract, CompiledContractOutputs, ContractFunction};
 pub use debug::DebugFile;
 pub use noirc_frontend::graph::{CrateId, CrateName};
@@ -793,7 +794,7 @@ pub fn compile_no_check(
             create_program(program, &ssa_evaluator_options)?
         };
 
-    let abi = abi_gen::gen_abi(context, &main_function, return_visibility, error_types);
+    let abi = gen_abi(context, &main_function, return_visibility, error_types);
     let file_map = filter_relevant_files(&debug, &context.file_manager);
 
     Ok(CompiledProgram {

tooling/nargo_cli/build.rs

@@ -42,6 +42,8 @@
     generate_compile_success_with_bug_tests(&mut test_file, &test_dir);
     generate_compile_failure_tests(&mut test_file, &test_dir);
 
+    generate_interpret_execution_success_tests(&mut test_file, &test_dir);
+
     generate_fuzzing_failure_tests(&mut test_file, &test_dir);
 
     generate_nargo_expand_execution_success_tests(&mut test_file, &test_dir);
@@ -115,6 +117,81 @@
     "brillig_continue_break",
 ];
 
+/// `nargo interpret` ignored tests, either because they don't currently work or
+/// becuase they are too slow to run.
+const IGNORED_INTERPRET_EXECUTION_TESTS: [&str; 35] = [
+    // slow
+    "regression_4709",
+    // panic: index out of bounds
+    "array_dynamic_nested_blackbox_input",
+    // gives a different result with `--force-brillig`
+    "array_oob_regression_7965",
+    // gives a different result with `--force-brillig`
+    "array_oob_regression_7975",
+    // panic: FunctionReturnedIncorrectArgCount
+    "as_witness",
+    // wrong result
+    "brillig_block_parameter_liveness",
+    // panic: BlockArgumentCountMismatch
+    "brillig_cow_regression",
+    // wrong result
+    "databus",
+    // panic: index out of bounds
+    "databus_composite_calldata",
+    // wrong result
+    "databus_two_calldata",
+    // wrong result
+    "databus_two_calldata_simple",
+    // panic: IntrinsicArgumentCountMismatch
+    "fold_numeric_generic_poseidon",
+    // gives a different result with `--force-brillig`
+    "global_array_rc_regression_8259",
+    // panic: IntrinsicArgumentCountMismatch
+    "hash_to_field",
+    // panic: Internal(TypeError)
+    "inline_decompose_hint_brillig_call",
+    // panic: Internal(TypeError)
+    "multi_scalar_mul",
+    // gives a different result with `--force-brillig`
+    "nested_if_then_block_same_cond",
+    // panic: IntrinsicArgumentCountMismatch
+    "no_predicates_numeric_generic_poseidon",
+    // panic: IntrinsicArgumentCountMismatch
+    "ram_blowup_regression",
+    // panic: index out of bounds
+    "regression_11294",
+    // panic: Internal(TypeError)
+    "regression_3889",
+    // panic: IntrinsicArgumentCountMismatch
+    "regression_5252",
+    // panic: IntrinsicArgumentCountMismatch
+    "regression_7128",
+    // panic: index out of bounds
+    "regression_7612",
+    // gives a wrong result
+    "regression_7744",
+    // gives a wrong result
+    "regression_8174",
+    // panic: index out of bounds
+    "regression_struct_array_conditional",
+    // panic Internal(TypeError)
+    "simple_shield",
+    // panic: index out of bounds
+    "slice_loop",
+    // panic: index out of bounds
+    "struct_array_inputs",
+    // panic: BlockArgumentCountMismatch
+    "struct_inputs",
+    // panic: IntrinsicArgumentCountMismatch
+    "to_be_bytes",
+    // panic: IntrinsicArgumentCountMismatch
+    "to_le_bytes",
+    // panic: BlockArgumentCountMismatch
+    "tuple_inputs",
+    // panic: IntrinsicArgumentCountMismatch
+    "unrolling_regression_8333",
+];
+
 /// These tests are ignored because making them work involves a more complex test code that
 /// might not be worth it.
 /// Others are ignored because of existing bugs in `nargo expand`.
@@ -128,7 +205,7 @@
     // There's no "src/main.nr" here so it's trickier to make this work
     "overlapping_dep_and_mod",
     // bug
     "poseidonsponge_x5_254",
     // bug
     "regression_5045",
     // bug
@@ -381,6 +458,7 @@
     )
     .expect("Could not write templated test file.");
 }
+
 fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
     let test_type = "execution_success";
     let test_cases = read_test_cases(test_data_dir, test_type);
@@ -699,7 +777,42 @@
     writeln!(test_file, "}}").unwrap();
 }
 
+fn generate_interpret_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_type = "execution_success";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+
+    writeln!(
+        test_file,
+        "mod interpret_{test_type} {{
+        use super::*;
+    "
+    )
+    .unwrap();
+    for (test_name, test_dir) in test_cases {
+        if IGNORED_INTERPRET_EXECUTION_TESTS.contains(&test_name.as_str()) {
+            continue;
+        }
+
+        let test_dir = test_dir.display();
+
+        generate_test_cases(
+            test_file,
+            &test_name,
+            &test_dir,
+            "interpret",
+            "interpret_execution_success(nargo);",
+            &MatrixConfig {
+                vary_brillig: !IGNORED_BRILLIG_TESTS.contains(&test_name.as_str()),
+                vary_inliner: true,
+                min_inliner: min_inliner(&test_name),
+                max_inliner: max_inliner(&test_name),
+            },
+        );
+    }
+    writeln!(test_file, "}}").unwrap();
+}
+
 /// Here we check, for every program in `test_programs/exeuction_success`, that:
 /// 1. `nargo expand` works on it
 /// 2. That the output of the original program is the same as the output of the expanded program
 ///    (that is, we run `nargo execute` on the original program and the expanded program and compare the output)

tooling/nargo_cli/src/cli/interpret_cmd.rs

@@ -1,13 +1,16 @@
 //! Use the SSA Interpreter to execute a SSA after a certain pass.
 
+use std::collections::BTreeMap;
+
 use acvm::acir::circuit::ExpressionWidth;
 use fm::{FileId, FileManager};
 use nargo::constants::PROVER_INPUT_FILE;
 use nargo::ops::report_errors;
 use nargo::package::Package;
 use nargo::workspace::Workspace;
 use nargo_toml::PackageSelection;
-use noirc_driver::{CompilationResult, CompileOptions};
+use noirc_abi::Abi;
+use noirc_driver::{CompilationResult, CompileOptions, gen_abi};
 
 use clap::Args;
 use noirc_errors::CustomDiagnostic;
@@ -80,15 +83,14 @@ pub(crate) fn run(args: InterpretCommand, workspace: Workspace) -> Result<(), Cl
         );
 
         // Report warnings and get the AST, or exit if the compilation failed.
-        let program = report_errors(
+        let (program, abi) = report_errors(
             program_result,
             &file_manager,
             args.compile_options.deny_warnings,
             args.compile_options.silence_warnings,
         )?;
 
         // Parse the inputs and convert them to what the SSA interpreter expects.
-        let abi = noir_ast_fuzzer::program_abi(&program);
         let prover_file = package.root_dir.join(&args.prover_name).with_extension("toml");
         let (prover_input, return_value) =
             noir_artifact_cli::fs::inputs::read_inputs_from_file(&prover_file, &abi)?;
@@ -154,7 +156,7 @@ fn compile_into_program(
     workspace: &Workspace,
     package: &Package,
     options: &CompileOptions,
-) -> CompilationResult<Program> {
+) -> CompilationResult<(Program, Abi)> {
     let (mut context, crate_id) = nargo::prepare_package(file_manager, parsed_files, package);
     if options.disable_comptime_printing {
         context.disable_comptime_printing();
@@ -191,7 +193,10 @@ fn compile_into_program(
         println!("{program}");
     }
 
-    Ok((program, warnings))
+    let error_types = BTreeMap::default();
+    let abi = gen_abi(&context, &main_id, program.return_visibility(), error_types);
+
+    Ok(((program, abi), warnings))
 }
 
 fn to_ssa_options(options: &CompileOptions) -> SsaEvaluatorOptions {

tooling/nargo_cli/tests/execute.rs

@@ -60,7 +60,7 @@
         }
 
         // Enable enums and ownership as unstable features
         nargo.arg("-Zenums");
 
         if force_brillig.0 {
             {
@@ -322,6 +322,10 @@
         })
     }
 
+    fn interpret_execution_success(mut nargo: Command) {
+        nargo.assert().success();
+    }
+
     fn nargo_expand_execute(test_program_dir: PathBuf) {
         // First run `nargo execute` on the original code to get the output
         let mut nargo = Command::cargo_bin("nargo").unwrap();
@@ -329,7 +333,7 @@
         nargo.arg("execute").arg("--force").arg("--disable-comptime-printing");
 
         // Enable enums as an unstable feature
         nargo.arg("-Zenums");
 
         // Enable pedantic solving
         nargo.arg("--pedantic-solving");
@@ -344,7 +348,7 @@
         nargo.arg("expand").arg("--force").arg("--disable-comptime-printing");
 
         // Enable enums as an unstable feature
         nargo.arg("-Zenums");
 
         // Enable pedantic solving
         nargo.arg("--pedantic-solving");
@@ -368,7 +372,7 @@
         let temp_dir = tempfile::tempdir().unwrap().keep();
 
         // Copy everything from the original directory to the new directory
         // (because some depdendencies might be there and might be needed for the expanded code to work)
         copy_dir_all(test_program_dir.clone(), temp_dir.clone()).unwrap();
 
         // Create a main file for the expanded code
@@ -383,7 +387,7 @@
         nargo.arg("execute").arg("--force").arg("--disable-comptime-printing");
 
         // Enable enums as an unstable feature
         nargo.arg("-Zenums");
 
         // Enable pedantic solving
         nargo.arg("--pedantic-solving");
@@ -405,7 +409,7 @@
         nargo.arg("expand").arg("--force").arg("--disable-comptime-printing");
 
         // Enable enums as an unstable feature
         nargo.arg("-Zenums");
 
         // Enable pedantic solving
         nargo.arg("--pedantic-solving");
@@ -429,7 +433,7 @@
         let temp_dir = tempfile::tempdir().unwrap().keep();
 
         // Copy everything from the original directory to the new directory
         // (because some depdendencies might be there and might be needed for the expanded code to work)
         copy_dir_all(test_program_dir.clone(), temp_dir.clone()).unwrap();
 
         // Create a main file for the expanded code

tooling/noirc_abi/src/errors.rs

@@ -26,8 +26,8 @@ pub enum InputParserError {
         FieldElement::modulus()
     )]
     InputExceedsFieldModulus { arg_name: String, value: String },
-    #[error("cannot parse value into {0:?}")]
-    AbiTypeMismatch(AbiType),
+    #[error("cannot parse value `{0}` into {1:?}")]
+    AbiTypeMismatch(String, AbiType),
     #[error("Expected argument `{0}`, but none was found")]
     MissingArgument(String),
 }

tooling/noirc_abi/src/input_parser/json.rs

@@ -120,7 +120,12 @@ impl JsonTypes {
                 JsonTypes::Array(fields)
             }
 
-            _ => return Err(InputParserError::AbiTypeMismatch(abi_type.clone())),
+            _ => {
+                return Err(InputParserError::AbiTypeMismatch(
+                    format!("{value:?}"),
+                    abi_type.clone(),
+                ));
+            }
         };
         Ok(json_value)
     }
@@ -212,7 +217,12 @@ impl InputValue {
                 InputValue::Vec(tuple_fields)
             }
 
-            (_, _) => return Err(InputParserError::AbiTypeMismatch(param_type.clone())),
+            (value, _) => {
+                return Err(InputParserError::AbiTypeMismatch(
+                    format!("{value:?}"),
+                    param_type.clone(),
+                ));
+            }
         };
 
         Ok(input_value)

tooling/noirc_abi/src/input_parser/toml.rs

@@ -118,7 +118,12 @@ impl TomlTypes {
                 TomlTypes::Array(fields)
             }
 
-            _ => return Err(InputParserError::AbiTypeMismatch(abi_type.clone())),
+            _ => {
+                return Err(InputParserError::AbiTypeMismatch(
+                    format!("{value:?}"),
+                    abi_type.clone(),
+                ));
+            }
         };
         Ok(toml_value)
     }
@@ -197,7 +202,12 @@ impl InputValue {
                 InputValue::Vec(tuple_fields)
             }
 
-            (_, _) => return Err(InputParserError::AbiTypeMismatch(param_type.clone())),
+            (value, _) => {
+                return Err(InputParserError::AbiTypeMismatch(
+                    format!("{value:?}"),
+                    param_type.clone(),
+                ));
+            }
         };
 
         Ok(input_value)

tooling/noirc_abi_wasm/test/browser/errors.test.ts

@@ -16,11 +16,13 @@ it('errors when an integer input overflows', async () => {
 it('errors when passing a field in place of an array', async () => {
   const { abi, inputs } = await import('../shared/field_as_array');
 
-  expect(() => abiEncode(abi, inputs)).to.throw('cannot parse value into Array { length: 2, typ: Field }');
+  expect(() => abiEncode(abi, inputs)).to.throw(
+    'cannot parse value `String("1")` into Array { length: 2, typ: Field }',
+  );
 });
 
 it('errors when passing an array in place of a field', async () => {
   const { abi, inputs } = await import('../shared/array_as_field');
 
-  expect(() => abiEncode(abi, inputs)).to.throw('cannot parse value into Field');
+  expect(() => abiEncode(abi, inputs)).to.throw('cannot parse value `Array([String("1"), String("2")])` into Field');
 });

tooling/noirc_abi_wasm/test/node/errors.test.ts

@@ -12,11 +12,13 @@ it('errors when an integer input overflows', async () => {
 it('errors when passing a field in place of an array', async () => {
   const { abi, inputs } = await import('../shared/field_as_array');
 
-  expect(() => abiEncode(abi, inputs)).to.throw('cannot parse value into Array { length: 2, typ: Field }');
+  expect(() => abiEncode(abi, inputs)).to.throw(
+    'cannot parse value `String("1")` into Array { length: 2, typ: Field }',
+  );
 });
 
 it('errors when passing an array in place of a field', async () => {
   const { abi, inputs } = await import('../shared/array_as_field');
 
-  expect(() => abiEncode(abi, inputs)).to.throw('cannot parse value into Field');
+  expect(() => abiEncode(abi, inputs)).to.throw('cannot parse value `Array([String("1"), String("2")])` into Field');
 });