Merge pull request #187 from near/global_const

Use longer integers to fill ZKASM data section
near · Jan 9, 2024 · cefafb6 · cefafb6
2 parents c41cd01 + 1aeb795
commit cefafb6
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 89 deletions.
diff --git a/cranelift/filetests/src/test_zkasm.rs b/cranelift/filetests/src/test_zkasm.rs
@@ -69,7 +69,7 @@ mod tests {
                     chunk_data <<= 8;
                     chunk_data |= *c as u64;
                 }
-                program.push(format!("  {chunk_data} :MSTORE(MEM:E + {i})"));
+                program.push(format!("  {chunk_data}n :MSTORE(MEM:E + {i})"));
             }
         }
 

diff --git a/cranelift/zkasm_data/benchmarks/fibonacci/generated/from_rust.zkasm b/cranelift/zkasm_data/benchmarks/fibonacci/generated/from_rust.zkasm
@@ -11,78 +11,75 @@ start:
 function_1:
   SP + 1 => SP
   RR :MSTORE(SP - 1)
-  SP + 5 => SP
+  SP + 4 => SP
   C :MSTORE(SP - 1)
   D :MSTORE(SP - 2)
   E :MSTORE(SP - 3)
   B :MSTORE(SP - 4)
   1n => A  ;; LoadConst64
   0n => B  ;; LoadConst64
   10000n => C  ;; LoadConst32
-  C => D
   :JMP(label_1_1)
 label_1_1:
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => B :ADD
-  A => C
+  A => D
   B => A
-  C => B
+  D => B
   $ => E :ADD
-  A :MSTORE(SP)
+  A => D
   4294967286n => B  ;; LoadConst32
-  D => A
+  C => A
   $ => A :ADD
   4294967295n => B  ;; LoadConst64
   $ => A :AND
-  A => C
-  A => D
-  C :JMPNZ(label_1_2)
+  A :JMPNZ(label_1_2)
   :JMP(label_1_3)
 label_1_2:
-  C => D
-  $ => B :MLOAD(SP)
+  D => B
+  A => C
   E => A
   :JMP(label_1_1)
 label_1_3:
   15574651946073070043n => B  ;; LoadConst64
-  $ => A :MLOAD(SP)
+  D => A
   B :ASSERT
   $ => C :MLOAD(SP - 1)
   $ => D :MLOAD(SP - 2)
   $ => E :MLOAD(SP - 3)
   $ => B :MLOAD(SP - 4)
-  SP - 5 => SP
+  SP - 4 => SP
   $ => RR :MLOAD(SP - 1)
   SP - 1 => SP
   :JMP(RR)

diff --git a/cranelift/zkasm_data/benchmarks/fibonacci/state.csv b/cranelift/zkasm_data/benchmarks/fibonacci/state.csv
@@ -1,4 +1,4 @@
 Test,Status,Cycles
-from_rust,pass,50026
+from_rust,pass,48025
 handwritten,pass,50008
 handwritten_wat,pass,140023