Combine mstore_general and mload_general into one flag #1188
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nashtare
reviewed
Aug 16, 2023
LindaGuiga
force-pushed
the
merge-mstore-mload
branch
from
3e7a96f to
f25fda7
Compare
Nashtare
reviewed
Sep 6, 2023
|
@wborgeaud Would you have time to review this by any chance, please? 🙏🏻 |
nbgl
approved these changes
Sep 14, 2023
github-merge-queue bot
pushed a commit
to 0xmozak/plonky2
that referenced
this pull request
Sep 15, 2023
* Make GateRef value public * Better document constraints on addcy carries (0xPolygonZero#1139) * Add missing constraints on addcy carries. * Remove bit-checks; make documentation clearer. * Constrain keccak general * Reuse set_public_value_targets * Fix endianness in benefiary limbs * Convert to u32 instead of u64 * Clippy * Silence Poseidon warnings for ARM targets * Remove unused attributes * Fix trait import. (0xPolygonZero#1163) * Error instead of panicking for missing preprocessed circuits (0xPolygonZero#1159) * Set exception flag to 1. * Connect public values in aggregation circuit (0xPolygonZero#1169) * Connect public values in aggregation circuit * Minor * Write trie roots to memory before kernel bootstrapping (0xPolygonZero#1172) * Write trie roots * Remove CPU trace length * Update hash_initial/final_tries * Fix tests * Minor * PR feedback * Connect SHL/SHR operations to the Arithmetic table (0xPolygonZero#1166) * Add corresponding arithmetic operations to shift ones * Include SHL/SHR in the arithmetic CTL * Prevent overflow * Expand documentation for ctl_data_ternops() * Combine AND and OR flags in CpuStark * Reduce reallocations * Address review * Apply Nicholas comment * Revert changes in cyclic_subgroup_unknown_order * Fix logic CTL * Combine all logic flags together * Comment * Combine EQ and ISZERO flags * Combine jump flags * Add guidance for external contributors to README.md * Use Keccak config in simple tests * Remove is_cpu_cycle * Remove is_bootstrap_kernel column * Implement inverse from Fermat little theorem (0xPolygonZero#1176) * Add inverse from Fermat little theorem * Remove inlining for goldilocks try_inverse method * Remove copy on write for mpt_insert and mpt_delete * Combine a few constraints * Reduce overconstraining in decode module * Remove filtering in membus * Observe public values * Update tests to have a blockgaslimit fitting u32s * Update BlockBaseFee to fit in 2 limbs * Refactor * Apply comment * Combine get_context and set_context into one flag * Remove unnecessary changes in the Operation enum * Apply comment * Patched plonky2 to use a patch for eth_trie_utils * Implement receipts and logs Co-authored-by: Hamy Ratoanina <[email protected]> Co-authored-by: Linda Guiga <[email protected]> * Cleanup * Fix tests and address comments * Change receipts_trie in basic_smart_contract and self_balance_gas_cost * Cleanup * Clippy * Made `PublicValues` serializable - Needed by the prover scheduler. * make generate partial_witness pub * Update range from ReceiptTrie PR * fix: constrain higher bits of reg_preimage * Keccak STARK: constraint preimage to equal A on first round * Constrain next row's stack length * Add missing links between public values * Implement receipts of types 1 and 2 * Apply comments * Fix comment in `proof.rs` * Apply comments * Replace genesis state trie check with TODO * feat: serde for targets * Display actual trace lengths instead of number of ops * Remove duplicate code * Remove filter column for KeccakStark * Added mock feature flag and test * remove spurious * Add blockhash sys opcode * Apply comments * Change h256_ulimbs * Fix overflow check and test. Remove [..8] when using h256_limbs. * Clippy * Fix memop reads, from_prover_inputs and cleanup. * Fix Clippy * Removed mock feature flag and added mock_build * clippy * Now builds on the latest nightly * Also included clippy fixes introduced by new nightly * Apply Nick's comment * Apply Nick's comment * Now refers to sub-crates using paths (and removed `patch` section) - Previously refered to specific `crates.io` versions. - Motivation for this is to allow external projects to be able use specific revisions of this repo. Without this, a `[patch]` section is almost always required in the external project in order to force the internal plonky2 sub-crates to the same version, an approach which comes with its own issues. * Fixes * clippy * Made visibilities outside of crate to allow for forking partial witness gen outside of crate * latest nightly in CI and rust-toolchain * suppress incorrect Clippy error * fmt * clippy suggestions * clippy suggestions * clippy suggestions * clippy suggestions * clippy suggestions * more clippy suggestions * Move byte packing / unpacking to a distinct table (0xPolygonZero#1212) * Duplicate Memory trace into BytePacking one * Add mload_32bytes instruction * Use dedicated ops for byte packing trace * Change witness generation to reduce memory reads for MLOAD_32BYTES * Remove segments * Fix stack * Fix extra product when fixing CTL for byte_packing * Write output value in trace * Add constraints for BYTE_PACKING table * Add recursive constraints for BYTE_PACKING table * Fix constraints * Add address in trace and constraints * Add timestamp and batch inputs into BytePackingOp struct * Add extra column * Fix BytePackingStark CTL * Tiny fix in witness generation * Fix the Memory CTL * Add constraints for the new columns * Remove 1 column * Remove limb columns * Fix * Fix recursive circuit of BytePackingTable * Fix constraints * Fix endianness * Add MSTORE_32BYTES instruction and move decomposition to packing table * Add missing constraint * Add range-check for all bytes * Add extra constraint * Cleanup * Remove REMAINING_LEN column * Add corresponding implementations in interpreter * Fix recursive version * Remove debug assertion because of CI * Remove FILTER column * Update new test from rebasing * Reorder STARK modules to match TraceCheckPoint ordering * Address comments * Pacify clippy * Add documentation to the packing module * Fix doctest * Swap ordering in stack macro (0xPolygonZero#1230) * Swap ordering in stack macro * Update comment * Fix self_balance_gas_cost and basic_smart_contract. (0xPolygonZero#1227) * Fix self_balance_gas_cost and basic_smart_contract. * Fix Clippy * Combine arithmetic flags on the CPU side (0xPolygonZero#1187) * Combine FP254 flags * Combine basic binary ops together and do CTL with opcode value * Combine ternary ops together * Combine MUL DIV and MOD * Combine shift operations * Combine byte with other binary ops * Fix tests * Clean leftover comment * Update from latest main * Put the 'is_simulated' flag inside the Operation enum * Cleaner way to handle "simulated" operations SHL and SHR. * Fix comments. * Minor: suggestion for re-expressing `combined_ops`. * Update comment --------- Co-authored-by: Hamish Ivey-Law <[email protected]> * Remove redundant Keccak sponge cols (0xPolygonZero#1233) * Rename columns in KeccakSponge for clarity * Remove redundant columns * Apply comments * Combine mstore_general and mload_general into one flag (0xPolygonZero#1188) * Combine mstore_general and mload_general into one flag * Add comments and make stack constraints cleaner. * Fix number of native instructions * Ordering * Cleanup * Update calls to stack eval from latest main --------- Co-authored-by: Robin Salen <[email protected]> --------- Co-authored-by: Dimo99 <[email protected]> Co-authored-by: Hamish Ivey-Law <[email protected]> Co-authored-by: Robin Salen <[email protected]> Co-authored-by: Robin Salen <[email protected]> Co-authored-by: Jacqueline Nabaglo <[email protected]> Co-authored-by: Nicholas Ward <[email protected]> Co-authored-by: Linda Guiga <[email protected]> Co-authored-by: wborgeaud <[email protected]> Co-authored-by: Hamy Ratoanina <[email protected]> Co-authored-by: BGluth <[email protected]> Co-authored-by: Linda Guiga <[email protected]> Co-authored-by: John Guibas <[email protected]> Co-authored-by: Daniel Lubarov <[email protected]> Co-authored-by: Ayush Shukla <[email protected]> Co-authored-by: Uma Roy <[email protected]> Co-authored-by: Hamish Ivey-Law <[email protected]>
sai-deng
pushed a commit
to 0xmozak/plonky2
that referenced
this pull request
Jul 18, 2024
* Make GateRef value public * Better document constraints on addcy carries (0xPolygonZero#1139) * Add missing constraints on addcy carries. * Remove bit-checks; make documentation clearer. * Constrain keccak general * Reuse set_public_value_targets * Fix endianness in benefiary limbs * Convert to u32 instead of u64 * Clippy * Silence Poseidon warnings for ARM targets * Remove unused attributes * Fix trait import. (0xPolygonZero#1163) * Error instead of panicking for missing preprocessed circuits (0xPolygonZero#1159) * Set exception flag to 1. * Connect public values in aggregation circuit (0xPolygonZero#1169) * Connect public values in aggregation circuit * Minor * Write trie roots to memory before kernel bootstrapping (0xPolygonZero#1172) * Write trie roots * Remove CPU trace length * Update hash_initial/final_tries * Fix tests * Minor * PR feedback * Connect SHL/SHR operations to the Arithmetic table (0xPolygonZero#1166) * Add corresponding arithmetic operations to shift ones * Include SHL/SHR in the arithmetic CTL * Prevent overflow * Expand documentation for ctl_data_ternops() * Combine AND and OR flags in CpuStark * Reduce reallocations * Address review * Apply Nicholas comment * Revert changes in cyclic_subgroup_unknown_order * Fix logic CTL * Combine all logic flags together * Comment * Combine EQ and ISZERO flags * Combine jump flags * Add guidance for external contributors to README.md * Use Keccak config in simple tests * Remove is_cpu_cycle * Remove is_bootstrap_kernel column * Implement inverse from Fermat little theorem (0xPolygonZero#1176) * Add inverse from Fermat little theorem * Remove inlining for goldilocks try_inverse method * Remove copy on write for mpt_insert and mpt_delete * Combine a few constraints * Reduce overconstraining in decode module * Remove filtering in membus * Observe public values * Update tests to have a blockgaslimit fitting u32s * Update BlockBaseFee to fit in 2 limbs * Refactor * Apply comment * Combine get_context and set_context into one flag * Remove unnecessary changes in the Operation enum * Apply comment * Patched plonky2 to use a patch for eth_trie_utils * Implement receipts and logs Co-authored-by: Hamy Ratoanina <[email protected]> Co-authored-by: Linda Guiga <[email protected]> * Cleanup * Fix tests and address comments * Change receipts_trie in basic_smart_contract and self_balance_gas_cost * Cleanup * Clippy * Made `PublicValues` serializable - Needed by the prover scheduler. * make generate partial_witness pub * Update range from ReceiptTrie PR * fix: constrain higher bits of reg_preimage * Keccak STARK: constraint preimage to equal A on first round * Constrain next row's stack length * Add missing links between public values * Implement receipts of types 1 and 2 * Apply comments * Fix comment in `proof.rs` * Apply comments * Replace genesis state trie check with TODO * feat: serde for targets * Display actual trace lengths instead of number of ops * Remove duplicate code * Remove filter column for KeccakStark * Added mock feature flag and test * remove spurious * Add blockhash sys opcode * Apply comments * Change h256_ulimbs * Fix overflow check and test. Remove [..8] when using h256_limbs. * Clippy * Fix memop reads, from_prover_inputs and cleanup. * Fix Clippy * Removed mock feature flag and added mock_build * clippy * Now builds on the latest nightly * Also included clippy fixes introduced by new nightly * Apply Nick's comment * Apply Nick's comment * Now refers to sub-crates using paths (and removed `patch` section) - Previously refered to specific `crates.io` versions. - Motivation for this is to allow external projects to be able use specific revisions of this repo. Without this, a `[patch]` section is almost always required in the external project in order to force the internal plonky2 sub-crates to the same version, an approach which comes with its own issues. * Fixes * clippy * Made visibilities outside of crate to allow for forking partial witness gen outside of crate * latest nightly in CI and rust-toolchain * suppress incorrect Clippy error * fmt * clippy suggestions * clippy suggestions * clippy suggestions * clippy suggestions * clippy suggestions * more clippy suggestions * Move byte packing / unpacking to a distinct table (0xPolygonZero#1212) * Duplicate Memory trace into BytePacking one * Add mload_32bytes instruction * Use dedicated ops for byte packing trace * Change witness generation to reduce memory reads for MLOAD_32BYTES * Remove segments * Fix stack * Fix extra product when fixing CTL for byte_packing * Write output value in trace * Add constraints for BYTE_PACKING table * Add recursive constraints for BYTE_PACKING table * Fix constraints * Add address in trace and constraints * Add timestamp and batch inputs into BytePackingOp struct * Add extra column * Fix BytePackingStark CTL * Tiny fix in witness generation * Fix the Memory CTL * Add constraints for the new columns * Remove 1 column * Remove limb columns * Fix * Fix recursive circuit of BytePackingTable * Fix constraints * Fix endianness * Add MSTORE_32BYTES instruction and move decomposition to packing table * Add missing constraint * Add range-check for all bytes * Add extra constraint * Cleanup * Remove REMAINING_LEN column * Add corresponding implementations in interpreter * Fix recursive version * Remove debug assertion because of CI * Remove FILTER column * Update new test from rebasing * Reorder STARK modules to match TraceCheckPoint ordering * Address comments * Pacify clippy * Add documentation to the packing module * Fix doctest * Swap ordering in stack macro (0xPolygonZero#1230) * Swap ordering in stack macro * Update comment * Fix self_balance_gas_cost and basic_smart_contract. (0xPolygonZero#1227) * Fix self_balance_gas_cost and basic_smart_contract. * Fix Clippy * Combine arithmetic flags on the CPU side (0xPolygonZero#1187) * Combine FP254 flags * Combine basic binary ops together and do CTL with opcode value * Combine ternary ops together * Combine MUL DIV and MOD * Combine shift operations * Combine byte with other binary ops * Fix tests * Clean leftover comment * Update from latest main * Put the 'is_simulated' flag inside the Operation enum * Cleaner way to handle "simulated" operations SHL and SHR. * Fix comments. * Minor: suggestion for re-expressing `combined_ops`. * Update comment --------- Co-authored-by: Hamish Ivey-Law <[email protected]> * Remove redundant Keccak sponge cols (0xPolygonZero#1233) * Rename columns in KeccakSponge for clarity * Remove redundant columns * Apply comments * Combine mstore_general and mload_general into one flag (0xPolygonZero#1188) * Combine mstore_general and mload_general into one flag * Add comments and make stack constraints cleaner. * Fix number of native instructions * Ordering * Cleanup * Update calls to stack eval from latest main --------- Co-authored-by: Robin Salen <[email protected]> --------- Co-authored-by: Dimo99 <[email protected]> Co-authored-by: Hamish Ivey-Law <[email protected]> Co-authored-by: Robin Salen <[email protected]> Co-authored-by: Robin Salen <[email protected]> Co-authored-by: Jacqueline Nabaglo <[email protected]> Co-authored-by: Nicholas Ward <[email protected]> Co-authored-by: Linda Guiga <[email protected]> Co-authored-by: wborgeaud <[email protected]> Co-authored-by: Hamy Ratoanina <[email protected]> Co-authored-by: BGluth <[email protected]> Co-authored-by: Linda Guiga <[email protected]> Co-authored-by: John Guibas <[email protected]> Co-authored-by: Daniel Lubarov <[email protected]> Co-authored-by: Ayush Shukla <[email protected]> Co-authored-by: Uma Roy <[email protected]> Co-authored-by: Hamish Ivey-Law <[email protected]>
sai-deng
pushed a commit
to 0xmozak/plonky2
that referenced
this pull request
Jul 18, 2024
* Make GateRef value public * Better document constraints on addcy carries (0xPolygonZero#1139) * Add missing constraints on addcy carries. * Remove bit-checks; make documentation clearer. * Constrain keccak general * Reuse set_public_value_targets * Fix endianness in benefiary limbs * Convert to u32 instead of u64 * Clippy * Silence Poseidon warnings for ARM targets * Remove unused attributes * Fix trait import. (0xPolygonZero#1163) * Error instead of panicking for missing preprocessed circuits (0xPolygonZero#1159) * Set exception flag to 1. * Connect public values in aggregation circuit (0xPolygonZero#1169) * Connect public values in aggregation circuit * Minor * Write trie roots to memory before kernel bootstrapping (0xPolygonZero#1172) * Write trie roots * Remove CPU trace length * Update hash_initial/final_tries * Fix tests * Minor * PR feedback * Connect SHL/SHR operations to the Arithmetic table (0xPolygonZero#1166) * Add corresponding arithmetic operations to shift ones * Include SHL/SHR in the arithmetic CTL * Prevent overflow * Expand documentation for ctl_data_ternops() * Combine AND and OR flags in CpuStark * Reduce reallocations * Address review * Apply Nicholas comment * Revert changes in cyclic_subgroup_unknown_order * Fix logic CTL * Combine all logic flags together * Comment * Combine EQ and ISZERO flags * Combine jump flags * Add guidance for external contributors to README.md * Use Keccak config in simple tests * Remove is_cpu_cycle * Remove is_bootstrap_kernel column * Implement inverse from Fermat little theorem (0xPolygonZero#1176) * Add inverse from Fermat little theorem * Remove inlining for goldilocks try_inverse method * Remove copy on write for mpt_insert and mpt_delete * Combine a few constraints * Reduce overconstraining in decode module * Remove filtering in membus * Observe public values * Update tests to have a blockgaslimit fitting u32s * Update BlockBaseFee to fit in 2 limbs * Refactor * Apply comment * Combine get_context and set_context into one flag * Remove unnecessary changes in the Operation enum * Apply comment * Patched plonky2 to use a patch for eth_trie_utils * Implement receipts and logs Co-authored-by: Hamy Ratoanina <[email protected]> Co-authored-by: Linda Guiga <[email protected]> * Cleanup * Fix tests and address comments * Change receipts_trie in basic_smart_contract and self_balance_gas_cost * Cleanup * Clippy * Made `PublicValues` serializable - Needed by the prover scheduler. * make generate partial_witness pub * Update range from ReceiptTrie PR * fix: constrain higher bits of reg_preimage * Keccak STARK: constraint preimage to equal A on first round * Constrain next row's stack length * Add missing links between public values * Implement receipts of types 1 and 2 * Apply comments * Fix comment in `proof.rs` * Apply comments * Replace genesis state trie check with TODO * feat: serde for targets * Display actual trace lengths instead of number of ops * Remove duplicate code * Remove filter column for KeccakStark * Added mock feature flag and test * remove spurious * Add blockhash sys opcode * Apply comments * Change h256_ulimbs * Fix overflow check and test. Remove [..8] when using h256_limbs. * Clippy * Fix memop reads, from_prover_inputs and cleanup. * Fix Clippy * Removed mock feature flag and added mock_build * clippy * Now builds on the latest nightly * Also included clippy fixes introduced by new nightly * Apply Nick's comment * Apply Nick's comment * Now refers to sub-crates using paths (and removed `patch` section) - Previously refered to specific `crates.io` versions. - Motivation for this is to allow external projects to be able use specific revisions of this repo. Without this, a `[patch]` section is almost always required in the external project in order to force the internal plonky2 sub-crates to the same version, an approach which comes with its own issues. * Fixes * clippy * Made visibilities outside of crate to allow for forking partial witness gen outside of crate * latest nightly in CI and rust-toolchain * suppress incorrect Clippy error * fmt * clippy suggestions * clippy suggestions * clippy suggestions * clippy suggestions * clippy suggestions * more clippy suggestions * Move byte packing / unpacking to a distinct table (0xPolygonZero#1212) * Duplicate Memory trace into BytePacking one * Add mload_32bytes instruction * Use dedicated ops for byte packing trace * Change witness generation to reduce memory reads for MLOAD_32BYTES * Remove segments * Fix stack * Fix extra product when fixing CTL for byte_packing * Write output value in trace * Add constraints for BYTE_PACKING table * Add recursive constraints for BYTE_PACKING table * Fix constraints * Add address in trace and constraints * Add timestamp and batch inputs into BytePackingOp struct * Add extra column * Fix BytePackingStark CTL * Tiny fix in witness generation * Fix the Memory CTL * Add constraints for the new columns * Remove 1 column * Remove limb columns * Fix * Fix recursive circuit of BytePackingTable * Fix constraints * Fix endianness * Add MSTORE_32BYTES instruction and move decomposition to packing table * Add missing constraint * Add range-check for all bytes * Add extra constraint * Cleanup * Remove REMAINING_LEN column * Add corresponding implementations in interpreter * Fix recursive version * Remove debug assertion because of CI * Remove FILTER column * Update new test from rebasing * Reorder STARK modules to match TraceCheckPoint ordering * Address comments * Pacify clippy * Add documentation to the packing module * Fix doctest * Swap ordering in stack macro (0xPolygonZero#1230) * Swap ordering in stack macro * Update comment * Fix self_balance_gas_cost and basic_smart_contract. (0xPolygonZero#1227) * Fix self_balance_gas_cost and basic_smart_contract. * Fix Clippy * Combine arithmetic flags on the CPU side (0xPolygonZero#1187) * Combine FP254 flags * Combine basic binary ops together and do CTL with opcode value * Combine ternary ops together * Combine MUL DIV and MOD * Combine shift operations * Combine byte with other binary ops * Fix tests * Clean leftover comment * Update from latest main * Put the 'is_simulated' flag inside the Operation enum * Cleaner way to handle "simulated" operations SHL and SHR. * Fix comments. * Minor: suggestion for re-expressing `combined_ops`. * Update comment --------- Co-authored-by: Hamish Ivey-Law <[email protected]> * Remove redundant Keccak sponge cols (0xPolygonZero#1233) * Rename columns in KeccakSponge for clarity * Remove redundant columns * Apply comments * Combine mstore_general and mload_general into one flag (0xPolygonZero#1188) * Combine mstore_general and mload_general into one flag * Add comments and make stack constraints cleaner. * Fix number of native instructions * Ordering * Cleanup * Update calls to stack eval from latest main --------- Co-authored-by: Robin Salen <[email protected]> --------- Co-authored-by: Dimo99 <[email protected]> Co-authored-by: Hamish Ivey-Law <[email protected]> Co-authored-by: Robin Salen <[email protected]> Co-authored-by: Robin Salen <[email protected]> Co-authored-by: Jacqueline Nabaglo <[email protected]> Co-authored-by: Nicholas Ward <[email protected]> Co-authored-by: Linda Guiga <[email protected]> Co-authored-by: wborgeaud <[email protected]> Co-authored-by: Hamy Ratoanina <[email protected]> Co-authored-by: BGluth <[email protected]> Co-authored-by: Linda Guiga <[email protected]> Co-authored-by: John Guibas <[email protected]> Co-authored-by: Daniel Lubarov <[email protected]> Co-authored-by: Ayush Shukla <[email protected]> Co-authored-by: Uma Roy <[email protected]> Co-authored-by: Hamish Ivey-Law <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges the
mstore_generalandmload_generalflags into one. Since the flags opcodes do not abide by thedecode.rsrequirements, the decoding checks are done manually in the constraints.