diff --git a/unittests/InstructionCountCI/PrimaryGroup.json b/unittests/InstructionCountCI/PrimaryGroup.json
index 118a352f3..a6182da16 100644
--- a/unittests/InstructionCountCI/PrimaryGroup.json
+++ b/unittests/InstructionCountCI/PrimaryGroup.json
@@ -1089,8 +1089,8 @@
         "lsl w26, w20, #2",
         "bfxil x4, x26, #0, #8",
         "cmn wzr, w26, lsl #24",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #6, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1103,8 +1103,8 @@
         "lsr w26, w20, #2",
         "bfxil x4, x26, #0, #8",
         "cmn wzr, w26, lsl #24",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1118,8 +1118,8 @@
         "asr x26, x20, #2",
         "bfxil x4, x26, #0, #8",
         "cmn wzr, w26, lsl #24",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1310,8 +1310,8 @@
         "lsl w26, w20, #2",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #14, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1323,8 +1323,8 @@
         "mov w20, w4",
         "lsl w4, w20, #2",
         "tst w4, w4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #30, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1337,8 +1337,8 @@
         "mov x20, x4",
         "lsl x4, x20, #2",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #62, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1352,8 +1352,8 @@
         "lsr w26, w20, #2",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1365,8 +1365,8 @@
         "mov w20, w4",
         "lsr w4, w20, #2",
         "tst w4, w4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1379,8 +1379,8 @@
         "mov x20, x4",
         "lsr x4, x20, #2",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1395,8 +1395,8 @@
         "asr x26, x20, #2",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1408,8 +1408,8 @@
         "mov w20, w4",
         "asr w4, w20, #2",
         "tst w4, w4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1422,8 +1422,8 @@
         "mov x20, x4",
         "asr x4, x20, #2",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1518,9 +1518,9 @@
         "bfxil x4, x21, #0, #8",
         "uxtb w26, w21",
         "cmn wzr, w26, lsl #24",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #7, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #7, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "eor w20, w26, w20",
         "ubfx x20, x20, #7, #1",
         "orr w20, w21, w20, lsl #28",
@@ -1535,9 +1535,9 @@
         "lsr w26, w20, #1",
         "bfxil x4, x26, #0, #8",
         "cmn wzr, w26, lsl #24",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #0, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #0, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "ubfx x20, x20, #7, #1",
         "orr w20, w21, w20, lsl #28",
         "msr nzcv, x20"
@@ -1552,8 +1552,8 @@
         "asr w26, w20, #1",
         "bfxil x4, x26, #0, #8",
         "cmn wzr, w26, lsl #24",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #0, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1785,9 +1785,9 @@
         "bfxil x4, x21, #0, #16",
         "uxth w26, w21",
         "cmn wzr, w26, lsl #16",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #15, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #15, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "eor w20, w26, w20",
         "ubfx x20, x20, #15, #1",
         "orr w20, w21, w20, lsl #28",
@@ -1801,9 +1801,9 @@
         "mov w20, w4",
         "lsl w4, w20, #1",
         "tst w4, w4",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #31, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #31, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "mov x26, x4",
         "eor w20, w4, w20",
         "ubfx x20, x20, #31, #1",
@@ -1818,9 +1818,9 @@
         "mov x20, x4",
         "lsl x4, x20, #1",
         "tst x4, x4",
-        "mrs x21, nzcv",
-        "lsr x22, x20, #63",
-        "orr w21, w21, w22, lsl #29",
+        "lsr x21, x20, #63",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "mov x26, x4",
         "eor x20, x4, x20",
         "lsr x20, x20, #63",
@@ -1836,9 +1836,9 @@
         "lsr w26, w20, #1",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #0, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #0, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "ubfx x20, x20, #15, #1",
         "orr w20, w21, w20, lsl #28",
         "msr nzcv, x20"
@@ -1851,9 +1851,9 @@
         "mov w20, w4",
         "lsr w4, w20, #1",
         "tst w4, w4",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #0, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #0, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "mov x26, x4",
         "ubfx x20, x20, #31, #1",
         "orr w20, w21, w20, lsl #28",
@@ -1867,9 +1867,9 @@
         "mov x20, x4",
         "lsr x4, x20, #1",
         "tst x4, x4",
-        "mrs x21, nzcv",
-        "ubfx x22, x20, #0, #1",
-        "orr w21, w21, w22, lsl #29",
+        "ubfx x21, x20, #0, #1",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "mov x26, x4",
         "lsr x20, x20, #63",
         "orr w20, w21, w20, lsl #28",
@@ -1885,8 +1885,8 @@
         "asr w26, w20, #1",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #0, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -1898,8 +1898,8 @@
         "mov w20, w4",
         "asr w4, w20, #1",
         "tst w4, w4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #0, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1912,8 +1912,8 @@
         "mov x20, x4",
         "asr x4, x20, #1",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #0, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -2047,11 +2047,11 @@
         "uxtb w22, w22",
         "cbz x21, #+0x34",
         "cmn wzr, w22, lsl #24",
-        "mrs x23, nzcv",
-        "mov w24, #0x8",
-        "sub w21, w24, w21",
+        "mov w23, #0x8",
+        "sub w21, w23, w21",
         "lsr w21, w20, w21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor w20, w20, w22",
@@ -2070,10 +2070,10 @@
         "bfxil x4, x22, #0, #8",
         "cbz x21, #+0x30",
         "cmn wzr, w22, lsl #24",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr w21, w20, w21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor w20, w20, w22",
@@ -2093,11 +2093,11 @@
         "bfxil x4, x22, #0, #8",
         "cbz x21, #+0x24",
         "cmn wzr, w22, lsl #24",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr x20, x20, x21",
         "ubfx x20, x20, #0, #1",
-        "orr w20, w23, w20, lsl #29",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x22",
         "msr nzcv, x20"
       ]
@@ -2415,11 +2415,11 @@
         "uxth w22, w22",
         "cbz x21, #+0x34",
         "cmn wzr, w22, lsl #16",
-        "mrs x23, nzcv",
-        "mov w24, #0x10",
-        "sub w21, w24, w21",
+        "mov w23, #0x10",
+        "sub w21, w23, w21",
         "lsr w21, w20, w21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor w20, w20, w22",
@@ -2438,11 +2438,11 @@
         "mov x4, x22",
         "cbz x21, #+0x34",
         "tst w22, w22",
-        "mrs x23, nzcv",
-        "mov w24, #0x20",
-        "sub w21, w24, w21",
+        "mov w23, #0x20",
+        "sub w21, w23, w21",
         "lsr w21, w20, w21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor w20, w20, w22",
@@ -2461,11 +2461,11 @@
         "mov x4, x22",
         "cbz x21, #+0x34",
         "tst x22, x22",
-        "mrs x23, nzcv",
-        "mov w24, #0x40",
-        "sub x21, x24, x21",
+        "mov w23, #0x40",
+        "sub x21, x23, x21",
         "lsr x21, x20, x21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor x20, x20, x22",
@@ -2484,10 +2484,10 @@
         "bfxil x4, x22, #0, #16",
         "cbz x21, #+0x30",
         "cmn wzr, w22, lsl #16",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr w21, w20, w21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor w20, w20, w22",
@@ -2506,10 +2506,10 @@
         "mov x4, x22",
         "cbz x21, #+0x30",
         "tst w22, w22",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr w21, w20, w21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor w20, w20, w22",
@@ -2528,10 +2528,10 @@
         "mov x4, x22",
         "cbz x21, #+0x30",
         "tst x22, x22",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr x21, x20, x21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor x20, x20, x22",
@@ -2551,11 +2551,11 @@
         "bfxil x4, x22, #0, #16",
         "cbz x21, #+0x24",
         "cmn wzr, w22, lsl #16",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr x20, x20, x21",
         "ubfx x20, x20, #0, #1",
-        "orr w20, w23, w20, lsl #29",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x22",
         "msr nzcv, x20"
       ]
@@ -2570,11 +2570,11 @@
         "mov x4, x22",
         "cbz x21, #+0x24",
         "tst w22, w22",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr w20, w20, w21",
         "ubfx x20, x20, #0, #1",
-        "orr w20, w23, w20, lsl #29",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x22",
         "msr nzcv, x20"
       ]
@@ -2589,11 +2589,11 @@
         "mov x4, x22",
         "cbz x21, #+0x24",
         "tst x22, x22",
-        "mrs x23, nzcv",
         "sub x21, x21, #0x1 (1)",
         "lsr x20, x20, x21",
         "ubfx x20, x20, #0, #1",
-        "orr w20, w23, w20, lsl #29",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x22",
         "msr nzcv, x20"
       ]
diff --git a/unittests/InstructionCountCI/Secondary.json b/unittests/InstructionCountCI/Secondary.json
index a43162e42..8e7b54f36 100644
--- a/unittests/InstructionCountCI/Secondary.json
+++ b/unittests/InstructionCountCI/Secondary.json
@@ -1395,9 +1395,9 @@
         "orr x26, x22, x20",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x20, nzcv",
-        "ubfx x22, x21, #15, #1",
-        "orr w20, w20, w22, lsl #29",
+        "ubfx x20, x21, #15, #1",
+        "mrs x22, nzcv",
+        "orr w20, w22, w20, lsl #29",
         "eor w21, w26, w21",
         "ubfx x21, x21, #15, #1",
         "orr w20, w20, w21, lsl #28",
@@ -1415,9 +1415,9 @@
         "orr x26, x22, x20",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x20, nzcv",
-        "ubfx x21, x21, #1, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x21, #1, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -1431,9 +1431,9 @@
         "orr x26, x22, x20",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x20, nzcv",
-        "ubfx x21, x21, #0, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x21, #0, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -1448,9 +1448,9 @@
         "orr x26, x22, x20",
         "bfxil x4, x26, #0, #16",
         "cmn wzr, w26, lsl #16",
-        "mrs x20, nzcv",
-        "ubfx x21, x21, #1, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x21, #1, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -1469,9 +1469,9 @@
         "mov w21, w4",
         "extr w4, w21, w20, #31",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "ubfx x22, x21, #31, #1",
-        "orr w20, w20, w22, lsl #29",
+        "ubfx x20, x21, #31, #1",
+        "mrs x22, nzcv",
+        "orr w20, w22, w20, lsl #29",
         "mov x26, x4",
         "eor w21, w4, w21",
         "ubfx x21, x21, #31, #1",
@@ -1487,9 +1487,9 @@
         "mov w21, w4",
         "extr w4, w21, w20, #17",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "ubfx x21, x21, #17, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x21, #17, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
       ]
@@ -1502,9 +1502,9 @@
         "mov w21, w4",
         "extr w4, w21, w20, #16",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "ubfx x21, x21, #16, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x21, #16, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
       ]
@@ -1517,9 +1517,9 @@
         "mov w21, w4",
         "extr w4, w21, w20, #1",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "ubfx x21, x21, #1, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x21, #1, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
       ]
@@ -1536,9 +1536,9 @@
         "mov x20, x4",
         "extr x4, x20, x7, #63",
         "tst x4, x4",
-        "mrs x21, nzcv",
-        "lsr x22, x20, #63",
-        "orr w21, w21, w22, lsl #29",
+        "lsr x21, x20, #63",
+        "mrs x22, nzcv",
+        "orr w21, w22, w21, lsl #29",
         "mov x26, x4",
         "eor x20, x4, x20",
         "lsr x20, x20, #63",
@@ -1553,8 +1553,8 @@
         "mov x20, x4",
         "extr x4, x20, x7, #49",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #49, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1567,8 +1567,8 @@
         "mov x20, x4",
         "extr x4, x20, x7, #32",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #32, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1581,8 +1581,8 @@
         "mov x20, x4",
         "extr x4, x20, x7, #1",
         "tst x4, x4",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #1, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "mov x26, x4",
         "msr nzcv, x20"
@@ -1607,11 +1607,11 @@
         "msr nzcv, x23",
         "cbz x22, #+0x34",
         "cmn wzr, w20, lsl #16",
-        "mrs x23, nzcv",
-        "mov w24, #0x10",
-        "sub w22, w24, w22",
+        "mov w23, #0x10",
+        "sub w22, w23, w22",
         "lsr w22, w21, w22",
         "ubfx x22, x22, #0, #1",
+        "mrs x23, nzcv",
         "orr w22, w23, w22, lsl #29",
         "mov x26, x20",
         "eor w20, w21, w20",
@@ -1638,11 +1638,11 @@
         "msr nzcv, x23",
         "cbz x22, #+0x34",
         "tst w20, w20",
-        "mrs x23, nzcv",
-        "mov w24, #0x20",
-        "sub w22, w24, w22",
+        "mov w23, #0x20",
+        "sub w22, w23, w22",
         "lsr w22, w21, w22",
         "ubfx x22, x22, #0, #1",
+        "mrs x23, nzcv",
         "orr w22, w23, w22, lsl #29",
         "mov x26, x20",
         "eor w20, w21, w20",
@@ -1668,11 +1668,11 @@
         "msr nzcv, x23",
         "cbz x21, #+0x34",
         "tst x22, x22",
-        "mrs x23, nzcv",
-        "mov w24, #0x40",
-        "sub x21, x24, x21",
+        "mov w23, #0x40",
+        "sub x21, x23, x21",
         "lsr x21, x20, x21",
         "ubfx x21, x21, #0, #1",
+        "mrs x23, nzcv",
         "orr w21, w23, w21, lsl #29",
         "mov x26, x22",
         "eor x20, x20, x22",
diff --git a/unittests/InstructionCountCI/Secondary_REP.json b/unittests/InstructionCountCI/Secondary_REP.json
index bc1f11e7f..2f7b6aa2e 100644
--- a/unittests/InstructionCountCI/Secondary_REP.json
+++ b/unittests/InstructionCountCI/Secondary_REP.json
@@ -448,8 +448,8 @@
         "clz w20, w20",
         "bfxil x4, x20, #0, #16",
         "cmn wzr, w20, lsl #16",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #4, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -461,9 +461,9 @@
         "rbit w4, w7",
         "clz w4, w4",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "ubfx x21, x4, #5, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x4, #5, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -474,9 +474,9 @@
         "rbit x4, x7",
         "clz x4, x4",
         "tst x4, x4",
-        "mrs x20, nzcv",
-        "ubfx x21, x4, #6, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x4, #6, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -489,8 +489,8 @@
         "clz w20, w20",
         "bfxil x4, x20, #0, #16",
         "cmn wzr, w20, lsl #16",
-        "mrs x21, nzcv",
         "ubfx x20, x20, #4, #1",
+        "mrs x21, nzcv",
         "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
@@ -501,9 +501,9 @@
       "ExpectedArm64ASM": [
         "clz w4, w7",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "ubfx x21, x4, #5, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x4, #5, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -513,9 +513,9 @@
       "ExpectedArm64ASM": [
         "clz x4, x7",
         "tst x4, x4",
-        "mrs x20, nzcv",
-        "ubfx x21, x4, #6, #1",
-        "orr w20, w20, w21, lsl #29",
+        "ubfx x20, x4, #6, #1",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
diff --git a/unittests/InstructionCountCI/VEX_map_group.json b/unittests/InstructionCountCI/VEX_map_group.json
index 6ed4366dd..21859ec7f 100644
--- a/unittests/InstructionCountCI/VEX_map_group.json
+++ b/unittests/InstructionCountCI/VEX_map_group.json
@@ -681,9 +681,9 @@
         "neg w20, w7",
         "and w4, w7, w20",
         "tst w4, w4",
-        "mrs x20, nzcv",
-        "cset w21, ne",
-        "orr w20, w20, w21, lsl #29",
+        "cset w20, ne",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     },
@@ -696,9 +696,9 @@
         "neg x20, x7",
         "and x4, x7, x20",
         "tst x4, x4",
-        "mrs x20, nzcv",
-        "cset w21, ne",
-        "orr w20, w20, w21, lsl #29",
+        "cset w20, ne",
+        "mrs x21, nzcv",
+        "orr w20, w21, w20, lsl #29",
         "msr nzcv, x20"
       ]
     }