Skip to content

fix: improve lock ordering in assign_lookups_in_phase #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lil-Duckling-22 wants to merge 1 commit into
base: community-edition
Choose a base branch
from
Open

fix: improve lock ordering in assign_lookups_in_phase #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion halo2-base/src/gates/circuit/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,12 @@ impl<F: ScalarField> BaseCircuitBuilder<F> {
// if q_lookup is Some, that means there should be a single advice column and it has lookup enabled
assert_eq!(config.gate.basic_gates[phase].len(), 1);
if !self.witness_gen_only() {
// Lock copy_manager once before the loop to avoid repeated locking/unlocking
// and to maintain consistent lock order (copy_manager -> cells_to_lookup)
let copy_manager = self.core.copy_manager.lock().unwrap();
let cells_to_lookup = lookup_manager.cells_to_lookup.lock().unwrap();
for advice in cells_to_lookup.iter().flat_map(|(_, advices)| advices) {
let cell = advice[0].cell.as_ref().unwrap();
let copy_manager = self.core.copy_manager.lock().unwrap();
let acell = copy_manager.assigned_advices[cell];
assert_eq!(
acell.column,
Expand Down