Merge pull request #3351 from Sonicadvance1/remove_context_lock

FEXCore: Removes context wide and map lookup
FEX-Emu · Dec 27, 2023 · eea2e7b · eea2e7b
2 parents f785b38 + 25bcddf
commit eea2e7b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/FEXCore/Source/Interface/Context/Context.h b/FEXCore/Source/Interface/Context/Context.h
@@ -389,6 +389,7 @@ namespace FEXCore::Context {
     FEX_CONFIG_OPT(AppFilename, APP_FILENAME);
 
     std::shared_mutex CustomIRMutex;
+    std::atomic<bool> HasCustomIRHandlers{};
     fextl::unordered_map<uint64_t, std::tuple<CustomIREntrypointHandler, void *, void *>> CustomIRHandlers;
     FEXCore::CPU::DispatcherConfig DispatcherConfig;
   };

diff --git a/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp
@@ -513,17 +513,20 @@ namespace FEXCore::Context {
     uint64_t TotalInstructions {0};
     uint64_t TotalInstructionsLength {0};
 
+    bool HasCustomIR{};
+
+    if (HasCustomIRHandlers.load(std::memory_order_relaxed)) {
+      std::shared_lock lk(CustomIRMutex);
+      auto Handler = CustomIRHandlers.find(GuestRIP);
+      if (Handler != CustomIRHandlers.end()) {
+        TotalInstructions = 1;
+        TotalInstructionsLength = 1;
+        std::get<0>(Handler->second)(GuestRIP, Thread->OpDispatcher.get());
+        HasCustomIR = true;
+      }
+    }
 
-    std::shared_lock lk(CustomIRMutex);
-
-    auto Handler = CustomIRHandlers.find(GuestRIP);
-    if (Handler != CustomIRHandlers.end()) {
-      TotalInstructions = 1;
-      TotalInstructionsLength = 1;
-      std::get<0>(Handler->second)(GuestRIP, Thread->OpDispatcher.get());
-      lk.unlock();
-    } else {
-      lk.unlock();
+    if (!HasCustomIR) {
       uint8_t const *GuestCode{};
       GuestCode = reinterpret_cast<uint8_t const*>(GuestRIP);
 
@@ -984,6 +987,7 @@ namespace FEXCore::Context {
     std::unique_lock lk(CustomIRMutex);
 
     auto InsertedIterator = CustomIRHandlers.emplace(Entrypoint, std::tuple(Handler, Creator, Data));
+    HasCustomIRHandlers = true;
 
     if (!InsertedIterator.second) {
       const auto &[fn, Creator, Data] = InsertedIterator.first->second;
@@ -1002,6 +1006,8 @@ namespace FEXCore::Context {
     InvalidateGuestCodeRange(nullptr, Entrypoint, 1, [this](uint64_t Entrypoint, uint64_t) {
       CustomIRHandlers.erase(Entrypoint);
     });
+
+    HasCustomIRHandlers = !CustomIRHandlers.empty();
   }
 
   uint64_t HandleSyscall(FEXCore::HLE::SyscallHandler *Handler, FEXCore::Core::CpuStateFrame *Frame, FEXCore::HLE::SyscallArguments *Args) {