Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit 5658bc5

Browse files
lispczhenfeizhang
authored andcommitted
speedup ci using verify_at_rows (#703)
* speedup ci using verify_at_rows * use verify_at_rows to speedup super circuit ci tests
1 parent d6eb833 commit 5658bc5

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

zkevm-circuits/src/super_circuit/test.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ fn test_super_circuit<
5252
builder.block.prev_state_root = block.mpt_updates.old_root();
5353
block.keccak_inputs = keccak_inputs(&builder.block, &builder.code_db).unwrap();
5454

55+
let active_row_num =SuperCircuit::<
56+
Fr,
57+
MAX_TXS,
58+
MAX_CALLDATA,
59+
MAX_INNER_BLOCKS,
60+
MOCK_RANDOMNESS,
61+
>::min_num_rows_block(&block).0;
5562
let (k, circuit, instance) = SuperCircuit::<
5663
Fr,
5764
MAX_TXS,
@@ -61,10 +68,11 @@ fn test_super_circuit<
6168
>::build_from_witness_block(block)
6269
.unwrap();
6370
let prover = MockProver::run(k, &circuit, instance).unwrap();
64-
prover.assert_satisfied_par();
65-
let res = prover.verify_par();
66-
if let Err(err) = res {
67-
error!("Verification failures: {:#?}", err);
71+
72+
let res = prover.verify_at_rows_par(0..active_row_num, 0..active_row_num);
73+
if let Err(errs) = res {
74+
error!("Verification failures: {:#?}", errs);
75+
prover.assert_satisfied_par();
6876
panic!("Failed verification");
6977
}
7078
}

zkevm-circuits/src/tx_circuit/test.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,9 @@ fn run<F: Field>(
114114
max_txs: usize,
115115
max_calldata: usize,
116116
) -> Result<(), Vec<VerifyFailure>> {
117-
let k = max(
118-
20,
119-
log2_ceil(TxCircuit::<F>::min_num_rows(max_txs, max_calldata)),
120-
);
117+
let active_row_num = TxCircuit::<F>::min_num_rows(max_txs, max_calldata);
118+
119+
let k = max(20, log2_ceil(active_row_num));
121120
let circuit = TxCircuitTester::<F> {
122121
sig_circuit: SigCircuit {
123122
max_verif: max_txs,
@@ -131,7 +130,7 @@ fn run<F: Field>(
131130
Err(e) => panic!("{e:#?}"),
132131
};
133132

134-
prover.verify_par()
133+
prover.verify_at_rows_par(0..active_row_num, 0..active_row_num)
135134
}
136135

137136
#[test]

0 commit comments

Comments
 (0)