[dynarmic] backport WAITPKG based spinlocks

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -319,6 +319,18 @@ if (YUZU_ROOM)
     add_compile_definitions(YUZU_ROOM)
 endif()
 
+if (ANDROID OR PLATFORM_FREEBSD OR PLATFORM_OPENBSD OR PLATFORM_SUN OR APPLE)
+    if(CXX_APPLE OR CXX_CLANG)
+        # libc++ has stop_token and jthread as experimental
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexperimental-library")
+    else()
+        # Uses glibc, mostly?
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")
+    endif()
+endif()
+
 # Build/optimization presets
 if (PLATFORM_LINUX OR CXX_CLANG)
     if (ARCHITECTURE_x86_64)

CMakeModules/GenerateSCMRev.cmake

@@ -31,7 +31,11 @@ set(GIT_DESC ${BUILD_VERSION})
 set(REPO_NAME "Eden")
 set(BUILD_ID ${GIT_REFSPEC})
 set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION} ")
-
 set(CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
+# Auto-updater metadata! Must somewhat mirror GitHub API endpoint
+set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com")
+set(BUILD_AUTO_UPDATE_API "http://api.github.com")
+set(BUILD_AUTO_UPDATE_REPO "eden-emulator/Releases")
+
 configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY)

src/audio_core/renderer/behavior/info_updater.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -162,6 +165,12 @@ Result InfoUpdater::UpdateEffectsVersion1(EffectContext& effect_context, const b
         reinterpret_cast<EffectInfoBase::OutStatusVersion1*>(output), effect_count};
 
     for (u32 i = 0; i < effect_count; i++) {
+#ifdef _WIN32
+        // There's a bug in Windows where using this effect causes extreme noise. So let's skip it.
+        if (in_params[i].type == EffectInfoBase::Type::Reverb) {
+            continue;
+        }
+#endif
         auto effect_info{&effect_context.GetInfo(i)};
         if (effect_info->GetType() != in_params[i].type) {
             effect_info->ForceUnmapBuffers(pool_mapper);
@@ -209,6 +218,12 @@ Result InfoUpdater::UpdateEffectsVersion2(EffectContext& effect_context, const b
         reinterpret_cast<EffectInfoBase::OutStatusVersion2*>(output), effect_count};
 
     for (u32 i = 0; i < effect_count; i++) {
+#ifdef _WIN32
+        // There's a bug in Windows where using this effect causes extreme noise. So let's skip it.
+        if (in_params[i].type == EffectInfoBase::Type::Reverb) {
+            continue;
+        }
+#endif
         auto effect_info{&effect_context.GetInfo(i)};
         if (effect_info->GetType() != in_params[i].type) {
             effect_info->ForceUnmapBuffers(pool_mapper);

src/audio_core/sink/sink_stream.cpp

@@ -293,8 +293,7 @@ void SinkStream::WaitFreeSpace(std::stop_token stop_token) {
     release_cv.wait_for(lk, std::chrono::milliseconds(5),
                         [this]() { return paused || queued_buffers < max_queue_size; });
     if (queued_buffers > max_queue_size + 3) {
-        Common::CondvarWait(release_cv, lk, stop_token,
-                            [this] { return paused || queued_buffers < max_queue_size; });
+        release_cv.wait(lk, stop_token, [this] { return paused || queued_buffers < max_queue_size; });
     }
 }
 

src/common/bounded_threadsafe_queue.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -123,7 +126,7 @@ private:
         } else if constexpr (Mode == PopMode::WaitWithStopToken) {
             // Wait until the queue is not empty.
             std::unique_lock lock{consumer_cv_mutex};
-            Common::CondvarWait(consumer_cv, lock, stop_token, [this, read_index] {
+            consumer_cv.wait(lock, stop_token, [this, read_index] {
                 return read_index != m_write_index.load(std::memory_order::acquire);
             });
             if (stop_token.stop_requested()) {

src/common/polyfill_thread.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -7,23 +10,13 @@
 
 #pragma once
 
-#include <version>
-
-#ifdef __cpp_lib_jthread
-
 #include <chrono>
 #include <condition_variable>
-#include <stop_token>
 #include <thread>
 #include <utility>
 
 namespace Common {
 
-template <typename Condvar, typename Lock, typename Pred>
-void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred&& pred) {
-    cv.wait(lk, token, std::forward<Pred>(pred));
-}
-
 template <typename Rep, typename Period>
 bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep, Period>& rel_time) {
     std::condition_variable_any cv;
@@ -35,341 +28,3 @@ bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep,
 }
 
 } // namespace Common
-
-#else
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <functional>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include <thread>
-#include <type_traits>
-#include <utility>
-
-namespace std {
-namespace polyfill {
-
-using stop_state_callback = size_t;
-
-class stop_state {
-public:
-    stop_state() = default;
-    ~stop_state() = default;
-
-    bool request_stop() {
-        unique_lock lk{m_lock};
-
-        if (m_stop_requested) {
-            // Already set, nothing to do.
-            return false;
-        }
-
-        // Mark stop requested.
-        m_stop_requested = true;
-
-        while (!m_callbacks.empty()) {
-            // Get an iterator to the first element.
-            const auto it = m_callbacks.begin();
-
-            // Move the callback function out of the map.
-            function<void()> f;
-            swap(it->second, f);
-
-            // Erase the now-empty map element.
-            m_callbacks.erase(it);
-
-            // Run the callback.
-            if (f) {
-                f();
-            }
-        }
-
-        return true;
-    }
-
-    bool stop_requested() const {
-        unique_lock lk{m_lock};
-        return m_stop_requested;
-    }
-
-    stop_state_callback insert_callback(function<void()> f) {
-        unique_lock lk{m_lock};
-
-        if (m_stop_requested) {
-            // Stop already requested. Don't insert anything,
-            // just run the callback synchronously.
-            if (f) {
-                f();
-            }
-            return 0;
-        }
-
-        // Insert the callback.
-        stop_state_callback ret = ++m_next_callback;
-        m_callbacks.emplace(ret, std::move(f));
-        return ret;
-    }
-
-    void remove_callback(stop_state_callback cb) {
-        unique_lock lk{m_lock};
-        m_callbacks.erase(cb);
-    }
-
-private:
-    mutable recursive_mutex m_lock;
-    map<stop_state_callback, function<void()>> m_callbacks;
-    stop_state_callback m_next_callback{0};
-    bool m_stop_requested{false};
-};
-
-} // namespace polyfill
-
-class stop_token;
-class stop_source;
-struct nostopstate_t {
-    explicit nostopstate_t() = default;
-};
-inline constexpr nostopstate_t nostopstate{};
-
-template <class Callback>
-class stop_callback;
-
-class stop_token {
-public:
-    stop_token() noexcept = default;
-
-    stop_token(const stop_token&) noexcept = default;
-    stop_token(stop_token&&) noexcept = default;
-    stop_token& operator=(const stop_token&) noexcept = default;
-    stop_token& operator=(stop_token&&) noexcept = default;
-    ~stop_token() = default;
-
-    void swap(stop_token& other) noexcept {
-        m_stop_state.swap(other.m_stop_state);
-    }
-
-    [[nodiscard]] bool stop_requested() const noexcept {
-        return m_stop_state && m_stop_state->stop_requested();
-    }
-    [[nodiscard]] bool stop_possible() const noexcept {
-        return m_stop_state != nullptr;
-    }
-
-private:
-    friend class stop_source;
-    template <typename Callback>
-    friend class stop_callback;
-    stop_token(shared_ptr<polyfill::stop_state> stop_state) : m_stop_state(std::move(stop_state)) {}
-
-private:
-    shared_ptr<polyfill::stop_state> m_stop_state;
-};
-
-class stop_source {
-public:
-    stop_source() : m_stop_state(make_shared<polyfill::stop_state>()) {}
-    explicit stop_source(nostopstate_t) noexcept {}
-
-    stop_source(const stop_source&) noexcept = default;
-    stop_source(stop_source&&) noexcept = default;
-    stop_source& operator=(const stop_source&) noexcept = default;
-    stop_source& operator=(stop_source&&) noexcept = default;
-    ~stop_source() = default;
-    void swap(stop_source& other) noexcept {
-        m_stop_state.swap(other.m_stop_state);
-    }
-
-    [[nodiscard]] stop_token get_token() const noexcept {
-        return stop_token(m_stop_state);
-    }
-    [[nodiscard]] bool stop_possible() const noexcept {
-        return m_stop_state != nullptr;
-    }
-    [[nodiscard]] bool stop_requested() const noexcept {
-        return m_stop_state && m_stop_state->stop_requested();
-    }
-    bool request_stop() noexcept {
-        return m_stop_state && m_stop_state->request_stop();
-    }
-
-private:
-    friend class jthread;
-    explicit stop_source(shared_ptr<polyfill::stop_state> stop_state)
-        : m_stop_state(std::move(stop_state)) {}
-
-private:
-    shared_ptr<polyfill::stop_state> m_stop_state;
-};
-
-template <typename Callback>
-class stop_callback {
-    static_assert(is_nothrow_destructible_v<Callback>);
-    static_assert(is_invocable_v<Callback>);
-
-public:
-    using callback_type = Callback;
-
-    template <typename C>
-        requires constructible_from<Callback, C>
-    explicit stop_callback(const stop_token& st,
-                           C&& cb) noexcept(is_nothrow_constructible_v<Callback, C>)
-        : m_stop_state(st.m_stop_state) {
-        if (m_stop_state) {
-            m_callback = m_stop_state->insert_callback(std::move(cb));
-        }
-    }
-    template <typename C>
-        requires constructible_from<Callback, C>
-    explicit stop_callback(stop_token&& st,
-                           C&& cb) noexcept(is_nothrow_constructible_v<Callback, C>)
-        : m_stop_state(std::move(st.m_stop_state)) {
-        if (m_stop_state) {
-            m_callback = m_stop_state->insert_callback(std::move(cb));
-        }
-    }
-    ~stop_callback() {
-        if (m_stop_state && m_callback) {
-            m_stop_state->remove_callback(m_callback);
-        }
-    }
-
-    stop_callback(const stop_callback&) = delete;
-    stop_callback(stop_callback&&) = delete;
-    stop_callback& operator=(const stop_callback&) = delete;
-    stop_callback& operator=(stop_callback&&) = delete;
-
-private:
-    shared_ptr<polyfill::stop_state> m_stop_state;
-    polyfill::stop_state_callback m_callback;
-};
-
-template <typename Callback>
-stop_callback(stop_token, Callback) -> stop_callback<Callback>;
-
-class jthread {
-public:
-    using id = thread::id;
-    using native_handle_type = thread::native_handle_type;
-
-    jthread() noexcept = default;
-
-    template <typename F, typename... Args,
-              typename = enable_if_t<!is_same_v<remove_cvref_t<F>, jthread>>>
-    explicit jthread(F&& f, Args&&... args)
-        : m_stop_state(make_shared<polyfill::stop_state>()),
-          m_thread(make_thread(std::forward<F>(f), std::forward<Args>(args)...)) {}
-
-    ~jthread() {
-        if (joinable()) {
-            request_stop();
-            join();
-        }
-    }
-
-    jthread(const jthread&) = delete;
-    jthread(jthread&&) noexcept = default;
-    jthread& operator=(const jthread&) = delete;
-
-    jthread& operator=(jthread&& other) noexcept {
-        m_thread.swap(other.m_thread);
-        m_stop_state.swap(other.m_stop_state);
-        return *this;
-    }
-
-    void swap(jthread& other) noexcept {
-        m_thread.swap(other.m_thread);
-        m_stop_state.swap(other.m_stop_state);
-    }
-    [[nodiscard]] bool joinable() const noexcept {
-        return m_thread.joinable();
-    }
-    void join() {
-        m_thread.join();
-    }
-    void detach() {
-        m_thread.detach();
-        m_stop_state.reset();
-    }
-
-    [[nodiscard]] id get_id() const noexcept {
-        return m_thread.get_id();
-    }
-    [[nodiscard]] native_handle_type native_handle() {
-        return m_thread.native_handle();
-    }
-    [[nodiscard]] stop_source get_stop_source() noexcept {
-        return stop_source(m_stop_state);
-    }
-    [[nodiscard]] stop_token get_stop_token() const noexcept {
-        return stop_source(m_stop_state).get_token();
-    }
-    bool request_stop() noexcept {
-        return get_stop_source().request_stop();
-    }
-    [[nodiscard]] static unsigned int hardware_concurrency() noexcept {
-        return thread::hardware_concurrency();
-    }
-
-private:
-    template <typename F, typename... Args>
-    thread make_thread(F&& f, Args&&... args) {
-        if constexpr (is_invocable_v<decay_t<F>, stop_token, decay_t<Args>...>) {
-            return thread(std::forward<F>(f), get_stop_token(), std::forward<Args>(args)...);
-        } else {
-            return thread(std::forward<F>(f), std::forward<Args>(args)...);
-        }
-    }
-
-    shared_ptr<polyfill::stop_state> m_stop_state;
-    thread m_thread;
-};
-
-} // namespace std
-
-namespace Common {
-
-template <typename Condvar, typename Lock, typename Pred>
-void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred pred) {
-    if (token.stop_requested()) {
-        return;
-    }
-
-    std::stop_callback callback(token, [&] {
-        { std::scoped_lock lk2{*lk.mutex()}; }
-        cv.notify_all();
-    });
-
-    cv.wait(lk, [&] { return pred() || token.stop_requested(); });
-}
-
-template <typename Rep, typename Period>
-bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep, Period>& rel_time) {
-    if (token.stop_requested()) {
-        return false;
-    }
-
-    bool stop_requested = false;
-    std::condition_variable cv;
-    std::mutex m;
-
-    std::stop_callback cb(token, [&] {
-        // Wake up the waiting thread.
-        {
-            std::scoped_lock lk{m};
-            stop_requested = true;
-        }
-        cv.notify_one();
-    });
-
-    // Perform the timed wait.
-    std::unique_lock lk{m};
-    return !cv.wait_for(lk, rel_time, [&] { return stop_requested; });
-}
-
-} // namespace Common
-
-#endif

src/common/scm_rev.cpp.in

@@ -18,6 +18,9 @@
 #define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
 #define IS_DEV_BUILD @IS_DEV_BUILD@
 #define COMPILER_ID "@CXX_COMPILER@"
+#define BUILD_AUTO_UPDATE_WEBISTE "@BUILD_AUTO_UPDATE_WEBISTE@"
+#define BUILD_AUTO_UPDATE_API "@BUILD_AUTO_UPDATE_API@"
+#define BUILD_AUTO_UPDATE_REPO "@BUILD_AUTO_UPDATE_REPO@"
 
 namespace Common {
 
@@ -34,4 +37,8 @@ constexpr const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;
 constexpr const char g_compiler_id[] = COMPILER_ID;
 constexpr const bool g_is_dev_build = IS_DEV_BUILD;
 
+constexpr const char g_build_auto_update_website[] = BUILD_AUTO_UPDATE_WEBISTE;
+constexpr const char g_build_auto_update_api[] = BUILD_AUTO_UPDATE_API;
+constexpr const char g_build_auto_update_repo[] = BUILD_AUTO_UPDATE_REPO;
+
 } // namespace Common

src/common/scm_rev.h

@@ -21,5 +21,8 @@ extern const char g_title_bar_format_running[];
 extern const char g_shader_cache_version[];
 extern const char g_compiler_id[];
 extern const bool g_is_dev_build;
+extern const char g_build_auto_update_website[];
+extern const char g_build_auto_update_api[];
+extern const char g_build_auto_update_repo[];
 
 } // namespace Common

src/common/thread.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -80,7 +83,7 @@ public:
             condvar.notify_all();
             return true;
         } else {
-            CondvarWait(condvar, lk, token,
+            condvar.wait(lk, token,
                         [this, current_generation] { return current_generation != generation; });
             return !token.stop_requested();
         }

src/common/thread_worker.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -47,8 +50,8 @@ public:
                         if (requests.empty()) {
                             wait_condition.notify_all();
                         }
-                        Common::CondvarWait(condition, lock, stop_token,
-                                            [this] { return !requests.empty(); });
+                        condition.wait(lock, stop_token,
+                                       [this] { return !requests.empty(); });
                         if (stop_token.stop_requested()) {
                             break;
                         }

src/common/threadsafe_queue.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2010 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -99,7 +102,11 @@ public:
     T PopWait(std::stop_token stop_token) {
         if (Empty()) {
             std::unique_lock lock{cv_mutex};
-            Common::CondvarWait(cv, lock, stop_token, [this] { return !Empty(); });
+            if constexpr (with_stop_token) {
+                cv.wait(lock, stop_token, [this] { return !Empty(); });
+            } else {
+                cv.wait(lock, [this] { return !Empty(); });
+            }
         }
         if (stop_token.stop_requested()) {
             return T{};

src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp

@@ -188,6 +188,8 @@ HostFeature GetHostFeatures() {
         features |= HostFeature::LZCNT;
     if (cpu_info.has(Cpu::tGFNI))
         features |= HostFeature::GFNI;
+    if (cpu_info.has(Cpu::tWAITPKG))
+        features |= HostFeature::WAITPKG;
 
     if (cpu_info.has(Cpu::tBMI2)) {
         // BMI2 instructions such as pdep and pext have been very slow up until Zen 3.

src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.cpp.inc

@@ -430,10 +430,11 @@ void AxxEmitX64::EmitExclusiveWriteMemoryInline(AxxEmitContext& ctx, IR::Inst* i
     const Xbyak::Reg64 vaddr = ctx.reg_alloc.UseGpr(args[1]);
     const Xbyak::Reg32 status = ctx.reg_alloc.ScratchGpr().cvt32();
     const Xbyak::Reg64 tmp = ctx.reg_alloc.ScratchGpr();
+    const Xbyak::Reg64 tmp2 = ctx.reg_alloc.ScratchGpr();
 
     const auto wrapped_fn = exclusive_write_fallbacks[std::make_tuple(ordered, bitsize, vaddr.getIdx(), value.getIdx())];
 
-    EmitExclusiveLock(code, conf, tmp, eax);
+    EmitExclusiveLock(code, conf, tmp, tmp2);
 
     SharedLabel end = GenSharedLabel();
 

src/dynarmic/src/dynarmic/backend/x64/emit_x64_memory.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 /* This file is part of the dynarmic project.
  * Copyright (c) 2022 MerryMage
  * SPDX-License-Identifier: 0BSD
@@ -343,7 +346,7 @@ void EmitExclusiveLock(BlockOfCode& code, const UserConfig& conf, Xbyak::Reg64 p
     }
 
     code.mov(pointer, mcl::bit_cast<u64>(GetExclusiveMonitorLockPointer(conf.global_monitor)));
-    EmitSpinLockLock(code, pointer, tmp);
+    EmitSpinLockLock(code, pointer, tmp, code.HasHostFeature(HostFeature::WAITPKG));
 }
 
 template<typename UserConfig>

src/dynarmic/src/dynarmic/backend/x64/host_feature.h

@@ -35,9 +35,10 @@ enum class HostFeature : u64 {
     BMI2 = 1ULL << 19,
     LZCNT = 1ULL << 20,
     GFNI = 1ULL << 21,
+    WAITPKG = 1ULL << 22,
 
     // Zen-based BMI2
-    FastBMI2 = 1ULL << 22,
+    FastBMI2 = 1ULL << 23,
 
     // Orthographic AVX512 features on 128 and 256 vectors
     AVX512_Ortho = AVX512F | AVX512VL,

src/dynarmic/src/dynarmic/common/spin_lock_x64.cpp

@@ -22,17 +22,46 @@ static const auto default_cg_mode = nullptr; //Allow RWE
 
 namespace Dynarmic {
 
-void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp) {
+void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp, bool waitpkg) {
+    // TODO: this is because we lack regalloc - so better to be safe :(
+    if (waitpkg) {
+        code.push(Xbyak::util::eax);
+        code.push(Xbyak::util::ebx);
+        code.push(Xbyak::util::edx);
+    }
     Xbyak::Label start, loop;
-
     code.jmp(start, code.T_NEAR);
     code.L(loop);
-    code.pause();
+    if (waitpkg) {
+        // TODO: This clobbers EAX and EDX did we tell the regalloc?
+        // ARM ptr for address-monitoring
+        code.umonitor(ptr);
+        // tmp.bit[0] = 0: C0.1 | Slow Wakup | Better Savings
+        // tmp.bit[0] = 1: C0.2 | Fast Wakup | Lesser Savings
+        // edx:eax is implicitly used as a 64-bit deadline timestamp
+        // Use the maximum so that we use the operating system's maximum
+        // allowed wait time within the IA32_UMWAIT_CONTROL register
+        // Enter power state designated by tmp and wait for a write to lock_ptr
+        code.mov(Xbyak::util::eax, 0xFFFFFFFF);
+        code.mov(Xbyak::util::edx, Xbyak::util::eax);
+        // TODO: We can only be here because tmp is 1 already - however we repeatedly overwrite it...
+        code.mov(Xbyak::util::ebx, 1);
+        code.umwait(Xbyak::util::ebx);
+        // CF == 1 if we hit the OS-timeout in IA32_UMWAIT_CONTROL without a write
+        // CF == 0 if we exited the wait for any other reason
+    } else {
+        code.pause();
+    }
     code.L(start);
     code.mov(tmp, 1);
     /*code.lock();*/ code.xchg(code.dword[ptr], tmp);
     code.test(tmp, tmp);
     code.jnz(loop, code.T_NEAR);
+    if (waitpkg) {
+        code.pop(Xbyak::util::edx);
+        code.pop(Xbyak::util::ebx);
+        code.pop(Xbyak::util::eax);
+    }
 }
 
 void EmitSpinLockUnlock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp) {
@@ -60,7 +89,7 @@ void SpinLockImpl::Initialize() {
 
     code.align();
     lock = code.getCurr<void (*)(volatile int*)>();
-    EmitSpinLockLock(code, ABI_PARAM1, code.eax);
+    EmitSpinLockLock(code, ABI_PARAM1, code.eax, false);
     code.ret();
 
     code.align();

src/dynarmic/src/dynarmic/common/spin_lock_x64.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 /* This file is part of the dynarmic project.
  * Copyright (c) 2022 MerryMage
  * SPDX-License-Identifier: 0BSD
@@ -9,7 +12,7 @@
 
 namespace Dynarmic {
 
-void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp);
+void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp, bool waitpkg);
 void EmitSpinLockUnlock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp);
 
 }  // namespace Dynarmic

src/video_core/cdma_pusher.cpp

@@ -39,8 +39,8 @@ void CDmaPusher::ProcessEntries(std::stop_token stop_token) {
     while (!stop_token.stop_requested()) {
         {
             std::unique_lock l{command_mutex};
-            Common::CondvarWait(command_cv, l, stop_token,
-                                [this]() { return command_lists.size() > 0; });
+            command_cv.wait(l, stop_token,
+                            [this]() { return command_lists.size() > 0; });
             if (stop_token.stop_requested()) {
                 return;
             }

src/video_core/gpu_thread.cpp

@@ -116,7 +116,7 @@ u64 ThreadManager::PushCommand(CommandData&& command_data, bool block) {
     state.queue.EmplaceWait(std::move(command_data), fence, block);
 
     if (block) {
-        Common::CondvarWait(state.cv, lk, thread.get_stop_token(), [this, fence] {
+        state.cv.wait(lk, thread.get_stop_token(), [this, fence] {
             return fence <= state.signaled_fence.load(std::memory_order_relaxed);
         });
     }

src/video_core/renderer_vulkan/vk_master_semaphore.cpp

@@ -208,7 +208,7 @@ void MasterSemaphore::WaitThread(std::stop_token token) {
         vk::Fence fence;
         {
             std::unique_lock lock{wait_mutex};
-            Common::CondvarWait(wait_cv, lock, token, [this] { return !wait_queue.empty(); });
+            wait_cv.wait(lock, token, [this] { return !wait_queue.empty(); });
             if (token.stop_requested()) {
                 return;
             }

src/video_core/renderer_vulkan/vk_present_manager.cpp

@@ -279,7 +279,7 @@ void PresentManager::PresentThread(std::stop_token token) {
         std::unique_lock lock{queue_mutex};
 
         // Wait for presentation frames
-        Common::CondvarWait(frame_cv, lock, token, [this] { return !present_queue.empty(); });
+        frame_cv.wait(lock, token, [this] { return !present_queue.empty(); });
         if (token.stop_requested()) {
             return;
         }

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -166,7 +166,7 @@ void Scheduler::WorkerThread(std::stop_token stop_token) {
             std::unique_lock lk{queue_mutex};
 
             // Wait for work.
-            Common::CondvarWait(event_cv, lk, stop_token, [&] { return TryPopQueue(work); });
+            event_cv.wait(lk, stop_token, [&] { return TryPopQueue(work); });
 
             // If we've been asked to stop, we're done.
             if (stop_token.stop_requested()) {

src/video_core/renderer_vulkan/vk_turbo_mode.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -224,7 +227,7 @@ void TurboMode::Run(std::stop_token stop_token) {
 #endif
         // Wait for the next graphics queue submission if necessary.
         std::unique_lock lk{m_submission_lock};
-        Common::CondvarWait(m_submission_cv, lk, stop_token, [this] {
+        m_submission_cv.wait(lk, stop_token, [this] {
             return (std::chrono::steady_clock::now() - m_submission_time) <=
                    std::chrono::milliseconds{100};
         });

src/yuzu/about_dialog.cpp

@@ -14,11 +14,12 @@ AboutDialog::AboutDialog(QWidget* parent)
     : QDialog(parent)
     , ui{std::make_unique<Ui::AboutDialog>()}
 {
-    static const std::string description = std::string{Common::g_build_version};
     static const std::string build_id = std::string{Common::g_build_id};
-    static const std::string compiler = std::string{Common::g_compiler_id};
-
-    static const std::string yuzu_build = fmt::format("Eden | {} | {}", description, compiler);
+    static const std::string yuzu_build = fmt::format("{} | {} | {}",
+        std::string{Common::g_build_name},
+        std::string{Common::g_build_version},
+        std::string{Common::g_compiler_id}
+    );
 
     const auto override_build = fmt::format(fmt::runtime(
                                                 std::string(Common::g_title_bar_format_idle)),

src/yuzu/bootmanager.cpp

@@ -108,13 +108,13 @@ void EmuThread::run() {
             m_system.Run();
             m_stopped.Reset();
 
-            Common::CondvarWait(m_should_run_cv, lk, stop_token, [&] { return !m_should_run; });
+            m_should_run_cv.wait(lk, stop_token, [&] { return !m_should_run; });
         } else {
             m_system.Pause();
             m_stopped.Set();
 
             EmulationPaused(lk);
-            Common::CondvarWait(m_should_run_cv, lk, stop_token, [&] { return m_should_run; });
+            m_should_run_cv.wait(lk, stop_token, [&] { return m_should_run; });
             EmulationResumed(lk);
         }
     }

src/yuzu/main.cpp

@@ -4192,23 +4192,25 @@ void GMainWindow::OnEmulatorUpdateAvailable() {
     update_prompt.addButton(QMessageBox::Yes);
     update_prompt.addButton(QMessageBox::Ignore);
     update_prompt.setText(
-        tr("Update %1 for Eden is available.\nWould you like to download it?").arg(version_string));
+        tr("Download the %1 update?").arg(version_string));
     update_prompt.exec();
     if (update_prompt.button(QMessageBox::Yes) == update_prompt.clickedButton()) {
-        QDesktopServices::openUrl(
-            QUrl(QString::fromStdString("https://github.com/eden-emulator/Releases/releases/tag/") +
-                 version_string));
+        auto const full_url = fmt::format("{}/{}/releases/tag/",
+            std::string{Common::g_build_auto_update_website},
+            std::string{Common::g_build_auto_update_repo}
+        );
+        QDesktopServices::openUrl(QUrl(QString::fromStdString(full_url) + version_string));
     }
 }
 #endif
 
 void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_view title_version,
                                     std::string_view gpu_vendor) {
-    static const std::string description = std::string{Common::g_build_version};
-    static const std::string build_id = std::string{Common::g_build_id};
-    static const std::string compiler = std::string{Common::g_compiler_id};
-
-    static const std::string yuzu_title = fmt::format("Eden | {} | {}", description, compiler);
+    static const std::string yuzu_title = fmt::format("{} | {} | {}",
+        std::string{Common::g_build_name},
+        std::string{Common::g_build_version},
+        std::string{Common::g_compiler_id}
+    );
 
     const auto override_title =
         fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);

src/yuzu/update_checker.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
@@ -12,6 +15,7 @@
 #include <nlohmann/json.hpp>
 #include <optional>
 #include <string>
+#include "common/scm_rev.h"
 
 std::optional<std::string> UpdateChecker::GetResponse(std::string url, std::string path)
 {
@@ -54,8 +58,8 @@ std::optional<std::string> UpdateChecker::GetResponse(std::string url, std::stri
 
 std::optional<std::string> UpdateChecker::GetLatestRelease(bool include_prereleases)
 {
-    constexpr auto update_check_url = "http://api.github.com";
-    std::string update_check_path = "/repos/eden-emulator/Releases";
+    constexpr auto update_check_url = std::string{Common::g_build_auto_update_api};
+    std::string update_check_path = fmt::format("/repos/{}", std::string{Common::g_build_auto_update_repo});
     try {
         if (include_prereleases) { // This can return either a prerelease or a stable release,
             // whichever is more recent.

src/yuzu_cmd/emu_window/emu_window_sdl2.cpp

@@ -229,7 +229,7 @@ void EmuWindow_SDL2::WaitEvent() {
     const u32 current_time = SDL_GetTicks();
     if (current_time > last_time + 2000) {
         const auto results = system.GetAndResetPerfStats();
-        const auto title = fmt::format("Eden {} | {}-{} | FPS: {:.0f} ({:.0f}%)",
+        const auto title = fmt::format("{} | {}-{} | FPS: {:.0f} ({:.0f}%)",
                                        Common::g_build_fullname,
                                        Common::g_scm_branch,
                                        Common::g_scm_desc,

src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -90,7 +93,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     }
     SDL_GL_SetSwapInterval(0);
 
-    std::string window_title = fmt::format("Eden {} | {}-{}", Common::g_build_fullname,
+    std::string window_title = fmt::format("{} | {}-{}", Common::g_build_fullname,
                                            Common::g_scm_branch, Common::g_scm_desc);
     render_window =
         SDL_CreateWindow(window_title.c_str(),
@@ -138,7 +141,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     OnResize();
     OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
     SDL_PumpEvents();
-    LOG_INFO(Frontend, "Eden Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
+    LOG_INFO(Frontend, "Build string: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
              Common::g_scm_desc);
     Settings::LogSettings();
 }