From dcf75597ce9f710a48c4f6fb7692528b4b4c58d6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 29 Mar 2024 10:33:54 -0400 Subject: [PATCH] InstCountCI: Update Signed-off-by: Alyssa Rosenzweig --- .../FlagM/HotBlocks_32Bit.json | 10 ++-- .../FlagM/PrimaryGroup.json | 22 ++++---- .../FlagM/SecondaryGroup.json | 16 +++--- .../InstructionCountCI/PrimaryGroup.json | 54 +++++++++---------- .../InstructionCountCI/SecondaryGroup.json | 8 +-- 5 files changed, 50 insertions(+), 60 deletions(-) diff --git a/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json b/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json index e85848d4ef..3ced5587dd 100644 --- a/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json +++ b/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json @@ -80,7 +80,7 @@ ] }, "dxvk hotblock from MGRR": { - "ExpectedInstructionCount": 42, + "ExpectedInstructionCount": 40, "Comment": [ "Hottest block in Metal Gear Rising: Revengeance render thread" ], @@ -136,11 +136,9 @@ "mov w25, w3", "mov w20, w24", "mov w12, w25", - "cmp x24, x22", - "ccmp x25, x23, #nzcv, eq", - "cset x22, eq", - "msr nzcv, x21", - "rmif x22, #62, #nZcv", + "cmp w24, w22", + "ccmp w25, w23, #nzcv, eq", + "rmif x21, #0, #NzCV", "csel x4, x20, x4, ne", "csel x6, x12, x6, ne" ] diff --git a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json index dd7ce4bd1e..3f1cb983ac 100644 --- a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json +++ b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json @@ -1615,8 +1615,8 @@ "ror w20, w20, w21", "bfxil x4, x20, #0, #8", "cbz x21, #+0x10", - "rmif x20, #6, #nzCv", - "eor w20, w20, w20, lsr #1", + "rmif x4, #6, #nzCv", + "eor w20, w4, w4, lsr #1", "rmif x20, #6, #nzcV" ] }, @@ -1793,8 +1793,8 @@ "ror w20, w20, w21", "bfxil x4, x20, #0, #16", "cbz x21, #+0x10", - "rmif x20, #14, #nzCv", - "eor w20, w20, w20, lsr #1", + "rmif x4, #14, #nzCv", + "eor w20, w4, w4, lsr #1", "rmif x20, #14, #nzcV" ] }, @@ -1805,11 +1805,10 @@ "mov w20, w4", "mov w21, w5", "and w21, w21, #0x1f", - "ror w20, w20, w21", - "mov x4, x20", + "ror w4, w20, w21", "cbz x21, #+0x10", - "rmif x20, #30, #nzCv", - "eor w20, w20, w20, lsr #1", + "rmif x4, #30, #nzCv", + "eor w20, w4, w4, lsr #1", "rmif x20, #30, #nzcV" ] }, @@ -1818,11 +1817,10 @@ "Comment": "GROUP2 0xd3 /1", "ExpectedArm64ASM": [ "and x20, x5, #0x3f", - "ror x21, x4, x20", - "mov x4, x21", + "ror x4, x4, x20", "cbz x20, #+0x10", - "rmif x21, #62, #nzCv", - "eor x20, x21, x21, lsr #1", + "rmif x4, #62, #nzCv", + "eor x20, x4, x4, lsr #1", "rmif x20, #62, #nzcV" ] }, diff --git a/unittests/InstructionCountCI/FlagM/SecondaryGroup.json b/unittests/InstructionCountCI/FlagM/SecondaryGroup.json index 6d1e2e9639..8190d5b2b0 100644 --- a/unittests/InstructionCountCI/FlagM/SecondaryGroup.json +++ b/unittests/InstructionCountCI/FlagM/SecondaryGroup.json @@ -644,7 +644,7 @@ ] }, "cmpxchg8b [rbp]": { - "ExpectedInstructionCount": 24, + "ExpectedInstructionCount": 22, "Comment": "GROUP9 0x0F 0xC7 /1", "ExpectedArm64ASM": [ "add x20, x9, #0x0 (0)", @@ -664,17 +664,15 @@ "mov w25, w3", "mov w20, w24", "mov w30, w25", - "cmp x24, x22", - "ccmp x25, x23, #nzcv, eq", - "cset x22, eq", - "msr nzcv, x21", - "rmif x22, #62, #nZcv", + "cmp w24, w22", + "ccmp w25, w23, #nzcv, eq", + "rmif x21, #0, #NzCV", "csel x4, x20, x4, ne", "csel x6, x30, x6, ne" ] }, "cmpxchg16b [rbp]": { - "ExpectedInstructionCount": 20, + "ExpectedInstructionCount": 18, "Comment": "GROUP9 0x0F 0xC7 /1", "ExpectedArm64ASM": [ "add x20, x9, #0x0 (0)", @@ -692,9 +690,7 @@ "mov x30, x25", "cmp x24, x22", "ccmp x25, x23, #nzcv, eq", - "cset x22, eq", - "msr nzcv, x21", - "rmif x22, #62, #nZcv", + "rmif x21, #0, #NzCV", "csel x4, x20, x4, ne", "csel x6, x30, x6, ne" ] diff --git a/unittests/InstructionCountCI/PrimaryGroup.json b/unittests/InstructionCountCI/PrimaryGroup.json index 66426ee8c4..4cd53493ae 100644 --- a/unittests/InstructionCountCI/PrimaryGroup.json +++ b/unittests/InstructionCountCI/PrimaryGroup.json @@ -1939,13 +1939,13 @@ "ror w20, w20, w21", "bfxil x4, x20, #0, #8", "cbz x21, #+0x24", - "mrs x21, nzcv", - "and w21, w21, #0xc0000000", - "ubfx x22, x20, #7, #1", - "orr w21, w21, w22, lsl #29", - "eor w20, w20, w20, lsr #1", - "ubfx x20, x20, #6, #1", - "orr w20, w21, w20, lsl #28", + "mrs x20, nzcv", + "and w20, w20, #0xc0000000", + "ubfx x21, x4, #7, #1", + "orr w20, w20, w21, lsl #29", + "eor w21, w4, w4, lsr #1", + "ubfx x21, x21, #6, #1", + "orr w20, w20, w21, lsl #28", "msr nzcv, x20" ] }, @@ -2162,13 +2162,13 @@ "ror w20, w20, w21", "bfxil x4, x20, #0, #16", "cbz x21, #+0x24", - "mrs x21, nzcv", - "and w21, w21, #0xc0000000", - "ubfx x22, x20, #15, #1", - "orr w21, w21, w22, lsl #29", - "eor w20, w20, w20, lsr #1", - "ubfx x20, x20, #14, #1", - "orr w20, w21, w20, lsl #28", + "mrs x20, nzcv", + "and w20, w20, #0xc0000000", + "ubfx x21, x4, #15, #1", + "orr w20, w20, w21, lsl #29", + "eor w21, w4, w4, lsr #1", + "ubfx x21, x21, #14, #1", + "orr w20, w20, w21, lsl #28", "msr nzcv, x20" ] }, @@ -2179,16 +2179,15 @@ "mov w20, w4", "mov w21, w5", "and w21, w21, #0x1f", - "ror w20, w20, w21", - "mov x4, x20", + "ror w4, w20, w21", "cbz x21, #+0x24", - "mrs x21, nzcv", - "and w21, w21, #0xc0000000", - "ubfx x22, x20, #31, #1", - "orr w21, w21, w22, lsl #29", - "eor w20, w20, w20, lsr #1", - "ubfx x20, x20, #30, #1", - "orr w20, w21, w20, lsl #28", + "mrs x20, nzcv", + "and w20, w20, #0xc0000000", + "ubfx x21, x4, #31, #1", + "orr w20, w20, w21, lsl #29", + "eor w21, w4, w4, lsr #1", + "ubfx x21, x21, #30, #1", + "orr w20, w20, w21, lsl #28", "msr nzcv, x20" ] }, @@ -2197,14 +2196,13 @@ "Comment": "GROUP2 0xd3 /1", "ExpectedArm64ASM": [ "and x20, x5, #0x3f", - "ror x21, x4, x20", - "mov x4, x21", + "ror x4, x4, x20", "cbz x20, #+0x24", "mrs x20, nzcv", "and w20, w20, #0xc0000000", - "lsr x22, x21, #63", - "orr w20, w20, w22, lsl #29", - "eor x21, x21, x21, lsr #1", + "lsr x21, x4, #63", + "orr w20, w20, w21, lsl #29", + "eor x21, x4, x4, lsr #1", "ubfx x21, x21, #62, #1", "orr w20, w20, w21, lsl #28", "msr nzcv, x20" diff --git a/unittests/InstructionCountCI/SecondaryGroup.json b/unittests/InstructionCountCI/SecondaryGroup.json index 4e5cbc5a74..d825f3d990 100644 --- a/unittests/InstructionCountCI/SecondaryGroup.json +++ b/unittests/InstructionCountCI/SecondaryGroup.json @@ -796,9 +796,9 @@ "mov w25, w3", "mov w20, w24", "mov w30, w25", - "cmp x24, x22", - "ccmp x25, x23, #nzcv, eq", - "cset x22, eq", + "cmp w24, w22", + "ccmp w25, w23, #nzcv, eq", + "cset w22, eq", "bfi w21, w22, #30, #1", "msr nzcv, x21", "csel x4, x20, x4, ne", @@ -824,7 +824,7 @@ "mov x30, x25", "cmp x24, x22", "ccmp x25, x23, #nzcv, eq", - "cset x22, eq", + "cset w22, eq", "bfi w21, w22, #30, #1", "msr nzcv, x21", "csel x4, x20, x4, ne",