Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acvm-repo/acvm/src/compiler/optimizers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub fn optimize<F: AcirField>(acir: Circuit<F>) -> (Circuit<F>, 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))]
Comment thread
vezenovm marked this conversation as resolved.
pub(super) fn optimize_internal<F: AcirField>(
acir: Circuit<F>,
acir_opcode_positions: Vec<usize>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ impl DependencyContext {
function: &Function,
all_functions: &BTreeMap<FunctionId, Function>,
) {
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();
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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
Expand All @@ -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
}

Expand All @@ -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);
Comment thread
vezenovm marked this conversation as resolved.

// Remove numeric constants
let constrained_values =
constrained_values.iter().filter(|v| function.dfg.get_numeric_constant(**v).is_none());
Expand Down