From e9867ca35ade8486e5cb9b327e843792e8a238d6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 6 Dec 2024 17:02:27 -0800 Subject: [PATCH 1/2] Revert "FEXCore: Change yield implementation to use wfe" This reverts commit e53f3969e9cc2086fd3f6d283a2d45f2ec67f12c. --- FEXCore/Source/Interface/Core/JIT/MiscOps.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp b/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp index b826c038c..717a92af5 100644 --- a/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp +++ b/FEXCore/Source/Interface/Core/JIT/MiscOps.cpp @@ -267,7 +267,7 @@ DEF_OP(RDRAND) { } DEF_OP(Yield) { - wfe(); + yield(); } #undef DEF_OP From 1058575d3a203d52c5dca58e5918fc4646564eda Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 6 Dec 2024 17:04:28 -0800 Subject: [PATCH 2/2] InstcountCI: Update pause instruction --- unittests/InstructionCountCI/Primary.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unittests/InstructionCountCI/Primary.json b/unittests/InstructionCountCI/Primary.json index 9d81d4ac5..02f9cb1e1 100644 --- a/unittests/InstructionCountCI/Primary.json +++ b/unittests/InstructionCountCI/Primary.json @@ -2544,7 +2544,7 @@ "ExpectedInstructionCount": 1, "Comment": "0xF3 0x90", "ExpectedArm64ASM": [ - "wfe" + "yield" ] }, "cbw": {