From 00fec3d51f87d5f23c7706ccb3fe98ef0e36b325 Mon Sep 17 00:00:00 2001
From: Billy Laws <blaws05@gmail.com>
Date: Wed, 9 Jul 2025 00:49:25 +0100
Subject: [PATCH] Update InstCountCI

---
 unittests/InstructionCountCI/AVX128/VEX_map1.json       | 4 ++--
 unittests/InstructionCountCI/Secondary_REP.json         | 4 ++--
 unittests/InstructionCountCI/Secondary_REPNE.json       | 8 ++++----
 unittests/InstructionCountCI/Secondary_REP_FRINTTS.json | 4 ++--
 unittests/InstructionCountCI/VEX_map1.json              | 8 ++++----
 unittests/InstructionCountCI/VEX_map1_FRINTTS.json      | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/unittests/InstructionCountCI/AVX128/VEX_map1.json b/unittests/InstructionCountCI/AVX128/VEX_map1.json
index 708e57cff..a0b6d5d15 100644
--- a/unittests/InstructionCountCI/AVX128/VEX_map1.json
+++ b/unittests/InstructionCountCI/AVX128/VEX_map1.json
@@ -2681,8 +2681,8 @@
         "Map 1 0b11 0x2d 128-bit"
       ],
       "ExpectedArm64ASM": [
-        "frint64x d2, d16",
-        "fcvtzs x4, d2"
+        "frint32x d2, d16",
+        "fcvtzs w4, d2"
       ]
     },
     "vcvtsd2si rax, xmm0": {
diff --git a/unittests/InstructionCountCI/Secondary_REP.json b/unittests/InstructionCountCI/Secondary_REP.json
index 31cf1d350..01dfcbe28 100644
--- a/unittests/InstructionCountCI/Secondary_REP.json
+++ b/unittests/InstructionCountCI/Secondary_REP.json
@@ -155,7 +155,7 @@
       "ExpectedInstructionCount": 8,
       "Comment": "0xf3 0x0f 0x2c",
       "ExpectedArm64ASM": [
-        "ldr d2, [x6]",
+        "ldr s2, [x6]",
         "fcvtzs x20, s2",
         "mov x21, #0x8000000000000000",
         "ldr s3, [x28, #3216]",
@@ -212,7 +212,7 @@
       "ExpectedInstructionCount": 9,
       "Comment": "0xf3 0x0f 0x2d",
       "ExpectedArm64ASM": [
-        "ldr d2, [x6]",
+        "ldr s2, [x6]",
         "frinti s2, s2",
         "fcvtzs x20, s2",
         "mov x21, #0x8000000000000000",
diff --git a/unittests/InstructionCountCI/Secondary_REPNE.json b/unittests/InstructionCountCI/Secondary_REPNE.json
index 79141c3f0..070033e85 100644
--- a/unittests/InstructionCountCI/Secondary_REPNE.json
+++ b/unittests/InstructionCountCI/Secondary_REPNE.json
@@ -135,8 +135,8 @@
       "ExpectedInstructionCount": 2,
       "Comment": "0xf2 0x0f 0x2d",
       "ExpectedArm64ASM": [
-        "frint64x d2, d16",
-        "fcvtzs x4, d2"
+        "frint32x d2, d16",
+        "fcvtzs w4, d2"
       ]
     },
     "cvtsd2si eax, qword [rbx]": {
@@ -144,8 +144,8 @@
       "Comment": "0xf2 0x0f 0x2d",
       "ExpectedArm64ASM": [
         "ldr d2, [x6]",
-        "frint64x d2, d2",
-        "fcvtzs x4, d2"
+        "frint32x d2, d2",
+        "fcvtzs w4, d2"
       ]
     },
     "cvtsd2si rax, xmm0": {
diff --git a/unittests/InstructionCountCI/Secondary_REP_FRINTTS.json b/unittests/InstructionCountCI/Secondary_REP_FRINTTS.json
index 7640171ef..c2579db7d 100644
--- a/unittests/InstructionCountCI/Secondary_REP_FRINTTS.json
+++ b/unittests/InstructionCountCI/Secondary_REP_FRINTTS.json
@@ -43,7 +43,7 @@
       "ExpectedInstructionCount": 3,
       "Comment": "0xf3 0x0f 0x2c",
       "ExpectedArm64ASM": [
-        "ldr d2, [x6]",
+        "ldr s2, [x6]",
         "frint64z s2, s2",
         "fcvtzs x4, s2"
       ]
@@ -77,7 +77,7 @@
       "ExpectedInstructionCount": 3,
       "Comment": "0xf3 0x0f 0x2d",
       "ExpectedArm64ASM": [
-        "ldr d2, [x6]",
+        "ldr s2, [x6]",
         "frint64x s2, s2",
         "fcvtzs x4, s2"
       ]
diff --git a/unittests/InstructionCountCI/VEX_map1.json b/unittests/InstructionCountCI/VEX_map1.json
index 41dcf5fce..0be9f30ba 100644
--- a/unittests/InstructionCountCI/VEX_map1.json
+++ b/unittests/InstructionCountCI/VEX_map1.json
@@ -3362,12 +3362,12 @@
       ],
       "ExpectedArm64ASM": [
         "frinti d2, d16",
-        "fcvtzs x20, d2",
-        "mov x21, #0x8000000000000000",
-        "ldr d3, [x28, #3264]",
+        "fcvtzs w20, d2",
+        "mov w21, #0x80000000",
+        "ldr d3, [x28, #3232]",
         "mrs x22, nzcv",
         "fcmp d3, d2",
-        "csel x4, x20, x21, gt",
+        "csel w4, w20, w21, gt",
         "msr nzcv, x22"
       ]
     },
diff --git a/unittests/InstructionCountCI/VEX_map1_FRINTTS.json b/unittests/InstructionCountCI/VEX_map1_FRINTTS.json
index e1cd71b80..7bdf7727e 100644
--- a/unittests/InstructionCountCI/VEX_map1_FRINTTS.json
+++ b/unittests/InstructionCountCI/VEX_map1_FRINTTS.json
@@ -81,8 +81,8 @@
         "Map 1 0b11 0x2d 128-bit"
       ],
       "ExpectedArm64ASM": [
-        "frint64x d2, d16",
-        "fcvtzs x4, d2"
+        "frint32x d2, d16",
+        "fcvtzs w4, d2"
       ]
     },
     "vcvtsd2si rax, xmm0": {