Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

[word-lo-hi] fine tune copy circuit to reduce degree #1508

Merged
merged 1 commit into from
Jul 3, 2023
Merged

[word-lo-hi] fine tune copy circuit to reduce degree #1508

Show file tree
Hide file tree
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
31 changes: 25 additions & 6 deletions zkevm-circuits/src/copy_circuit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,14 +419,33 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
.collect()
});

meta.create_gate("id_hi === 0 when Momory, TxLog, and TxCalldata", |meta| {
meta.create_gate("id_hi === 0 when Momory", |meta| {
let mut cb = BaseConstraintBuilder::default();

let cond = or::expr([
tag.value_equals(CopyDataType::Memory, Rotation::cur())(meta),
tag.value_equals(CopyDataType::TxLog, Rotation::cur())(meta),
tag.value_equals(CopyDataType::TxCalldata, Rotation::cur())(meta),
]) * not::expr(meta.query_advice(is_pad, Rotation::cur()));
let cond = tag.value_equals(CopyDataType::Memory, Rotation::cur())(meta)
* not::expr(meta.query_advice(is_pad, Rotation::cur()));
cb.condition(cond, |cb| {
cb.require_zero("id_hi === 0", meta.query_advice(id.hi(), Rotation::cur()))
});
cb.gate(meta.query_fixed(q_enable, Rotation::cur()))
});

meta.create_gate("id_hi === 0 when TxLog", |meta| {
let mut cb = BaseConstraintBuilder::default();

let cond = tag.value_equals(CopyDataType::TxLog, Rotation::cur())(meta)
* not::expr(meta.query_advice(is_pad, Rotation::cur()));
cb.condition(cond, |cb| {
cb.require_zero("id_hi === 0", meta.query_advice(id.hi(), Rotation::cur()))
});
cb.gate(meta.query_fixed(q_enable, Rotation::cur()))
});

meta.create_gate("id_hi === 0 when TxCalldata", |meta| {
let mut cb = BaseConstraintBuilder::default();

let cond = tag.value_equals(CopyDataType::TxCalldata, Rotation::cur())(meta)
* not::expr(meta.query_advice(is_pad, Rotation::cur()));
cb.condition(cond, |cb| {
cb.require_zero("id_hi === 0", meta.query_advice(id.hi(), Rotation::cur()))
});
Expand Down
2 changes: 1 addition & 1 deletion zkevm-circuits/src/super_circuit/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn super_circuit_degree() {
SuperCircuit::configure_with_params(&mut cs, params);
log::info!("super circuit degree: {}", cs.degree());
log::info!("super circuit minimum_rows: {}", cs.minimum_rows());
assert!(cs.degree() <= 12);
assert!(cs.degree() <= 10);
}

fn test_super_circuit(block: GethData, circuits_params: CircuitsParams, mock_randomness: Fr) {
Expand Down