Skip to content

[MockProver] Use a hash map to track cell assignment #71

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

Merged
CPerezz merged 1 commit into from
May 9, 2022
Merged

[MockProver] Use a hash map to track cell assignment #71

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
24 changes: 17 additions & 7 deletions halo2_proofs/src/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ struct Region {
/// The selectors that have been enabled in this region. All other selectors are by
/// construction not enabled.
enabled_selectors: HashMap<Selector, Vec<usize>>,
/// The cells assigned in this region. We store this as a `Vec` so that if any cells
/// are double-assigned, they will be visibly darker.
cells: Vec<(Column<Any>, usize)>,
/// The cells assigned in this region. We store this as a `HashMap` with count
/// so that if any cells are double-assigned, they will be visibly darker.
cells: HashMap<(Column<Any>, usize), usize>,
}

impl Region {
Expand All @@ -270,6 +270,16 @@ impl Region {
}
self.rows = Some((start, end));
}

fn track_cell(&mut self, column: Column<Any>, row: usize) {
// Keep track of how many times this cell has been assigned to.
let count = *self.cells.get(&(column, row)).unwrap_or(&0);
self.cells.insert((column, row), count + 1);
}

fn is_assigned(&self, column: Column<Any>, row: usize) -> bool {
self.cells.contains_key(&(column, row))
}
}

/// The value of a particular cell within the circuit.
Expand Down Expand Up @@ -509,7 +519,7 @@ impl<F: Field + Group> Assignment<F> for MockProver<F> {
columns: HashSet::default(),
rows: None,
enabled_selectors: HashMap::default(),
cells: vec![],
cells: HashMap::default(),
});
}

Expand Down Expand Up @@ -572,7 +582,7 @@ impl<F: Field + Group> Assignment<F> for MockProver<F> {

if let Some(region) = self.current_region.as_mut() {
region.update_extent(column.into(), row);
region.cells.push((column.into(), row));
region.track_cell(column.into(), row);
}

*self
Expand Down Expand Up @@ -603,7 +613,7 @@ impl<F: Field + Group> Assignment<F> for MockProver<F> {

if let Some(region) = self.current_region.as_mut() {
region.update_extent(column.into(), row);
region.cells.push((column.into(), row));
region.track_cell(column.into(), row);
}

*self
Expand Down Expand Up @@ -799,7 +809,7 @@ impl<F: FieldExt> MockProver<F> {
let cell_row = ((gate_row + n + cell.rotation.0) % n) as usize;

// Check that it was assigned!
if r.cells.contains(&(cell.column, cell_row)) {
if r.is_assigned(cell.column, cell_row) {
None
} else {
Some(VerifyFailure::CellNotAssigned {
Expand Down