diff --git a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
index aa22c4d33a..f544dbb8c0 100644
--- a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
+++ b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
@@ -2196,12 +2196,11 @@
       ]
     },
     "idiv bl": {
-      "ExpectedInstructionCount": 9,
+      "ExpectedInstructionCount": 8,
       "Comment": "GROUP2 0xf6 /7",
       "ExpectedArm64ASM": [
         "uxtb w20, w6",
-        "uxth w21, w4",
-        "sxth x21, w21",
+        "sxth x21, w4",
         "sxtb x20, w20",
         "sdiv x22, x21, x20",
         "sdiv x0, x21, x20",
@@ -2367,20 +2366,18 @@
       ]
     },
     "div bx": {
-      "ExpectedInstructionCount": 12,
+      "ExpectedInstructionCount": 10,
       "Comment": "GROUP2 0xf7 /6",
       "ExpectedArm64ASM": [
         "uxth w20, w6",
-        "uxth w21, w4",
-        "uxth w22, w5",
-        "uxth w0, w21",
-        "bfi w0, w22, #16, #16",
-        "udiv w23, w0, w20",
-        "uxth w0, w21",
-        "bfi w0, w22, #16, #16",
+        "uxth w0, w4",
+        "bfi w0, w5, #16, #16",
+        "udiv w21, w0, w20",
+        "uxth w0, w4",
+        "bfi w0, w5, #16, #16",
         "udiv w1, w0, w20",
         "msub w20, w1, w20, w0",
-        "bfxil x4, x23, #0, #16",
+        "bfxil x4, x21, #0, #16",
         "bfxil x5, x20, #0, #16"
       ]
     },
diff --git a/unittests/InstructionCountCI/PrimaryGroup.json b/unittests/InstructionCountCI/PrimaryGroup.json
index d2d75a8cd1..505de3e107 100644
--- a/unittests/InstructionCountCI/PrimaryGroup.json
+++ b/unittests/InstructionCountCI/PrimaryGroup.json
@@ -2588,12 +2588,11 @@
       ]
     },
     "idiv bl": {
-      "ExpectedInstructionCount": 9,
+      "ExpectedInstructionCount": 8,
       "Comment": "GROUP2 0xf6 /7",
       "ExpectedArm64ASM": [
         "uxtb w20, w6",
-        "uxth w21, w4",
-        "sxth x21, w21",
+        "sxth x21, w4",
         "sxtb x20, w20",
         "sdiv x22, x21, x20",
         "sdiv x0, x21, x20",
@@ -2786,39 +2785,36 @@
       ]
     },
     "div bx": {
-      "ExpectedInstructionCount": 12,
+      "ExpectedInstructionCount": 10,
       "Comment": "GROUP2 0xf7 /6",
       "ExpectedArm64ASM": [
         "uxth w20, w6",
-        "uxth w21, w4",
-        "uxth w22, w5",
-        "uxth w0, w21",
-        "bfi w0, w22, #16, #16",
-        "udiv w23, w0, w20",
-        "uxth w0, w21",
-        "bfi w0, w22, #16, #16",
+        "uxth w0, w4",
+        "bfi w0, w5, #16, #16",
+        "udiv w21, w0, w20",
+        "uxth w0, w4",
+        "bfi w0, w5, #16, #16",
         "udiv w1, w0, w20",
         "msub w20, w1, w20, w0",
-        "bfxil x4, x23, #0, #16",
+        "bfxil x4, x21, #0, #16",
         "bfxil x5, x20, #0, #16"
       ]
     },
     "div ebx": {
-      "ExpectedInstructionCount": 12,
+      "ExpectedInstructionCount": 11,
       "Comment": "GROUP2 0xf7 /6",
       "ExpectedArm64ASM": [
         "mov w20, w6",
-        "mov w21, w4",
-        "mov w22, w5",
-        "mov x0, x21",
-        "bfi x0, x22, #32, #32",
-        "udiv x23, x0, x20",
-        "mov w4, w23",
-        "mov x0, x21",
-        "bfi x0, x22, #32, #32",
+        "mov x0, x4",
+        "bfi x0, x5, #32, #32",
+        "udiv x21, x0, x20",
+        "mov w21, w21",
+        "mov x0, x4",
+        "bfi x0, x5, #32, #32",
         "udiv x1, x0, x20",
         "msub x20, x1, x20, x0",
-        "mov w5, w20"
+        "mov w5, w20",
+        "mov x4, x21"
       ]
     },
     "div rbx": {
@@ -2852,43 +2848,40 @@
       ]
     },
     "idiv bx": {
-      "ExpectedInstructionCount": 14,
+      "ExpectedInstructionCount": 12,
       "Comment": "GROUP2 0xf7 /7",
       "ExpectedArm64ASM": [
         "uxth w20, w6",
-        "uxth w21, w4",
-        "uxth w22, w5",
-        "uxth w0, w21",
-        "bfi w0, w22, #16, #16",
+        "uxth w0, w4",
+        "bfi w0, w5, #16, #16",
         "sxth w1, w20",
-        "sdiv w23, w0, w1",
-        "uxth w0, w21",
-        "bfi w0, w22, #16, #16",
+        "sdiv w21, w0, w1",
+        "uxth w0, w4",
+        "bfi w0, w5, #16, #16",
         "sxth w1, w20",
         "sdiv w2, w0, w1",
         "msub w20, w2, w1, w0",
-        "bfxil x4, x23, #0, #16",
+        "bfxil x4, x21, #0, #16",
         "bfxil x5, x20, #0, #16"
       ]
     },
     "idiv ebx": {
-      "ExpectedInstructionCount": 14,
+      "ExpectedInstructionCount": 13,
       "Comment": "GROUP2 0xf7 /7",
       "ExpectedArm64ASM": [
         "mov w20, w6",
-        "mov w21, w4",
-        "mov w22, w5",
-        "mov x0, x21",
-        "bfi x0, x22, #32, #32",
+        "mov x0, x4",
+        "bfi x0, x5, #32, #32",
         "sxtw x1, w20",
-        "sdiv x23, x0, x1",
-        "mov w4, w23",
-        "mov x0, x21",
-        "bfi x0, x22, #32, #32",
+        "sdiv x21, x0, x1",
+        "mov w21, w21",
+        "mov x0, x4",
+        "bfi x0, x5, #32, #32",
         "sxtw x2, w20",
         "sdiv x1, x0, x2",
         "msub x20, x1, x2, x0",
-        "mov w5, w20"
+        "mov w5, w20",
+        "mov x4, x21"
       ]
     },
     "idiv rbx": {