From 972f6b9890ea3644626fc097e460035028b940eb Mon Sep 17 00:00:00 2001
From: Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr>
Date: Fri, 4 Dec 2020 23:26:01 +0100
Subject: a first working draft on ldp/stp peephole

---
 aarch64/PostpassSchedulingOracle.ml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'aarch64/PostpassSchedulingOracle.ml')

diff --git a/aarch64/PostpassSchedulingOracle.ml b/aarch64/PostpassSchedulingOracle.ml
index 7f55b29b..e233f77d 100644
--- a/aarch64/PostpassSchedulingOracle.ml
+++ b/aarch64/PostpassSchedulingOracle.ml
@@ -171,14 +171,27 @@ let load_rec ldi =
   | PLd_rd_a (ld, rd, a) -> load_rd_a_rec (PBasic (PLoad ldi)) (reg_of_dreg rd) a
   | Pldp (ld, rd1, rd2, a) -> load_rd1_rd2_a_rec (PBasic (PLoad ldi)) (reg_of_ireg rd1) (reg_of_ireg rd2) a
 
-let store_rec st r a =
+let store_rs_a_rec st rs a =
   {
     inst = st;
     write_locs = [ Mem ];
-    read_locs = [ r; Mem ] @ get_eval_addressing_rlocs a;
+    read_locs = [ rs; Mem ] @ get_eval_addressing_rlocs a;
     is_control = false;
   }
 
+let store_rs1_rs2_a_rec st rs1 rs2 a =
+  {
+    inst = st;
+    write_locs = [ Mem ];
+    read_locs = [ rs1; rs2; Mem ] @ get_eval_addressing_rlocs a;
+    is_control = false;
+  }
+
+let store_rec sti =
+  match sti with
+  | PSt_rs_a (st, rs, a) -> store_rs_a_rec (PBasic (PStore sti)) (reg_of_dreg rs) a
+  | Pstp (st, rs1, rs2, a) -> store_rs1_rs2_a_rec (PBasic (PStore sti)) (reg_of_ireg rs1) (reg_of_ireg rs2) a 
+
 let loadsymbol_rec i rd id =
   {
     inst = i;
@@ -275,6 +288,14 @@ let freeframe_rec i sz linkofs =
     is_control = false;
   }
 
+let nop_rec i =
+  {
+    inst = i;
+    write_locs = [ ];
+    read_locs = [ ];
+    is_control = false;
+  }
+
 let arith_rec i =
   match i with
   | PArithP (i', rd) -> arith_p_rec (PBasic (PArith i)) i' (reg_of_dreg rd)
@@ -304,13 +325,14 @@ let basic_rec i =
   match i with
   | PArith i' -> arith_rec i'
   | PLoad ld -> load_rec ld
-  | PStore (st, r, a) -> store_rec (PBasic i) (reg_of_dreg r) a
+  | PStore st -> store_rec st
   | Pallocframe (sz, linkofs) -> allocframe_rec (PBasic i) sz linkofs
   | Pfreeframe (sz, linkofs) -> freeframe_rec (PBasic i) sz linkofs
   | Ploadsymbol (rd, id) -> loadsymbol_rec (PBasic i) (reg_of_ireg rd) id
   | Pcvtsw2x (rd, r1) -> cvtsw2x_rec (PBasic i) (reg_of_ireg rd) (reg_of_ireg r1)
   | Pcvtuw2x (rd, r1) -> cvtuw2x_rec (PBasic i) (reg_of_ireg rd) (reg_of_ireg r1)
   | Pcvtx2w rd -> cvtx2w_rec (PBasic i) (reg_of_ireg rd)
+  | Pnop -> nop_rec (PBasic i)
 
 let builtin_rec i ef args res =
   {
-- 
cgit