InstCountCI: Update

Signed-off-by: Alyssa Rosenzweig <[email protected]>
FEX-Emu · Apr 2, 2024 · d6425d0 · d6425d0
1 parent e07c81a
commit d6425d0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 54 deletions.
diff --git a/unittests/InstructionCountCI/FlagM/Primary.json b/unittests/InstructionCountCI/FlagM/Primary.json
@@ -182,12 +182,11 @@
       ]
     },
     "add rax, -1": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "0x05",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "adds x26, x4, x20",
+        "subs x26, x4, #0x1 (1)",
         "mov x4, x26"
       ]
     },
@@ -1259,12 +1258,11 @@
       ]
     },
     "sub rax, -1": {
-      "ExpectedInstructionCount": 5,
+      "ExpectedInstructionCount": 4,
       "Comment": "0x2D",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "cfinv",
         "mov x4, x26"
       ]
@@ -1596,12 +1594,11 @@
       ]
     },
     "cmp rax, -1": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "0x3D",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "cfinv"
       ]
     },

diff --git a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
@@ -422,12 +422,11 @@
       ]
     },
     "add rax, -256": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "GROUP1 0x81 /0",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffff00",
         "mov x27, x4",
-        "adds x26, x27, x20",
+        "subs x26, x27, #0x100 (256)",
         "mov x4, x26"
       ]
     },
@@ -521,12 +520,11 @@
       ]
     },
     "sub rax, -256": {
-      "ExpectedInstructionCount": 5,
+      "ExpectedInstructionCount": 4,
       "Comment": "GROUP1 0x81 /5",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffff00",
         "mov x27, x4",
-        "subs x26, x27, x20",
+        "adds x26, x27, #0x100 (256)",
         "cfinv",
         "mov x4, x26"
       ]
@@ -560,12 +558,11 @@
       ]
     },
     "cmp rax, -256": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "GROUP1 0x81 /7",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffff00",
         "mov x27, x4",
-        "subs x26, x27, x20",
+        "adds x26, x27, #0x100 (256)",
         "cfinv"
       ]
     },
@@ -757,12 +754,11 @@
       ]
     },
     "add rax, -1": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "GROUP1 0x83 /0",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "adds x26, x4, x20",
+        "subs x26, x4, #0x1 (1)",
         "mov x4, x26"
       ]
     },
@@ -860,12 +856,11 @@
       ]
     },
     "sub rax, -1": {
-      "ExpectedInstructionCount": 5,
+      "ExpectedInstructionCount": 4,
       "Comment": "GROUP1 0x83 /5",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "cfinv",
         "mov x4, x26"
       ]
@@ -901,12 +896,11 @@
       ]
     },
     "cmp rax, -1": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "GROUP1 0x83 /7",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "cfinv"
       ]
     },

diff --git a/unittests/InstructionCountCI/Primary.json b/unittests/InstructionCountCI/Primary.json
@@ -181,12 +181,11 @@
       ]
     },
     "add rax, -1": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "0x05",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "adds x26, x4, x20",
+        "subs x26, x4, #0x1 (1)",
         "mov x4, x26"
       ]
     },
@@ -1368,12 +1367,11 @@
       ]
     },
     "sub rax, -1": {
-      "ExpectedInstructionCount": 7,
+      "ExpectedInstructionCount": 6,
       "Comment": "0x2D",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "mrs x20, nzcv",
         "eor w20, w20, #0x20000000",
         "mov x4, x26",
@@ -1737,12 +1735,11 @@
       ]
     },
     "cmp rax, -1": {
-      "ExpectedInstructionCount": 6,
+      "ExpectedInstructionCount": 5,
       "Comment": "0x3D",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "mrs x20, nzcv",
         "eor w20, w20, #0x20000000",
         "msr nzcv, x20"

diff --git a/unittests/InstructionCountCI/PrimaryGroup.json b/unittests/InstructionCountCI/PrimaryGroup.json
@@ -461,12 +461,11 @@
       ]
     },
     "add rax, -256": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "GROUP1 0x81 /0",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffff00",
         "mov x27, x4",
-        "adds x26, x27, x20",
+        "subs x26, x27, #0x100 (256)",
         "mov x4, x26"
       ]
     },
@@ -570,12 +569,11 @@
       ]
     },
     "sub rax, -256": {
-      "ExpectedInstructionCount": 7,
+      "ExpectedInstructionCount": 6,
       "Comment": "GROUP1 0x81 /5",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffff00",
         "mov x27, x4",
-        "subs x26, x27, x20",
+        "adds x26, x27, #0x100 (256)",
         "mrs x20, nzcv",
         "eor w20, w20, #0x20000000",
         "mov x4, x26",
@@ -613,12 +611,11 @@
       ]
     },
     "cmp rax, -256": {
-      "ExpectedInstructionCount": 6,
+      "ExpectedInstructionCount": 5,
       "Comment": "GROUP1 0x81 /7",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffff00",
         "mov x27, x4",
-        "subs x26, x27, x20",
+        "adds x26, x27, #0x100 (256)",
         "mrs x20, nzcv",
         "eor w20, w20, #0x20000000",
         "msr nzcv, x20"
@@ -828,12 +825,11 @@
       ]
     },
     "add rax, -1": {
-      "ExpectedInstructionCount": 4,
+      "ExpectedInstructionCount": 3,
       "Comment": "GROUP1 0x83 /0",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "adds x26, x4, x20",
+        "subs x26, x4, #0x1 (1)",
         "mov x4, x26"
       ]
     },
@@ -941,12 +937,11 @@
       ]
     },
     "sub rax, -1": {
-      "ExpectedInstructionCount": 7,
+      "ExpectedInstructionCount": 6,
       "Comment": "GROUP1 0x83 /5",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "mrs x20, nzcv",
         "eor w20, w20, #0x20000000",
         "mov x4, x26",
@@ -986,12 +981,11 @@
       ]
     },
     "cmp rax, -1": {
-      "ExpectedInstructionCount": 6,
+      "ExpectedInstructionCount": 5,
       "Comment": "GROUP1 0x83 /7",
       "ExpectedArm64ASM": [
-        "mov x20, #0xffffffffffffffff",
         "mvn w27, w4",
-        "subs x26, x4, x20",
+        "adds x26, x4, #0x1 (1)",
         "mrs x20, nzcv",
         "eor w20, w20, #0x20000000",
         "msr nzcv, x20"