From 9656718d7d0ecbf06556d8b5e1f3e3bb2f135d53 Mon Sep 17 00:00:00 2001
From: JanLJL <jan.laukemann@fau.de>
Date: Thu, 10 Oct 2019 16:36:07 +0200
Subject: [PATCH] more instructions

---
 osaca/data/csx.yml    | 45 +++++++++++++++++++++++++++++++++++++++++++
 osaca/data/vulcan.yml |  4 ++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/osaca/data/csx.yml b/osaca/data/csx.yml
index a33691e..7e7e5f5 100644
--- a/osaca/data/csx.yml
+++ b/osaca/data/csx.yml
@@ -160,6 +160,39 @@ instruction_forms:
       throughput: 0.0
       latency: 1.0  #  0   0DV   1    2   2D    3   3D    4    5    6    7
       port_pressure: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+    - name: movq
+      operands:
+        - class: "register"
+          name: "gpr"
+        - class: "register"
+          name: "gpr"
+      throughput: 0.0
+      latency: 1.0  #  0   0DV   1    2   2D    3   3D    4    5    6    7
+      port_pressure: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+    - name: movq
+      operands:
+        - class: "memory"
+          base: "gpr"
+          offset: ~
+          index: ~
+          scale: 1
+        - class: "register"
+          name: "gpr"
+      throughput: 0.5
+      latency: 3.0  #  0   0DV   1    2   2D    3   3D    4    5    6    7
+      port_pressure: [0.0, 0.0, 0.0, 0.5, 0.5, 0.5, 0.5, 0.0, 0.0, 0.0, 0.0]
+    - name: movq
+      operands:
+        - class: "register"
+          name: "gpr"
+        - class: "memory"
+          base: "gpr"
+          offset: "imd"
+          index: ~
+          scale: 1
+      throughput: 0.5
+      latency: 2.0  #  0   0DV   1    2   2D    3   3D    4    5    6    7
+      port_pressure: [0.0, 0.0, 0.0, 0.5, 0.0, 0.5, 0.0, 1.0, 0.0, 0.0, 0.0]
     - name: rcpss
       operands:
         - class: "register"
@@ -370,6 +403,18 @@ instruction_forms:
       throughput: 0.0
       latency: 0.0  #  0   0DV   1    2   2D    3   3D    4    5    6    7
       port_pressure: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+    - name: vmovapd
+      operands:
+        - class: "memory"
+          base: "gpr"
+          offset: ~
+          index: "gpr"
+          scale: 1
+        - class: "register"
+          name: "xmm"
+      throughput: 1.0
+      latency: 4.0  #  0   0DV   1    2   2D    3   3D    4    5    6    7
+      port_pressure: [0.0, 0.0, 0.0, 0.5, 0.5, 0.5, 0.5, 0.0, 0.0, 0.0, 0.0]
     - name: vmovapd
       operands:
         - class: "memory"
diff --git a/osaca/data/vulcan.yml b/osaca/data/vulcan.yml
index 46820b0..cc7d4e2 100644
--- a/osaca/data/vulcan.yml
+++ b/osaca/data/vulcan.yml
@@ -441,8 +441,8 @@ instruction_forms:
       throughput: 0.5
       latency: 4.0
       port_pressure: [0.0, 0.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0]
-      - name: ldr
-        operands:
+    - name: ldr
+      operands:
         - class: "register"
           prefix: "d"
         - class: "memory"