chore(ssa refactor): Pass predicate to brillig opcodes (#1812)

thread predicate through to the brillig opcode
noir-lang · Jul 4, 2023 · fdad81d · fdad81d
1 parent 310368d
commit fdad81d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/acir_variable.rs b/crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/acir_variable.rs
@@ -158,7 +158,9 @@ impl AcirContext {
         // Compute the inverse with brillig code
         let inverse_code = brillig_directive::directive_invert();
         let field_type = AcirType::NumericType(NumericType::NativeField);
+
         let results = self.brillig(
+            None,
             inverse_code,
             vec![AcirValue::Var(var, field_type.clone())],
             vec![field_type],
@@ -743,6 +745,7 @@ impl AcirContext {
 
     pub(crate) fn brillig(
         &mut self,
+        predicate: Option<AcirVar>,
         code: Vec<BrilligOpcode>,
         inputs: Vec<AcirValue>,
         outputs: Vec<AcirType>,
@@ -783,8 +786,8 @@ impl AcirContext {
                 AcirValue::Array(array_values)
             }
         });
-
-        self.acir_ir.brillig(code, b_inputs, b_outputs);
+        let predicate = predicate.map(|var| self.vars[&var].to_expression().into_owned());
+        self.acir_ir.brillig(predicate, code, b_inputs, b_outputs);
 
         outputs_var
     }

diff --git a/crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/generated_acir.rs b/crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/generated_acir.rs
@@ -464,7 +464,7 @@ impl GeneratedAcir {
         let inverse_code = brillig_directive::directive_invert();
         let inputs = vec![BrilligInputs::Single(expr.clone())];
         let outputs = vec![BrilligOutputs::Simple(inverted_witness)];
-        self.brillig(inverse_code, inputs, outputs);
+        self.brillig(Some(Expression::one()), inverse_code, inputs, outputs);
 
         inverted_witness
     }
@@ -671,6 +671,7 @@ impl GeneratedAcir {
 
     pub(crate) fn brillig(
         &mut self,
+        predicate: Option<Expression>,
         code: Vec<BrilligOpcode>,
         inputs: Vec<BrilligInputs>,
         outputs: Vec<BrilligOutputs>,
@@ -680,7 +681,7 @@ impl GeneratedAcir {
             outputs,
             foreign_call_results: Vec::new(),
             bytecode: code,
-            predicate: None,
+            predicate,
         });
         self.push_opcode(opcode);
     }

diff --git a/crates/noirc_evaluator/src/ssa_refactor/acir_gen/mod.rs b/crates/noirc_evaluator/src/ssa_refactor/acir_gen/mod.rs
@@ -228,7 +228,7 @@ impl Context {
 
                                 let outputs: Vec<AcirType> = vecmap(result_ids, |result_id| dfg.type_of_value(*result_id).into());
 
-                                let output_values = self.acir_context.brillig(code, inputs, outputs);
+                                let output_values = self.acir_context.brillig(self.current_side_effects_enabled_var,code, inputs, outputs);
                                 // Compiler sanity check
                                 assert_eq!(result_ids.len(), output_values.len(), "ICE: The number of Brillig output values should match the result ids in SSA");