logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-08 00:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #978 from toposware/stack_constraints

Browse Source 
Enable stack constraints
This commit is contained in:
Jacqueline Nabaglo 2023-04-13 12:18:38 -07:00 committed by GitHub
commit 5fce67d14e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evm/src/cpu/cpu_stark.rs
View File

@ -156,7 +156,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
pc::eval_packed(local_values, yield_constr); pc::eval_packed(local_values, yield_constr);
shift::eval_packed(local_values, yield_constr); shift::eval_packed(local_values, yield_constr);
simple_logic::eval_packed(local_values, yield_constr); simple_logic::eval_packed(local_values, yield_constr);
stack::eval_packed(local_values, &mut dummy_yield_constr); stack::eval_packed(local_values, yield_constr);
stack_bounds::eval_packed(local_values, &mut dummy_yield_constr); stack_bounds::eval_packed(local_values, &mut dummy_yield_constr);
syscalls::eval_packed(local_values, next_values, yield_constr); syscalls::eval_packed(local_values, next_values, yield_constr);
} }
@ -186,7 +186,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
pc::eval_ext_circuit(builder, local_values, yield_constr); pc::eval_ext_circuit(builder, local_values, yield_constr);
shift::eval_ext_circuit(builder, local_values, yield_constr); shift::eval_ext_circuit(builder, local_values, yield_constr);
simple_logic::eval_ext_circuit(builder, local_values, yield_constr); simple_logic::eval_ext_circuit(builder, local_values, yield_constr);
stack::eval_ext_circuit(builder, local_values, &mut dummy_yield_constr); stack::eval_ext_circuit(builder, local_values, yield_constr);
stack_bounds::eval_ext_circuit(builder, local_values, &mut dummy_yield_constr); stack_bounds::eval_ext_circuit(builder, local_values, &mut dummy_yield_constr);
syscalls::eval_ext_circuit(builder, local_values, next_values, yield_constr); syscalls::eval_ext_circuit(builder, local_values, next_values, yield_constr);
} }

14
evm/src/cpu/stack.rs
View File

@ -29,7 +29,7 @@ const BASIC_BINARY_OP: Option<StackBehavior> = Some(StackBehavior {
disable_other_channels: true, disable_other_channels: true,
}); });
const BASIC_TERNARY_OP: Option<StackBehavior> = Some(StackBehavior { const BASIC_TERNARY_OP: Option<StackBehavior> = Some(StackBehavior {
num_pops: 2, num_pops: 3,
pushes: true, pushes: true,
disable_other_channels: true, disable_other_channels: true,
}); });
@ -60,8 +60,16 @@ const STACK_BEHAVIORS: OpsColumnsView<Option<StackBehavior>> = OpsColumnsView {
xor: BASIC_BINARY_OP, xor: BASIC_BINARY_OP,
not: BASIC_UNARY_OP, not: BASIC_UNARY_OP,
byte: BASIC_BINARY_OP, byte: BASIC_BINARY_OP,
shl: BASIC_BINARY_OP, shl: Some(StackBehavior {
shr: BASIC_BINARY_OP, num_pops: 2,
pushes: true,
disable_other_channels: false,
}),
shr: Some(StackBehavior {
num_pops: 2,
pushes: true,
disable_other_channels: false,
}),
keccak_general: None, // TODO keccak_general: None, // TODO
prover_input: None, // TODO prover_input: None, // TODO
pop: None, // TODO pop: None, // TODO