From c7bdfb3786b3f49d879453381000ba7d6e5c7fad Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Mon, 22 Jan 2024 18:44:42 -0400
Subject: [PATCH] InstCountCI: Update

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
---
 unittests/InstructionCountCI/FlagM/H0F38.json | 10 ++++------
 .../InstructionCountCI/FlagM/VEX_map2.json    | 20 ++++++++-----------
 unittests/InstructionCountCI/H0F38.json       |  6 +++---
 unittests/InstructionCountCI/VEX_map2.json    | 12 +++++------
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/unittests/InstructionCountCI/FlagM/H0F38.json b/unittests/InstructionCountCI/FlagM/H0F38.json
index 0bd4694bfa..9ce3c3c8ed 100644
--- a/unittests/InstructionCountCI/FlagM/H0F38.json
+++ b/unittests/InstructionCountCI/FlagM/H0F38.json
@@ -12,7 +12,7 @@
   },
   "Instructions": {
     "ptest xmm0, xmm1": {
-      "ExpectedInstructionCount": 15,
+      "ExpectedInstructionCount": 13,
       "Comment": [
         "0x66 0x0f 0x38 0x17"
       ],
@@ -25,13 +25,11 @@
         "umov w21, v3.h[0]",
         "mov w27, #0x0",
         "mov w26, #0x1",
-        "cmp x20, #0x0 (0)",
-        "cset x20, eq",
         "cmp x21, #0x0 (0)",
         "cset x21, eq",
-        "lsl x20, x20, #30",
-        "orr w20, w20, w21, lsl #29",
-        "msr nzcv, x20"
+        "tst w20, w20",
+        "rmif x21, #63, #nzCv",
+        "rmif x27, #61, #Nzcv"
       ]
     },
     "adcx eax, ebx": {
diff --git a/unittests/InstructionCountCI/FlagM/VEX_map2.json b/unittests/InstructionCountCI/FlagM/VEX_map2.json
index 0925c9d1c7..6fc1673842 100644
--- a/unittests/InstructionCountCI/FlagM/VEX_map2.json
+++ b/unittests/InstructionCountCI/FlagM/VEX_map2.json
@@ -164,7 +164,7 @@
       ]
     },
     "vptest xmm0, xmm1": {
-      "ExpectedInstructionCount": 15,
+      "ExpectedInstructionCount": 13,
       "Comment": [
         "Map 2 0b01 0x16 128-bit"
       ],
@@ -177,17 +177,15 @@
         "umov w21, v3.h[0]",
         "mov w27, #0x0",
         "mov w26, #0x1",
-        "cmp x20, #0x0 (0)",
-        "cset x20, eq",
         "cmp x21, #0x0 (0)",
         "cset x21, eq",
-        "lsl x20, x20, #30",
-        "orr w20, w20, w21, lsl #29",
-        "msr nzcv, x20"
+        "tst w20, w20",
+        "rmif x21, #63, #nzCv",
+        "rmif x27, #61, #Nzcv"
       ]
     },
     "vptest ymm0, ymm1": {
-      "ExpectedInstructionCount": 15,
+      "ExpectedInstructionCount": 13,
       "Comment": [
         "Map 2 0b01 0x16 256-bit"
       ],
@@ -200,13 +198,11 @@
         "umov w21, v3.h[0]",
         "mov w27, #0x0",
         "mov w26, #0x1",
-        "cmp x20, #0x0 (0)",
-        "cset x20, eq",
         "cmp x21, #0x0 (0)",
         "cset x21, eq",
-        "lsl x20, x20, #30",
-        "orr w20, w20, w21, lsl #29",
-        "msr nzcv, x20"
+        "tst w20, w20",
+        "rmif x21, #63, #nzCv",
+        "rmif x27, #61, #Nzcv"
       ]
     },
     "vmaskmovps xmm0, xmm1, [rax]": {
diff --git a/unittests/InstructionCountCI/H0F38.json b/unittests/InstructionCountCI/H0F38.json
index 85f36d93a7..2d4e4e84cd 100644
--- a/unittests/InstructionCountCI/H0F38.json
+++ b/unittests/InstructionCountCI/H0F38.json
@@ -402,12 +402,12 @@
         "umov w21, v3.h[0]",
         "mov w27, #0x0",
         "mov w26, #0x1",
-        "cmp x20, #0x0 (0)",
-        "cset x20, eq",
         "cmp x21, #0x0 (0)",
         "cset x21, eq",
-        "lsl x20, x20, #30",
+        "tst w20, w20",
+        "mrs x20, nzcv",
         "orr w20, w20, w21, lsl #29",
+        "and w20, w20, #0x7fffffff",
         "msr nzcv, x20"
       ]
     },
diff --git a/unittests/InstructionCountCI/VEX_map2.json b/unittests/InstructionCountCI/VEX_map2.json
index 3b283a7ed6..65a113bdd3 100644
--- a/unittests/InstructionCountCI/VEX_map2.json
+++ b/unittests/InstructionCountCI/VEX_map2.json
@@ -696,12 +696,12 @@
         "umov w21, v3.h[0]",
         "mov w27, #0x0",
         "mov w26, #0x1",
-        "cmp x20, #0x0 (0)",
-        "cset x20, eq",
         "cmp x21, #0x0 (0)",
         "cset x21, eq",
-        "lsl x20, x20, #30",
+        "tst w20, w20",
+        "mrs x20, nzcv",
         "orr w20, w20, w21, lsl #29",
+        "and w20, w20, #0x7fffffff",
         "msr nzcv, x20"
       ]
     },
@@ -719,12 +719,12 @@
         "umov w21, v3.h[0]",
         "mov w27, #0x0",
         "mov w26, #0x1",
-        "cmp x20, #0x0 (0)",
-        "cset x20, eq",
         "cmp x21, #0x0 (0)",
         "cset x21, eq",
-        "lsl x20, x20, #30",
+        "tst w20, w20",
+        "mrs x20, nzcv",
         "orr w20, w20, w21, lsl #29",
+        "and w20, w20, #0x7fffffff",
         "msr nzcv, x20"
       ]
     },