diff --git a/acvm-repo/acvm/src/compiler/optimizers/mod.rs b/acvm-repo/acvm/src/compiler/optimizers/mod.rs index 1b743227ac..3531825c70 100644 --- a/acvm-repo/acvm/src/compiler/optimizers/mod.rs +++ b/acvm-repo/acvm/src/compiler/optimizers/mod.rs @@ -37,7 +37,7 @@ pub fn optimize(acir: Circuit) -> (Circuit, AcirTransformati /// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] independent optimizations to a [`Circuit`]. /// /// Accepts an injected `acir_opcode_positions` to allow optimizations to be applied in a loop. -#[tracing::instrument(level = "trace", name = "optimize_acir" skip(acir))] +#[tracing::instrument(level = "trace", name = "optimize_acir" skip(acir, acir_opcode_positions))] pub(super) fn optimize_internal( acir: Circuit, acir_opcode_positions: Vec, diff --git a/compiler/noirc_evaluator/src/ssa/checks/check_for_underconstrained_values.rs b/compiler/noirc_evaluator/src/ssa/checks/check_for_underconstrained_values.rs index 40c9dc03ec..f092f63cd0 100644 --- a/compiler/noirc_evaluator/src/ssa/checks/check_for_underconstrained_values.rs +++ b/compiler/noirc_evaluator/src/ssa/checks/check_for_underconstrained_values.rs @@ -229,7 +229,7 @@ impl DependencyContext { function: &Function, all_functions: &BTreeMap, ) { - trace!("processing instructions of block {} of function {}", block, function); + trace!("processing instructions of block {} of function {}", block, function.id()); for instruction in function.dfg[block].instructions() { let mut arguments = Vec::new(); @@ -319,11 +319,6 @@ impl DependencyContext { Value::Function(callee) => match all_functions[&callee].runtime() { RuntimeType::Brillig(_) => { // Record arguments/results for each Brillig call for the check - trace!( - "Brillig function {} called at {}", - all_functions[&callee], - instruction - ); self.tainted.insert( *instruction, BrilligTaintedIds::new(&arguments, &results), @@ -376,7 +371,7 @@ impl DependencyContext { } } - trace!("resulting Brillig involved values: {:?}", self.tainted); + trace!("Number tainted Brillig calls: {}", self.tainted.len()); } /// Every Brillig call not properly constrained should remain in the tainted set @@ -392,7 +387,11 @@ impl DependencyContext { }) .collect(); - trace!("making following reports for function {}: {:?}", function.name(), warnings); + trace!( + "making {} under constrained reports for function {}", + warnings.len(), + function.name() + ); warnings } @@ -407,8 +406,6 @@ impl DependencyContext { /// Check if any of the recorded Brillig calls have been properly constrained /// by given values after recording partial constraints, if so stop tracking them fn clear_constrained(&mut self, constrained_values: &[ValueId], function: &Function) { - trace!("attempting to clear Brillig calls constrained by values: {:?}", constrained_values); - // Remove numeric constants let constrained_values = constrained_values.iter().filter(|v| function.dfg.get_numeric_constant(**v).is_none());