chore: typos and some refactors in acvm/src/pwg/mod.rs

acvm-repo/acvm/src/pwg/mod.rs

@@ -19,35 +19,12 @@
 //!  - `unconstrained_functions`: the Brillig bytecode of the unconstrained functions used by the program.
 //!  - `assertion_payloads`: additional information used to provide feedback to the user when an assertion fails.
 //!
-//! Returns: ACVM Status
-//! - `Solved`: all witness have been successfully computed, execution is complete.
-//! - `InProgress`: The ACVM is processing the circuit, i.e solving the opcodes. This status is used to resume execution after it has been paused.
-//! - `Failure(OpcodeResolutionError<F>)`: Error, execution is stopped.
-//! - `RequiresForeignCall(ForeignCallWaitInfo<F>)`: Execution is paused until the result of a foreign call is provided
-//! - `RequiresAcirCall(AcirCallWaitInfo<F>)`: Execution is paused until the result of an ACIR call is provided
+//! Returns: [`ACVMStatus`]
 //!
 //! Each opcode is solved independently. In general we require its inputs to be already known, i.e previously solved,
 //! and the output is simply computed from the inputs, and then the output becomes 'known' for the subsequent opcodes.
 //!
-//! - AssertZero opcode: The arithmetic expression of the opcode is solved for one unknown witness.
-//!   It will fail if there is more than one unknown witness in the expression.
-//!
-//! - BlackBoxFuncCall opcode: The blackbox module knows how to compute the result of the function when all its input are known.
-//!
-//! - MemoryInit opcode: Instantiate a MemoryOpSolver for the opcode's array, using the given initial values.
-//!   Initial witness values must be known. The memory values will be updated later by MemoryOp opcodes.
-//!
-//! - MemoryOp opcode: Update the memory values of the opcode's array from the opcode witness values:
-//!   A read operation will solve the corresponding witness value, reading the memory value tracked by the MemoryOpSolver at the (known value) of the opcode index.
-//!   A write operation will update the memory value tracked by the MemoryOpSolver using the known values of the opcode index/value witnesses.
-//!
-//! - BrilligCall opcode: Calls an unconstrained Brillig function by instantiating a BrilligSolver (i.e a Brillig VM).
-//!   If the function is a foreign call, the `solve()` will halt and wait for the caller to resolve the foreign call.
-//!
-//! - Call opcode: Execute the ACIR call in a separate ACVM instance. The result of the ACIR call will be passed back to the ACVM using a
-//!   mechanism similar to the one for foreign calls.
-//!
-//!
+//! See [`acir::circuit::Opcode`] for more details.
 //!
 //! Example:
 // Compiled ACIR for main (non-transformed):
@@ -71,8 +48,8 @@
 //! Indeed, some ACIR pass can transform the ACIR program in order to apply optimizations,
 //! or to make it compatible with a specific proving system.
 //! However, ACIR execution is expected to work on any ACIR program (transformed or not).
-//! Then the program indicates the 'current witness', which is the lasted witness used in the program.
-//! Any transformation that needs to add more witness will use it in order to not overlap with
+//! Then the program indicates the 'current witness', which is the last witness used in the program.
+//! Any transformation that needs to add more witnesses will use it in order to not overlap with
 //! existing witnesses. This is not relevant for execution.
 //! Then we see the parameters of the program as public and private inputs.
 //! The `initial_witness` needs to contain values for these parameters before execution, else
@@ -87,10 +64,10 @@
 //! corresponding Brillig bytecode and instantiate a Brillig VM with the value of the input. This value was just computed before.
 //! Executing the Brillig VM on this input will give us the output which is the value for `w7`, that we add to `initial_witness`.
 //! The next opcode is again an AssertZero: `w6 * w7 + w8 - 1 = 0`, which computes the value of `w8`.
-//! The two next opcode are AssertZero without any unknown witness: `w6 * w8 = 0` and `w1 * w8 = 0`
-//! Solving such opcodes means that we compute `w6 * w8 ` and `w1 * w8` using the known values, and check that it is 0.
+//! The two next opcodes are AssertZero without any unknown witnesses: `w6 * w8 = 0` and `w1 * w8 = 0`
+//! Solving such opcodes means that we compute `w6 * w8 ` and `w1 * w8` using the known values, and check that they evaluate to 0.
 //! If not, we would return an error.
-//! Finally, the last AssertZero computes `w9` which is the last witness. All the witness have now been computed; execution is complete.
+//! Finally, the last AssertZero computes `w9` which is the last witness. All of the witnesses have now been computed; execution is complete.
 
 use std::collections::HashMap;
 
@@ -99,7 +76,7 @@ use acir::{
     brillig::ForeignCallResult,
     circuit::{
         AssertionPayload, ErrorSelector, ExpressionOrMemory, Opcode, OpcodeLocation,
-        brillig::{BrilligBytecode, BrilligFunctionId},
+        brillig::{BrilligBytecode, BrilligFunctionId, BrilligInputs, BrilligOutputs},
         opcodes::{AcirFunctionId, BlockId, FunctionInput, InvalidInputBitSize},
     },
     native_types::{Expression, Witness, WitnessMap},
@@ -126,10 +103,10 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum ACVMStatus<F> {
-    /// All opcodes have been solved.
+    /// All witnesses have been computed and all opcodes have been successfully resolved. Execution is complete.
     Solved,
 
-    /// The ACVM is in the process of executing the circuit.
+    /// The ACVM is processing the circuit, i.e solving the opcodes. This status is used to resume execution after it has been paused.
     InProgress,
 
     /// The ACVM has encountered an irrecoverable error while executing the circuit and can not progress.
@@ -173,9 +150,9 @@ pub enum StepResult<'a, F, B: BlackBoxFunctionSolver<F>> {
 // The most common being that one of its input has not been
 // assigned a value.
 //
-// TODO: ExpressionHasTooManyUnknowns is specific for expression solver
-// TODO: we could have a error enum for expression solver failure cases in that module
-// TODO that can be converted into an OpcodeNotSolvable or OpcodeResolutionError enum
+// TODO(https://github.com/noir-lang/noir/issues/10052): ExpressionHasTooManyUnknowns is specific for expression solver
+// TODO(https://github.com/noir-lang/noir/issues/10052): we could have a error enum for expression solver failure cases in that module
+// TODO(https://github.com/noir-lang/noir/issues/10052): that can be converted into an OpcodeNotSolvable or OpcodeResolutionError enum
 #[derive(Clone, PartialEq, Eq, Debug, Error)]
 pub enum OpcodeNotSolvable<F> {
     #[error("missing assignment for witness index {0}")]
@@ -186,7 +163,8 @@ pub enum OpcodeNotSolvable<F> {
     ExpressionHasTooManyUnknowns(Expression<F>),
 }
 
-/// Allows to point to a specific opcode as cause in errors.
+/// Used by errors to point to a specific opcode as that error's cause
+///
 /// Some errors don't have a specific opcode associated with them, or are created without one and added later.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 pub enum ErrorLocation {
@@ -500,15 +478,18 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
         self.status.clone()
     }
 
+    fn current_opcode(&self) -> &'a Opcode<F> {
+        &self.opcodes[self.instruction_pointer]
+    }
+
     /// Executes a single opcode using the dedicated solver.
     ///
     /// Foreign or ACIR Calls are deferred to the caller, which will
     /// either instantiate a new ACVM to execute the called ACIR function
     /// or a custom implementation to execute the foreign call.
     /// Then it will resume execution of the current ACVM with the results of the call.
     pub fn solve_opcode(&mut self) -> ACVMStatus<F> {
-        let opcode = &self.opcodes[self.instruction_pointer];
-        let resolution = match opcode {
+        let resolution = match self.current_opcode() {
             Opcode::AssertZero(expr) => ExpressionSolver::solve(&mut self.witness_map, expr),
             Opcode::BlackBoxFuncCall(bb_func) => {
                 blackbox::solve(self.backend, &mut self.witness_map, bb_func)
@@ -526,14 +507,18 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
                     .expect("Memory block should have been initialized before use");
                 solver.solve_memory_op(op, &mut self.witness_map)
             }
-            Opcode::BrilligCall { .. } => match self.solve_brillig_call_opcode() {
-                Ok(Some(foreign_call)) => return self.wait_for_foreign_call(foreign_call),
-                res => res.map(|_| ()),
-            },
-            Opcode::Call { .. } => match self.solve_call_opcode() {
-                Ok(Some(input_values)) => return self.wait_for_acir_call(input_values),
-                res => res.map(|_| ()),
-            },
+            Opcode::BrilligCall { id, inputs, outputs, predicate } => {
+                match self.solve_brillig_call_opcode(id, inputs, outputs, predicate) {
+                    Ok(Some(foreign_call)) => return self.wait_for_foreign_call(foreign_call),
+                    res => res.map(|_| ()),
+                }
+            }
+            Opcode::Call { id, inputs, outputs, predicate } => {
+                match self.solve_call_opcode(id, inputs, outputs, predicate) {
+                    Ok(Some(input_values)) => return self.wait_for_acir_call(input_values),
+                    res => res.map(|_| ()),
+                }
+            }
         };
         self.handle_opcode_resolution(resolution)
     }
@@ -555,8 +540,8 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
             }
             Err(mut error) => {
                 match &mut error {
-                    // If we have an index out of bounds or an unsatisfied constraint, the opcode label will be unresolved
-                    // because the solvers do not have knowledge of this information.
+                    // If we have an index out of bounds, unsatisfied constraint, or an invalid input bit size,
+                    // the opcode label will be unresolved because the solvers do not have knowledge of this information.
                     // We resolve, by setting this to the corresponding opcode that we just attempted to solve.
                     OpcodeResolutionError::IndexOutOfBounds {
                         opcode_location: opcode_index,
@@ -621,13 +606,11 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
     /// Then it executes (or resumes execution) the Brillig function using a Brillig VM.
     fn solve_brillig_call_opcode(
         &mut self,
+        id: &BrilligFunctionId,
+        inputs: &'a [BrilligInputs<F>],
+        outputs: &[BrilligOutputs],
+        predicate: &Option<Expression<F>>,
     ) -> Result<Option<ForeignCallWaitInfo<F>>, OpcodeResolutionError<F>> {
-        let Opcode::BrilligCall { id, inputs, outputs, predicate } =
-            &self.opcodes[self.instruction_pointer]
-        else {
-            unreachable!("Not executing a BrilligCall opcode");
-        };
-
         let opcode_location =
             ErrorLocation::Resolved(OpcodeLocation::Acir(self.instruction_pointer()));
         if is_predicate_false(
@@ -707,9 +690,7 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
 
     // This function is used by the debugger
     pub fn step_into_brillig(&mut self) -> StepResult<'a, F, B> {
-        let Opcode::BrilligCall { id, inputs, outputs, predicate } =
-            &self.opcodes[self.instruction_pointer]
-        else {
+        let Opcode::BrilligCall { id, inputs, outputs, predicate } = self.current_opcode() else {
             return StepResult::Status(self.solve_opcode());
         };
 
@@ -749,7 +730,7 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
 
     // This function is used by the debugger
     pub fn finish_brillig_with_solver(&mut self, solver: BrilligSolver<'a, F, B>) -> ACVMStatus<F> {
-        if !matches!(self.opcodes[self.instruction_pointer], Opcode::BrilligCall { .. }) {
+        if !matches!(self.current_opcode(), Opcode::BrilligCall { .. }) {
             unreachable!("Not executing a Brillig/BrilligCall opcode");
         }
         self.brillig_solver = Some(solver);
@@ -763,13 +744,11 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
     /// 3. If the results are available, it updates the witness map and indicates that the opcode is solved.
     pub fn solve_call_opcode(
         &mut self,
+        id: &AcirFunctionId,
+        inputs: &[Witness],
+        outputs: &[Witness],
+        predicate: &Option<Expression<F>>,
     ) -> Result<Option<AcirCallWaitInfo<F>>, OpcodeResolutionError<F>> {
-        let Opcode::Call { id, inputs, outputs, predicate } =
-            &self.opcodes[self.instruction_pointer]
-        else {
-            unreachable!("Not executing a Call opcode");
-        };
-
         let opcode_location =
             ErrorLocation::Resolved(OpcodeLocation::Acir(self.instruction_pointer()));
         if *id == AcirFunctionId(0) {
@@ -829,8 +808,6 @@ pub fn witness_to_value<F>(
     }
 }
 
-// TODO(https://github.com/noir-lang/noir/issues/5985):
-// remove skip_bitsize_checks
 pub fn input_to_value<F: AcirField>(
     initial_witness: &WitnessMap<F>,
     input: FunctionInput<F>,
@@ -916,9 +893,11 @@ fn any_witness_from_expression<F>(expr: &Expression<F>) -> Option<Witness> {
     }
 }
 
-/// Returns `true` if the predicate is zero
+/// Returns `Ok(true)` if the predicate is zero
 /// A predicate is used to indicate whether we should skip a certain operation.
 /// If we have a zero predicate it means the operation should be skipped.
+///
+/// Returns `Ok(false)` when the `predicate` is `None`.
 pub(crate) fn is_predicate_false<F: AcirField>(
     witness: &WitnessMap<F>,
     predicate: &Option<Expression<F>>,
@@ -946,6 +925,7 @@ pub(crate) fn is_predicate_false<F: AcirField>(
     }
 }
 
+/// Currently used in `debugger/src/context.rs`
 #[derive(Debug, Clone, PartialEq)]
 pub struct AcirCallWaitInfo<F> {
     /// Index in the list of ACIR function's that should be called

acvm-repo/acvm_js/src/execute.rs

@@ -319,7 +319,7 @@ impl<'a, B: BlackBoxFunctionSolver<FieldElement>> ProgramExecutor<'a, B> {
                             .execute_circuit(
                                 acir_to_call,
                                 call_info.id,
-                                initial_witness,
+                                initial_witness.clone(),
                                 witness_stack,
                             )
                             .await?;