WIP: feat: support uniarg to reduce instruction number #299

junyu0312 · 2024-11-04T07:20:35Z

No description provided.

junyu0312 · 2024-11-12T09:24:43Z

crates/zkwasm/src/circuits/etable/op_configure/op_bin.rs

+
        let d = allocator.alloc_u64_cell();
-        let d_flag_helper_diff = allocator.alloc_common_range_cell();
+        let d_flag_helper_diff = allocator.alloc_common_range_cell(); // TODO: u16??


junyu0312 · 2024-11-14T08:41:53Z

order of uniargs(uniarg_configs[0] is rhs, uniarg_configs[1] is lhs)
common range should be replaced with u16 as possible
Is replacing alloc_memory_table_lookup_read_cell with CommonConfig reserves all constraints?(eid in [start, end), is_i32, and?)
Is is_i32_cell constraint necessary?(for example, select: uniarg)
constants in image table(permutation, lookup...)
- a new fixed col opcode_prefix in image table, 1 indicates constant, 2 indicates instruction
- etable lookups instruction if (row % 4 == 0), otherwise lookups constant

crates/zkwasm/src/circuits/etable/op_configure/op_bin_shift.rs

junyu0312 · 2024-11-15T07:34:57Z

Add a u16 column to replace common range with u16 as possible, thus I should remove a common range col

OogLayout · 2024-11-20T09:51:22Z

crates/specs/src/encode/br_table.rs

-    const INDEX_SHIFT: u32 = DROP_SHIFT + COMMON_RANGE_OFFSET;
-    const DROP_SHIFT: u32 = KEEP_SHIFT + COMMON_RANGE_OFFSET;
-    const KEEP_SHIFT: u32 = DST_PC_SHIFT + COMMON_RANGE_OFFSET;
+    const FID_SHIFT: u32 = IID_SHIFT + IID_BITS;


Add assertion that IID_BITS, FID_BITS are one of (u8, u16, ucommon), so we know they are limited by range check in circuit.

OogLayout · 2024-11-21T05:51:56Z

crates/specs/src/encode/opcode.rs

+impl<const N: usize> From<&[UniArg; N]> for UniArgEncode<N, BigUint> {
+    fn from(uniargs: &[UniArg; N]) -> Self {
+        UniArgEncode::Value(
+            uniargs


directly map on array

OogLayout · 2024-11-21T06:02:22Z

crates/specs/src/itable.rs

+        }
+    }
+
+    pub fn try_decease_stack_depth(&mut self, diff: usize) {


OogLayout · 2024-11-21T06:04:51Z

crates/specs/src/itable.rs

+        BigUint::from(3u64) << 64
+    }
+
+    pub fn i64_i32_const_tag() -> BigUint {


maybe call it tag_diff

junyu0312 · 2024-11-21T06:17:19Z

crates/specs/src/itable.rs

+        matches!(self, UniArg::Pop)
+    }
+
+    pub fn get_const_value(&self) -> u64 {


return option

junyu0312 · 2024-11-21T06:18:47Z

crates/specs/src/state.rs


+pub const INITIALIZATION_STATE_FIELD_COUNT: usize = 10;
 impl<T> InitializationState<T> {
    // TODO: try to remove the magic number


comment, or sizeof

junyu0312 · 2024-11-21T06:42:21Z

rename COMMON_RANGE_BITS to U32_BITs

* remove TODO.md * fix UniargEncode From trait * fix typo * rename i64_i32_const_tag, COMMON_RANGE_BITS * refactor get_const_value * comment INITIALIZATION_STATE_FIELD_COUNT by code

OogLayout · 2024-11-24T05:04:55Z

crates/zkwasm/src/circuits/etable/op_configure/op_br_if_eqz.rs

                eid,
                move |____| constant_from!(LocationType::Stack as u64),
-                move |meta| sp.expr(meta) + constant_from!(2),
+                move |meta| Self::sp_after_uniarg(sp, &uniarg_configs, meta) + constant_from!(1),


sp constrained by unused uniarg_configs

not bug because uniarg_configs' size is limited.

junyu0312 force-pushed the zhangjunyu/rebase_main_uniarg branch 2 times, most recently from d8a1254 to 7300281 Compare November 4, 2024 07:51

junyu0312 force-pushed the zhangjunyu/rebase_main_uniarg branch 4 times, most recently from d913162 to 34043f2 Compare November 12, 2024 08:56

junyu0312 commented Nov 12, 2024

View reviewed changes

junyu0312 commented Nov 14, 2024

View reviewed changes

crates/zkwasm/src/circuits/etable/op_configure/op_bin_shift.rs Outdated Show resolved Hide resolved

junyu0312 force-pushed the zhangjunyu/rebase_main_uniarg branch 2 times, most recently from 347d0a9 to 551b6fa Compare November 14, 2024 16:23

slice when memory table is full

cc4f119

junyu0312 force-pushed the zhangjunyu/rebase_main_uniarg branch 2 times, most recently from b417ded to 4005c32 Compare November 15, 2024 07:32

junyu0312 force-pushed the zhangjunyu/rebase_main_uniarg branch 8 times, most recently from 0f53a8c to d2f9cf9 Compare November 19, 2024 06:56

lanbones and others added 3 commits November 19, 2024 09:09

support uniarg

2541657

cli: perf: mask some checkings in release mode

00e6539

remove a mindlessly added binary

4a46c6d

junyu0312 force-pushed the zhangjunyu/rebase_main_uniarg branch from d2f9cf9 to 4a46c6d Compare November 19, 2024 09:09

OogLayout reviewed Nov 20, 2024

View reviewed changes

OogLayout reviewed Nov 21, 2024

View reviewed changes

crates/specs/src/itable.rs Outdated

}

}

pub fn try_decease_stack_depth(&mut self, diff: usize) {

Copy link

OogLayout Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

OogLayout reviewed Nov 21, 2024

View reviewed changes

crates/specs/src/itable.rs Outdated

BigUint::from(3u64) << 64

}

pub fn i64_i32_const_tag() -> BigUint {

Copy link

OogLayout Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe call it tag_diff

junyu0312 commented Nov 21, 2024

View reviewed changes

fix comment

d7174cf

* remove TODO.md * fix UniargEncode From trait * fix typo * rename i64_i32_const_tag, COMMON_RANGE_BITS * refactor get_const_value * comment INITIALIZATION_STATE_FIELD_COUNT by code

OogLayout reviewed Nov 24, 2024

View reviewed changes

WIP: feat: support uniarg to reduce instruction number #299

Are you sure you want to change the base?

WIP: feat: support uniarg to reduce instruction number #299

Uh oh!

Conversation

junyu0312 commented Nov 4, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

junyu0312 commented Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

junyu0312 commented Nov 15, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

junyu0312 Nov 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

junyu0312 commented Nov 21, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

junyu0312 commented Nov 14, 2024 •

edited

Loading

junyu0312 Nov 21, 2024 •

edited

Loading