Merge pull request #3313 from alyssarosenzweig/opt/andn-mask

rm andn masking
FEX-Emu · Dec 6, 2023 · 0fe5e3d · 0fe5e3d
2 parents 26c9d5d + 924cfb5
commit 0fe5e3d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
@@ -2084,8 +2084,8 @@ void OpDispatchBuilder::ROLImmediateOp(OpcodeArgs) {
 }
 
 void OpDispatchBuilder::ANDNBMIOp(OpcodeArgs) {
-  auto* Src1 = LoadSource(GPRClass, Op, Op->Src[0], Op->Flags);
-  auto* Src2 = LoadSource(GPRClass, Op, Op->Src[1], Op->Flags);
+  auto* Src1 = LoadSource(GPRClass, Op, Op->Src[0], Op->Flags, {.AllowUpperGarbage = true});
+  auto* Src2 = LoadSource(GPRClass, Op, Op->Src[1], Op->Flags, {.AllowUpperGarbage = true});
 
   auto Dest = _Andn(OpSizeFromSrc(Op), Src2, Src1);
 

diff --git a/unittests/InstructionCountCI/FlagM/VEX_map2.json b/unittests/InstructionCountCI/FlagM/VEX_map2.json
@@ -418,14 +418,12 @@
       ]
     },
     "andn eax, ebx, ecx": {
-      "ExpectedInstructionCount": 5,
+      "ExpectedInstructionCount": 3,
       "Comment": [
         "Map 2 0b00 0xf2 32-bit"
       ],
       "ExpectedArm64ASM": [
-        "mov w20, w7",
-        "mov w21, w5",
-        "bic w4, w21, w20",
+        "bic w4, w5, w7",
         "mov x26, x4",
         "tst w4, w4"
       ]

diff --git a/unittests/InstructionCountCI/VEX_map2.json b/unittests/InstructionCountCI/VEX_map2.json
@@ -3229,14 +3229,12 @@
       ]
     },
     "andn eax, ebx, ecx": {
-      "ExpectedInstructionCount": 5,
+      "ExpectedInstructionCount": 3,
       "Comment": [
         "Map 2 0b00 0xf2 32-bit"
       ],
       "ExpectedArm64ASM": [
-        "mov w20, w7",
-        "mov w21, w5",
-        "bic w4, w21, w20",
+        "bic w4, w5, w7",
         "mov x26, x4",
         "tst w4, w4"
       ]