feat: update acvm to 0.15.1 (#1764)

noir-lang · Jun 20, 2023 · b52f25d · b52f25d
1 parent 635b574
commit b52f25d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ edition = "2021"
 rust-version = "1.66"
 
 [workspace.dependencies]
-acvm = "0.15.0"
+acvm = "0.15.1"
 arena = { path = "crates/arena" }
 fm = { path = "crates/fm" }
 iter-extended = { path = "crates/iter-extended" }

diff --git a/crates/nargo/src/ops/execute.rs b/crates/nargo/src/ops/execute.rs
@@ -1,4 +1,3 @@
-use acvm::acir::brillig_vm::ForeignCallResult;
 use acvm::acir::circuit::Opcode;
 use acvm::pwg::{solve, Blocks, PartialWitnessGeneratorStatus, UnresolvedBrilligCall};
 use acvm::PartialWitnessGenerator;
@@ -32,23 +31,21 @@ pub fn execute_circuit(
             // Execute foreign calls
             // TODO(#1615): "oracle_print_impl" and "oracle_print_array_impl" are just identity funcs
             if foreign_call_wait_info.function == "oracle_print_impl" {
-                let values = &foreign_call_wait_info.inputs[0];
-                println!("{:?}", values[0].to_field().to_hex());
-                brillig.foreign_call_results.push(ForeignCallResult {
-                    values: vec![vec![foreign_call_wait_info.inputs[0][0]]],
-                });
+                let value = foreign_call_wait_info.inputs[0][0];
+                println!("{:?}", value.to_field().to_hex());
+                brillig.foreign_call_results.push(value.into());
             } else if foreign_call_wait_info.function == "oracle_print_array_impl" {
                 let mut outputs_hex = Vec::new();
-                for value in foreign_call_wait_info.inputs.clone() {
-                    outputs_hex.push(value[0].to_field().to_hex());
+                for values in foreign_call_wait_info.inputs.clone() {
+                    for value in values {
+                        outputs_hex.push(value.to_field().to_hex());
+                    }
                 }
                 // Join all of the hex strings using a comma
                 let comma_separated_elements = outputs_hex.join(", ");
                 let output_witnesses_string = "[".to_owned() + &comma_separated_elements + "]";
                 println!("{output_witnesses_string}");
-                brillig.foreign_call_results.push(ForeignCallResult {
-                    values: vec![vec![foreign_call_wait_info.inputs[0][0]]],
-                });
+                brillig.foreign_call_results.push(foreign_call_wait_info.inputs[0][0].into());
             }
 
             let mut next_opcodes_for_solving = vec![Opcode::Brillig(brillig)];

diff --git a/crates/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs b/crates/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
@@ -10,7 +10,7 @@ use crate::ssa_refactor::ir::{
     types::{NumericType, Type},
     value::{Value, ValueId},
 };
-use acvm::acir::brillig_vm::{BinaryFieldOp, BinaryIntOp, RegisterIndex, RegisterValueOrArray};
+use acvm::acir::brillig_vm::{BinaryFieldOp, BinaryIntOp, RegisterIndex, RegisterOrMemory};
 use acvm::FieldElement;
 use iter_extended::vecmap;
 
@@ -430,12 +430,12 @@ impl<'block> BrilligBlock<'block> {
         &mut self,
         value_id: ValueId,
         dfg: &DataFlowGraph,
-    ) -> RegisterValueOrArray {
+    ) -> RegisterOrMemory {
         let register_index = self.convert_ssa_value(value_id, dfg);
         let typ = dfg[value_id].get_type();
         match typ {
-            Type::Numeric(_) => RegisterValueOrArray::RegisterIndex(register_index),
-            Type::Array(_, size) => RegisterValueOrArray::HeapArray(register_index, size),
+            Type::Numeric(_) => RegisterOrMemory::RegisterIndex(register_index),
+            Type::Array(_, size) => RegisterOrMemory::HeapArray(register_index, size),
             _ => {
                 unreachable!("type not supported for conversion into brillig register")
             }

diff --git a/crates/noirc_evaluator/src/brillig/brillig_ir.rs b/crates/noirc_evaluator/src/brillig/brillig_ir.rs
@@ -14,8 +14,7 @@ use self::{
 };
 use acvm::{
     acir::brillig_vm::{
-        BinaryFieldOp, BinaryIntOp, Opcode as BrilligOpcode, RegisterIndex, RegisterValueOrArray,
-        Value,
+        BinaryFieldOp, BinaryIntOp, Opcode as BrilligOpcode, RegisterIndex, RegisterOrMemory, Value,
     },
     FieldElement,
 };
@@ -442,8 +441,8 @@ impl BrilligContext {
     pub(crate) fn foreign_call_instruction(
         &mut self,
         func_name: String,
-        inputs: &[RegisterValueOrArray],
-        outputs: &[RegisterValueOrArray],
+        inputs: &[RegisterOrMemory],
+        outputs: &[RegisterOrMemory],
     ) {
         debug_show::foreign_call_instruction(func_name.clone(), inputs, outputs);
         // TODO(https://github.com/noir-lang/acvm/issues/366): Enable multiple inputs and outputs to a foreign call

diff --git a/crates/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs b/crates/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
@@ -1,9 +1,7 @@
 ///! This module contains functions for producing a higher level view disassembler of Brillig.
 use super::BrilligBinaryOp;
 use crate::brillig::brillig_ir::{ReservedRegisters, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE};
-use acvm::acir::brillig_vm::{
-    BinaryFieldOp, BinaryIntOp, RegisterIndex, RegisterValueOrArray, Value,
-};
+use acvm::acir::brillig_vm::{BinaryFieldOp, BinaryIntOp, RegisterIndex, RegisterOrMemory, Value};
 
 /// Controls whether debug traces are enabled
 const ENABLE_DEBUG_TRACE: bool = true;
@@ -98,13 +96,20 @@ impl DebugToString for Value {
     }
 }
 
-impl DebugToString for RegisterValueOrArray {
+impl DebugToString for RegisterOrMemory {
     fn debug_to_string(&self) -> String {
         match self {
-            RegisterValueOrArray::RegisterIndex(index) => index.debug_to_string(),
-            RegisterValueOrArray::HeapArray(index, size) => {
+            RegisterOrMemory::RegisterIndex(index) => index.debug_to_string(),
+            RegisterOrMemory::HeapArray(index, size) => {
                 format!("{}[0..{}]", index.debug_to_string(), size)
             }
+            RegisterOrMemory::HeapVector(location_index, length_index) => {
+                format!(
+                    "{}[0..{}]",
+                    location_index.debug_to_string(),
+                    length_index.debug_to_string()
+                )
+            }
         }
     }
 }
@@ -173,8 +178,8 @@ pub(crate) fn not_instruction(condition: RegisterIndex, result: RegisterIndex) {
 /// Processes a foreign call instruction.
 pub(crate) fn foreign_call_instruction(
     func_name: String,
-    inputs: &[RegisterValueOrArray],
-    outputs: &[RegisterValueOrArray],
+    inputs: &[RegisterOrMemory],
+    outputs: &[RegisterOrMemory],
 ) {
     debug_println!("  FOREIGN_CALL {} ({}) => {}", func_name, inputs, outputs);
 }