fix(acir_gen): Keep range checks before side effects

.github/benchmark_projects.yml

@@ -56,7 +56,7 @@ projects:
     cannot_execute: true
     num_runs: 5
     timeout: 60
-    compilation-timeout: 25
+    compilation-timeout: 30
     compilation-memory-limit: 1500
   rollup-block-root-single-tx:
     repo: AztecProtocol/aztec-packages

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

@@ -1,8 +1,11 @@
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 
 use acir::{
     AcirField,
-    circuit::{AcirOpcodeLocation, AssertionPayload, Circuit, ExpressionWidth, OpcodeLocation},
+    circuit::{
+        AcirOpcodeLocation, AssertionPayload, Circuit, ExpressionWidth, OpcodeLocation,
+        brillig::BrilligFunctionId,
+    },
 };
 
 // The various passes that we can use over ACIR
@@ -92,13 +95,15 @@ fn transform_assert_messages<F: Clone>(
 pub fn compile<F: AcirField>(
     acir: Circuit<F>,
     expression_width: ExpressionWidth,
+    brillig_side_effects: &BTreeMap<BrilligFunctionId, bool>,
 ) -> (Circuit<F>, AcirTransformationMap) {
     let acir_opcode_positions = (0..acir.opcodes.len()).collect::<Vec<_>>();
 
-    let (acir, acir_opcode_positions) = optimize_internal(acir, acir_opcode_positions);
+    let (acir, acir_opcode_positions) =
+        optimize_internal(acir, acir_opcode_positions, brillig_side_effects);
 
     let (mut acir, acir_opcode_positions) =
-        transform_internal(acir, expression_width, acir_opcode_positions);
+        transform_internal(acir, expression_width, acir_opcode_positions, brillig_side_effects);
 
     let transformation_map = AcirTransformationMap::new(&acir_opcode_positions);
     acir.assert_messages = transform_assert_messages(acir.assert_messages, &transformation_map);

acvm-repo/acvm/src/compiler/optimizers/mod.rs

@@ -1,6 +1,8 @@
+use std::collections::BTreeMap;
+
 use acir::{
     AcirField,
-    circuit::{Circuit, Opcode},
+    circuit::{Circuit, Opcode, brillig::BrilligFunctionId},
 };
 
 mod general;
@@ -18,12 +20,16 @@ use self::unused_memory::UnusedMemoryOptimizer;
 use super::{AcirTransformationMap, transform_assert_messages};
 
 /// Applies backend independent optimizations to a [`Circuit`].
-pub fn optimize<F: AcirField>(acir: Circuit<F>) -> (Circuit<F>, AcirTransformationMap) {
+pub fn optimize<F: AcirField>(
+    acir: Circuit<F>,
+    brillig_side_effects: &BTreeMap<BrilligFunctionId, bool>,
+) -> (Circuit<F>, AcirTransformationMap) {
     // Track original acir opcode positions throughout the transformation passes of the compilation
     // by applying the modifications done to the circuit opcodes and also to the opcode_positions (delete and insert)
     let acir_opcode_positions = (0..acir.opcodes.len()).collect();
 
-    let (mut acir, new_opcode_positions) = optimize_internal(acir, acir_opcode_positions);
+    let (mut acir, new_opcode_positions) =
+        optimize_internal(acir, acir_opcode_positions, brillig_side_effects);
 
     let transformation_map = AcirTransformationMap::new(&new_opcode_positions);
 
@@ -39,6 +45,7 @@ pub fn optimize<F: AcirField>(acir: Circuit<F>) -> (Circuit<F>, AcirTransformati
 pub(super) fn optimize_internal<F: AcirField>(
     acir: Circuit<F>,
     acir_opcode_positions: Vec<usize>,
+    brillig_side_effects: &BTreeMap<BrilligFunctionId, bool>,
 ) -> (Circuit<F>, Vec<usize>) {
     if acir.opcodes.len() == 1 && matches!(acir.opcodes[0], Opcode::BrilligCall { .. }) {
         info!("Program is fully unconstrained, skipping optimization pass");
@@ -70,7 +77,7 @@ pub(super) fn optimize_internal<F: AcirField>(
     // ConstantBackpropagationOptimizer::backpropagate_constants(acir, acir_opcode_positions);
 
     // Range optimization pass
-    let range_optimizer = RangeOptimizer::new(acir);
+    let range_optimizer = RangeOptimizer::new(acir, brillig_side_effects);
     let (acir, acir_opcode_positions) =
         range_optimizer.replace_redundant_ranges(acir_opcode_positions);