Implement slot conversion in ISLE

near · Jan 26, 2024 · 7e6d50e · 7e6d50e
1 parent 0b18571
commit 7e6d50e
Show file tree

Hide file tree

Showing 6 changed files with 2,486 additions and 2,472 deletions.
diff --git a/cranelift/codegen/src/isa/zkasm/inst.isle b/cranelift/codegen/src/isa/zkasm/inst.isle
@@ -1216,7 +1216,8 @@
 
 ;; In the simplest case we just lower into a Reg+Offset
 (rule 0 (amode_inner r @ (value_type (ty_addr64 _)) offset ty)
-  (gen_reg_offset_amode r offset ty))
+	(let ((slot XReg (zk_divu r (imm $I32 8))))
+		(gen_reg_offset_amode slot offset ty)))
 
 ;; If the value is a `get_frame_pointer`, we can just use the offset from that.
 (rule 1 (amode_inner (get_frame_pointer) offset ty)

diff --git a/cranelift/codegen/src/isa/zkasm/inst/emit.rs b/cranelift/codegen/src/isa/zkasm/inst/emit.rs
@@ -591,25 +591,18 @@ impl MachInstEmit for Inst {
                 match from {
                     AMode::RegOffset(r, ..) => {
                         let rem = offset % 8;
+                        let slot_offset = offset / 8;
                         let width = op.width() as i64;
                         if rem + width > 8 {
                             put_string(&format!(";; FIXME Read spans two slots\n"), sink);
                         }
 
                         debug_assert_eq!(r, e0());
-                        put_string(
-                            &format!(
-                                "${{ ({}) / 8 }} => {}\n",
-                                access_reg_with_offset(r, offset),
-                                reg_name(r)
-                            ),
-                            sink,
-                        );
                         put_string(
                             &format!(
                                 "$ => {} :MLOAD(MEM:{})\n",
                                 reg_name(rd.to_reg()),
-                                reg_name(r)
+                                access_reg_with_offset(r, slot_offset),
                             ),
                             sink,
                         );
@@ -666,20 +659,17 @@ impl MachInstEmit for Inst {
                 match to {
                     AMode::RegOffset(r, ..) => {
                         debug_assert_eq!(r, e0());
-                        put_string(
-                            &format!(
-                                "${{ ({}) / 8 }} => {}\n",
-                                access_reg_with_offset(r, offset),
-                                reg_name(r)
-                            ),
-                            sink,
-                        );
                         let rem = offset % 8;
+                        let slot_offset = offset / 8;
                         let width = op.width() as i64;
 
                         if op == StoreOP::I64 && rem == 0 {
                             put_string(
-                                &format!("{} :MSTORE(MEM:{})\n", reg_name(src), reg_name(r)),
+                                &format!(
+                                    "{} :MSTORE(MEM:{})\n",
+                                    reg_name(src),
+                                    access_reg_with_offset(r, slot_offset)
+                                ),
                                 sink,
                             );
                             return;
@@ -713,7 +703,7 @@ impl MachInstEmit for Inst {
                                 8 * rem,
                                 reg_name(src),
                                 8 * rem,
-                                reg_name(r),
+                                access_reg_with_offset(r, slot_offset)
                             ),
                             sink,
                         );
@@ -724,7 +714,7 @@ impl MachInstEmit for Inst {
                                 &format!(
                                     "$ => {} :MLOAD(MEM:{})\n",
                                     reg_name(d0()),
-                                    access_reg_with_offset(r, 1)
+                                    access_reg_with_offset(r, slot_offset + 1)
                                 ),
                                 sink,
                             );
@@ -734,7 +724,7 @@ impl MachInstEmit for Inst {
                                     8 * rem,
                                     reg_name(src),
                                     8 * rem,
-                                    access_reg_with_offset(r, 1),
+                                    access_reg_with_offset(r, slot_offset + 1)
                                 ),
                                 sink,
                             );