From 86d2b0555ee09d648c8d7373b0a9a4acdcb344e0 Mon Sep 17 00:00:00 2001
From: Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr>
Date: Fri, 6 Nov 2020 12:05:53 +0100
Subject: Preparing the repo for debugging postpass and executing tests

---
 aarch64/OpWeightsAsm.ml | 55 +++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'aarch64/OpWeightsAsm.ml')

diff --git a/aarch64/OpWeightsAsm.ml b/aarch64/OpWeightsAsm.ml
index 5ba5832b..c1d0583a 100644
--- a/aarch64/OpWeightsAsm.ml
+++ b/aarch64/OpWeightsAsm.ml
@@ -221,10 +221,10 @@ module Cortex_A53 = struct
     | Uxtw -> 1
     | Uxtx -> 1
     | Btbl -> 1
-    | Allocframe -> 1
-    | Freeframe -> 1
-    | Builtin -> 1
-    | Cvtx2w -> 1
+    | Allocframe -> 51
+    | Freeframe -> 51
+    | Builtin -> 51
+    | Cvtx2w -> 51
 
   let resources_of_op (i : real_instruction) (nargs : int) =
     match i with
@@ -317,30 +317,30 @@ module Cortex_A53 = struct
     | Uxtw -> [| 1; 1; 0; 0 |]
     | Uxtx -> [| 1; 1; 0; 0 |]
     | Btbl -> [| 1; 1; 0; 0 |]
-    | Allocframe -> [| 1; 0; 0; 0 |]
-    | Freeframe -> [| 1; 0; 0; 0 |]
-    | Builtin -> [| 1; 0; 0; 0 |]
-    | Cvtx2w -> [| 1; 0; 0; 0 |]
+    | Allocframe -> [| 1; 1; 1; 1 |]
+    | Freeframe -> [| 1; 1; 1; 1 |]
+    | Builtin -> [| 1; 1; 1; 1 |]
+    | Cvtx2w -> [| 1; 1; 1; 1 |]
 
-       (*let non_pipelined_resources_of_op (op : operation) (nargs : int) =
-          match op with
-          | Odiv | Odivu -> [| 29 |]
-          | Odivfs -> [| 20 |]
-          | Odivl | Odivlu | Odivf -> [| 50 |]
-          | _ -> [| -1 |];;
+  (*let non_pipelined_resources_of_op (op : operation) (nargs : int) =
+      match op with
+      | Odiv | Odivu -> [| 29 |]
+      | Odivfs -> [| 20 |]
+      | Odivl | Odivlu | Odivf -> [| 50 |]
+      | _ -> [| -1 |];;
 
-        let resources_of_cond (cmp : condition) (nargs : int) =
-          (match cmp with
-           | Ccompf _                              (* r FP comparison *)
-             | Cnotcompf _                           (* r negation of an FP comparison *)
-             | Ccompfzero _                          (* r comparison with 0.0 *)
-             | Cnotcompfzero _                       (* r negation of comparison with 0.0 *)
-             | Ccompfs _                             (* r FP comparison *)
-             | Cnotcompfs _                          (* r negation of an FP comparison *)
-             | Ccompfszero _                         (* r equal to 0.0 *)
-             | Cnotcompfszero _                     (* r not equal to 0.0 *) ->
-              [| 1; 1; 1; 0 |]
-           | _ -> [| 1; 1; 0; 0 |] )*)
+    let resources_of_cond (cmp : condition) (nargs : int) =
+      (match cmp with
+       | Ccompf _                              (* r FP comparison *)
+         | Cnotcompf _                           (* r negation of an FP comparison *)
+         | Ccompfzero _                          (* r comparison with 0.0 *)
+         | Cnotcompfzero _                       (* r negation of comparison with 0.0 *)
+         | Ccompfs _                             (* r FP comparison *)
+         | Cnotcompfs _                          (* r negation of an FP comparison *)
+         | Ccompfszero _                         (* r equal to 0.0 *)
+         | Cnotcompfszero _                     (* r not equal to 0.0 *) ->
+          [| 1; 1; 1; 0 |]
+       | _ -> [| 1; 1; 0; 0 |] )*)
 
   let latency_of_load trap chunk _ _ = 3
 
@@ -362,7 +362,8 @@ let get_opweights () : opweights =
     pipelined_resource_bounds = Cortex_A53.resource_bounds;
     nr_non_pipelined_units = Cortex_A53.nr_non_pipelined_units;
     latency_of_op = Cortex_A53.latency_of_op;
-    resources_of_op = Cortex_A53.resources_of_op
+    resources_of_op =
+      Cortex_A53.resources_of_op
       (*non_pipelined_resources_of_op = Cortex_A53.non_pipelined_resources_of_op;*)
       (*latency_of_load = Cortex_A53.latency_of_load;*)
       (*resources_of_load = Cortex_A53.resources_of_load;*)
-- 
cgit