Merge pull request #193 from near/use_offset

Account for virtual sp adjustments
near · Jan 23, 2024 · e2ceaea · e2ceaea
2 parents f1231ff + c7663a1
commit e2ceaea
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/cranelift/codegen/src/isa/zkasm/inst/emit.rs b/cranelift/codegen/src/isa/zkasm/inst/emit.rs
@@ -589,34 +589,34 @@ impl MachInstEmit for Inst {
                 let offset = from.get_offset_with_state(state);
                 let rd = allocs.next_writable(rd);
                 match from {
-                    AMode::RegOffset(r, off, _) => {
+                    AMode::RegOffset(r, ..) => {
                         debug_assert_eq!(r, e0());
                         put_string(
                             &format!(
                                 "$ => {} :MLOAD(MEM:{})\n",
                                 reg_name(rd.to_reg()),
-                                access_reg_with_offset(r, off)
+                                access_reg_with_offset(r, offset)
                             ),
                             sink,
                         );
                     }
-                    AMode::SPOffset(off, _) | AMode::NominalSPOffset(off, _) => {
-                        assert_eq!(off % 8, 0);
+                    AMode::SPOffset(..) | AMode::NominalSPOffset(..) => {
+                        assert_eq!(offset % 8, 0);
                         put_string(
                             &format!(
                                 "$ => {} :MLOAD({})\n",
                                 reg_name(rd.to_reg()),
-                                access_reg_with_offset(stack_reg(), off / 8),
+                                access_reg_with_offset(stack_reg(), offset / 8),
                             ),
                             sink,
                         );
                     }
-                    AMode::FPOffset(off, _) => {
+                    AMode::FPOffset(..) => {
                         put_string(
                             &format!(
                                 "$ => {} :MLOAD({})\n",
                                 reg_name(rd.to_reg()),
-                                access_reg_with_offset(fp_reg(), off),
+                                access_reg_with_offset(fp_reg(), offset),
                             ),
                             sink,
                         );
@@ -634,36 +634,37 @@ impl MachInstEmit for Inst {
             &Inst::Store { op, src, flags, to } => {
                 let to = to.clone().with_allocs(&mut allocs);
                 let src = allocs.next(src);
+                let offset = to.get_offset_with_state(state);
 
                 match to {
-                    AMode::RegOffset(r, off, _) => {
+                    AMode::RegOffset(r, ..) => {
                         debug_assert_eq!(r, e0());
                         put_string(
                             &format!(
                                 "{} :MSTORE(MEM:{})\n",
                                 reg_name(src),
-                                access_reg_with_offset(r, off)
+                                access_reg_with_offset(r, offset)
                             ),
                             sink,
                         );
                     }
-                    AMode::SPOffset(off, _) | AMode::NominalSPOffset(off, _) => {
-                        assert_eq!(off % 8, 0);
+                    AMode::SPOffset(..) | AMode::NominalSPOffset(..) => {
+                        assert_eq!(offset % 8, 0);
                         put_string(
                             &format!(
                                 "{} :MSTORE({})\n",
                                 reg_name(src),
-                                access_reg_with_offset(stack_reg(), off / 8),
+                                access_reg_with_offset(stack_reg(), offset / 8),
                             ),
                             sink,
                         );
                     }
-                    AMode::FPOffset(off, _) => {
+                    AMode::FPOffset(..) => {
                         put_string(
                             &format!(
                                 "{} :MSTORE({})\n",
                                 reg_name(src),
-                                access_reg_with_offset(fp_reg(), off),
+                                access_reg_with_offset(fp_reg(), offset),
                             ),
                             sink,
                         );
@@ -1182,13 +1183,12 @@ impl MachInstEmit for Inst {
             }
 
             &Inst::VirtualSPOffsetAdj { amount } => {
-                println!("virtual_sp_offset_adj {amount}");
-                // crate::trace!(
-                //     "virtual sp offset adjusted by {} -> {}",
-                //     amount,
-                //     state.virtual_sp_offset + amount
-                //     );
-                // state.virtual_sp_offset += amount;
+                crate::trace!(
+                    "virtual sp offset adjusted by {} -> {}",
+                    amount,
+                    state.virtual_sp_offset + amount
+                );
+                state.virtual_sp_offset += amount;
             }
 
             &Inst::LoadAddr { rd, mem } => {

diff --git a/cranelift/zkasm_data/benchmarks/sha256/generated/from_rust.zkasm b/cranelift/zkasm_data/benchmarks/sha256/generated/from_rust.zkasm
@@ -557,7 +557,7 @@ label_1_3:
   1n => B  ;; LoadConst32
   SP - 1 => SP
   B :MSTORE(SP)
-  $ => B :MLOAD(SP)
+  $ => B :MLOAD(SP + 1)
   zkPC + 2 => RR
   :JMP(function_2)
   SP + 1 => SP
@@ -572,7 +572,7 @@ label_1_5:
   1n => C  ;; LoadConst32
   SP - 1 => SP
   C :MSTORE(SP)
-  $ => B :MLOAD(SP)
+  $ => B :MLOAD(SP + 1)
   zkPC + 2 => RR
   :JMP(function_2)
   SP + 1 => SP