Merge branch 'master' of github.com:RRZE-HPC/OSACA

osaca/data/a64fx.yml

@@ -137,6 +137,15 @@ instruction_forms:
   throughput: 1.0
   latency: 0.0
   port_pressure: [[1, '7']]
+- name: cmp
+  operands:
+  - class: register
+    prefix: x
+  - class: immediate
+    imd: int
+  throughput: 0.5
+  latency: 1.0  # 	1*p34
+  port_pressure: [[1, '34']]
 - name: cmp
   operands:
   - class: register

osaca/parser/parser_AArch64.py

@@ -406,7 +406,9 @@ class ParserAArch64(BaseParser):
             # normal integer value, nothing to do
             return AttrDict({self.IMMEDIATE_ID: immediate})
         if 'base_immediate' in immediate:
-            # arithmetic immediate, nothing to do
+            # arithmetic immediate, add calculated value as value
+            immediate['shift'] = immediate['shift'][0]
+            immediate['value'] = int(immediate['base_immediate']['value']) << int(immediate['shift']['value'])
             return AttrDict({self.IMMEDIATE_ID: immediate})
         if 'float' in immediate:
             dict_name = 'float'