Skip to content

Commit 2034915

Browse files
DavePearceDavePearce
committed
feat: replace wcp with assembly implementation
This replaces the WCP module with an assembly implementation. The assembly implementation implements identical functionality, but in a rather more compact form.
1 parent cbc6bcb commit 2034915

23 files changed

+170
-315
lines changed

‎.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Install Go Corset
1717
shell: bash
18-
run: go install github.com/consensys/go-corset/cmd/go-corset@v1.1.1
18+
run: go install github.com/consensys/go-corset/cmd/go-corset@a193a03dfc
1919

2020
- name: Build Constraints
2121
run: make -B zkevm.bin

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ TRM := trm
6767

6868
TXN_DATA := txndata
6969

70-
WCP := wcp
70+
WCP := wcp/wcp.zkasm
7171

7272
# Corset is order sensitive - to compile, we load the constants first
7373
ZKEVM_MODULES := ${CONSTANTS} \
@@ -102,4 +102,4 @@ ZKEVM_MODULES := ${CONSTANTS} \
102102
${WCP}
103103

104104
zkevm.bin: ${ZKEVM_MODULES}
105-
${GO_CORSET_COMPILE} -o $@ ${ZKEVM_MODULES}
105+
${GO_CORSET_COMPILE} -vo $@ ${ZKEVM_MODULES}

‎blake2fmodexpdata/lookups/blakemodexp_into_wcp.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
blake2fmodexpdata-into-wcp
77
; target colums (in WCP)
88
(
9-
wcp.ARG_1_HI
10-
wcp.ARG_1_LO
11-
wcp.ARG_2_HI
12-
wcp.ARG_2_LO
13-
wcp.RES
9+
wcp.ARGUMENT_1'1
10+
wcp.ARGUMENT_1'0
11+
wcp.ARGUMENT_2'1
12+
wcp.ARGUMENT_2'0
13+
wcp.RESULT
1414
wcp.INST
1515
)
1616
; source columns

‎blockdata/lookups/blockdata_into_wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
blockdata-into-wcp
66
;; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
8+
wcp.ARGUMENT_1'1
9+
wcp.ARGUMENT_1'0
10+
wcp.ARGUMENT_2'1
11+
wcp.ARGUMENT_2'0
1212
wcp.RESULT
1313
wcp.INST
1414
)

‎blockhash/lookups/blockhash_into_wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
blockhash-into-wcp-lex
55
; target columns
66
(
7-
wcp.ARGUMENT_1_HI
8-
wcp.ARGUMENT_1_LO
9-
wcp.ARGUMENT_2_HI
10-
wcp.ARGUMENT_2_LO
7+
wcp.ARGUMENT_1'1
8+
wcp.ARGUMENT_1'0
9+
wcp.ARGUMENT_2'1
10+
wcp.ARGUMENT_2'0
1111
wcp.INST
1212
wcp.RESULT
1313
)

‎ecdata/lookups/ecdata_into_wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
ecdata-into-wcp
66
; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
8+
wcp.ARGUMENT_1'1
9+
wcp.ARGUMENT_1'0
10+
wcp.ARGUMENT_2'1
11+
wcp.ARGUMENT_2'0
1212
wcp.RESULT
1313
wcp.INST
1414
)

‎euc/lookups/euc_into_wcp.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
euc-into-wcp
33
;reference columns
44
(
5-
wcp.ARG_1_HI
6-
wcp.ARG_1_LO
7-
wcp.ARG_2_HI
8-
wcp.ARG_2_LO
9-
wcp.RES
5+
wcp.ARGUMENT_1'1
6+
wcp.ARGUMENT_1'0
7+
wcp.ARGUMENT_2'1
8+
wcp.ARGUMENT_2'0
9+
wcp.RESULT
1010
wcp.INST
1111
)
1212
;source columns

‎exp/lookups/exp-into-wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
exp-into-wcp
55
;; target columns
66
(
7-
wcp.ARGUMENT_1_HI
8-
wcp.ARGUMENT_1_LO
9-
wcp.ARGUMENT_2_HI
10-
wcp.ARGUMENT_2_LO
7+
wcp.ARGUMENT_1'1
8+
wcp.ARGUMENT_1'0
9+
wcp.ARGUMENT_2'1
10+
wcp.ARGUMENT_2'0
1111
wcp.RESULT
1212
wcp.INST
1313
)

‎gas/lookups/gas-into-wcp.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
(deflookup
55
gas-into-wcp
66
(
7-
wcp.ARG_1_HI
8-
wcp.ARG_1_LO
9-
wcp.ARG_2_HI
10-
wcp.ARG_2_LO
11-
wcp.RES
7+
wcp.ARGUMENT_1'1
8+
wcp.ARGUMENT_1'0
9+
wcp.ARGUMENT_2'1
10+
wcp.ARGUMENT_2'0
11+
wcp.RESULT
1212
wcp.INST
1313
)
1414
(

‎hub/lookups/hub_into_wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
(deflookup hub-into-wcp
66
;; target columns
77
(
8-
wcp.ARG_1_HI
9-
wcp.ARG_1_LO
10-
wcp.ARG_2_HI
11-
wcp.ARG_2_LO
8+
wcp.ARGUMENT_1'1
9+
wcp.ARGUMENT_1'0
10+
wcp.ARGUMENT_2'1
11+
wcp.ARGUMENT_2'0
1212
wcp.RESULT
1313
wcp.INST
1414
)

‎hub/lookups/hub_into_wcp_for_stack_overflow.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
;; target columns
1010
(
1111
wcp.INST
12-
wcp.ARG_1_HI
13-
wcp.ARG_1_LO
14-
wcp.ARG_2_HI
15-
wcp.ARG_2_LO
12+
wcp.ARGUMENT_1'1
13+
wcp.ARGUMENT_1'0
14+
wcp.ARGUMENT_2'1
15+
wcp.ARGUMENT_2'0
1616
wcp.RESULT
1717
)
1818
;; source columns

‎hub/lookups/hub_into_wcp_for_stack_underflow.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
;; target columns
55
(
66
wcp.INST
7-
wcp.ARG_1_HI
8-
wcp.ARG_1_LO
9-
wcp.ARG_2_HI
10-
wcp.ARG_2_LO
7+
wcp.ARGUMENT_1'1
8+
wcp.ARGUMENT_1'0
9+
wcp.ARGUMENT_2'1
10+
wcp.ARGUMENT_2'0
1111
wcp.RESULT
1212
)
1313
;; source columns

‎mmu/lookups/mmu_into_wcp.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
mmu-into-wcp
66
;reference columns
77
(
8-
wcp.ARG_1_HI
9-
wcp.ARG_1_LO
10-
wcp.ARG_2_HI
11-
wcp.ARG_2_LO
12-
wcp.RES
8+
wcp.ARGUMENT_1'1
9+
wcp.ARGUMENT_1'0
10+
wcp.ARGUMENT_2'1
11+
wcp.ARGUMENT_2'0
12+
wcp.RESULT
1313
wcp.INST
1414
)
1515
;source columns

‎oob/lookups/oob-into-wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
(deflookup
55
oob-into-wcp
66
(
7-
wcp.ARGUMENT_1_HI
8-
wcp.ARGUMENT_1_LO
9-
wcp.ARGUMENT_2_HI
10-
wcp.ARGUMENT_2_LO
7+
wcp.ARGUMENT_1'1
8+
wcp.ARGUMENT_1'0
9+
wcp.ARGUMENT_2'1
10+
wcp.ARGUMENT_2'0
1111
wcp.RESULT
1212
wcp.INST
1313
)

‎shakiradata/lookups/shakira_into_wcp_increasing_id.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
shakiradata-into-wcp-increasing-id
1616
; target colums (in WCP)
1717
(
18-
wcp.ARG_1_HI
19-
wcp.ARG_1_LO
20-
wcp.ARG_2_HI
21-
wcp.ARG_2_LO
22-
wcp.RES
18+
wcp.ARGUMENT_1'1
19+
wcp.ARGUMENT_1'0
20+
wcp.ARGUMENT_2'1
21+
wcp.ARGUMENT_2'0
22+
wcp.RESULT
2323
wcp.INST
2424
)
2525
; source columns

‎shakiradata/lookups/shakira_into_wcp_nonzero_last_nbytes.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
shakiradata-into-wcp-nonzero-last-nbytes
1414
; target colums (in WCP)
1515
(
16-
wcp.ARG_1_HI
17-
wcp.ARG_1_LO
18-
wcp.ARG_2_HI
19-
wcp.ARG_2_LO
20-
wcp.RES
16+
wcp.ARGUMENT_1'1
17+
wcp.ARGUMENT_1'0
18+
wcp.ARGUMENT_2'1
19+
wcp.ARGUMENT_2'0
20+
wcp.RESULT
2121
wcp.INST
2222
)
2323
; source columns

‎shakiradata/lookups/shakira_into_wcp_small_last_nbytes.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
shakiradata-into-wcp-small-last-nbytes
33
; target colums (in WCP)
44
(
5-
wcp.ARG_1_HI
6-
wcp.ARG_1_LO
7-
wcp.ARG_2_HI
8-
wcp.ARG_2_LO
9-
wcp.RES
5+
wcp.ARGUMENT_1'1
6+
wcp.ARGUMENT_1'0
7+
wcp.ARGUMENT_2'1
8+
wcp.ARGUMENT_2'0
9+
wcp.RESULT
1010
wcp.INST
1111
)
1212
; source columns

‎stp/lookups/stp_into_wcp.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
stp-into-wcp
33
; target colums (in WCP)
44
(
5-
wcp.ARG_1_HI
6-
wcp.ARG_1_LO
7-
wcp.ARG_2_HI
8-
wcp.ARG_2_LO
9-
wcp.RES
5+
wcp.ARGUMENT_1'1
6+
wcp.ARGUMENT_1'0
7+
wcp.ARGUMENT_2'1
8+
wcp.ARGUMENT_2'0
9+
wcp.RESULT
1010
wcp.INST
1111
)
1212
; source columns (in STP)

‎trm/lookups/trm_into_wcp.lisp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
trm-into-wcp
33
; target columns
44
(
5-
wcp.ARGUMENT_1_HI
6-
wcp.ARGUMENT_1_LO
7-
wcp.ARGUMENT_2_HI
8-
wcp.ARGUMENT_2_LO
5+
wcp.ARGUMENT_1'1
6+
wcp.ARGUMENT_1'0
7+
wcp.ARGUMENT_2'1
8+
wcp.ARGUMENT_2'0
99
wcp.RESULT
1010
wcp.INST
1111
)
@@ -17,4 +17,4 @@
1717
trm.ARG_2_LO
1818
trm.RES
1919
trm.INST
20-
))
20+
))

‎txndata/lookups/txndata_into_wcp.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
txndata-into-wcp
33
; target columns
44
(
5-
wcp.ARGUMENT_1_HI
6-
wcp.ARGUMENT_1_LO
7-
wcp.ARGUMENT_2_HI
8-
wcp.ARGUMENT_2_LO
5+
wcp.ARGUMENT_1'1
6+
wcp.ARGUMENT_1'0
7+
wcp.ARGUMENT_2'1
8+
wcp.ARGUMENT_2'0
99
wcp.RESULT
1010
wcp.INST
1111
)

‎wcp/columns.lisp

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)