From 6527c0d2fc87fe74f1ae3e03a8dfdf2668c2c48c Mon Sep 17 00:00:00 2001 From: Merry Date: Sat, 27 Jan 2024 21:11:48 +0000 Subject: [PATCH 1/3] atomic_ops: Reduce code duplication with templates Also fixes builds on unusual toolchains where: - u32 is unsigned int - u64 is unsigned long long - uintptr_t is unsigned long --- src/common/atomic_ops.h | 71 +++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/src/common/atomic_ops.h b/src/common/atomic_ops.h index c18bb33c4a..c809e69639 100644 --- a/src/common/atomic_ops.h +++ b/src/common/atomic_ops.h @@ -15,25 +15,34 @@ namespace Common { #if _MSC_VER -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected) { +template +[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected); +template +[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected, T& actual); + +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, + u8 expected) { const u8 result = _InterlockedCompareExchange8(reinterpret_cast(pointer), value, expected); return result == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, + u16 expected) { const u16 result = _InterlockedCompareExchange16(reinterpret_cast(pointer), value, expected); return result == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, + u32 expected) { const u32 result = _InterlockedCompareExchange(reinterpret_cast(pointer), value, expected); return result == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, + u64 expected) { const u64 result = _InterlockedCompareExchange64(reinterpret_cast(pointer), value, expected); return result == expected; @@ -45,29 +54,29 @@ namespace Common { reinterpret_cast<__int64*>(expected.data())) != 0; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected, - u8& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, + u8 expected, u8& actual) { actual = _InterlockedCompareExchange8(reinterpret_cast(pointer), value, expected); return actual == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected, - u16& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, + u16 expected, u16& actual) { actual = _InterlockedCompareExchange16(reinterpret_cast(pointer), value, expected); return actual == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected, - u32& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, + u32 expected, u32& actual) { actual = _InterlockedCompareExchange(reinterpret_cast(pointer), value, expected); return actual == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected, - u64& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, + u64 expected, u64& actual) { actual = _InterlockedCompareExchange64(reinterpret_cast(pointer), value, expected); return actual == expected; @@ -91,19 +100,8 @@ namespace Common { #else -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected) { - return __sync_bool_compare_and_swap(pointer, expected, value); -} - -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected) { - return __sync_bool_compare_and_swap(pointer, expected, value); -} - -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected) { - return __sync_bool_compare_and_swap(pointer, expected, value); -} - -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected) { +template +[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected) { return __sync_bool_compare_and_swap(pointer, expected, value); } @@ -115,26 +113,9 @@ namespace Common { return __sync_bool_compare_and_swap((unsigned __int128*)pointer, expected_a, value_a); } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, u8 expected, - u8& actual) { - actual = __sync_val_compare_and_swap(pointer, expected, value); - return actual == expected; -} - -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, u16 expected, - u16& actual) { - actual = __sync_val_compare_and_swap(pointer, expected, value); - return actual == expected; -} - -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, u32 expected, - u32& actual) { - actual = __sync_val_compare_and_swap(pointer, expected, value); - return actual == expected; -} - -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, u64 expected, - u64& actual) { +template +[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected, + T& actual) { actual = __sync_val_compare_and_swap(pointer, expected, value); return actual == expected; } From 9f91d310c6a79bb0f5f681e931edf29158895311 Mon Sep 17 00:00:00 2001 From: Merry Date: Sat, 27 Jan 2024 21:36:39 +0000 Subject: [PATCH 2/3] atomic_ops: Remove volatile qualifier --- src/common/atomic_ops.h | 40 +++++++++++++++++++--------------------- src/core/memory.cpp | 6 ++---- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/common/atomic_ops.h b/src/common/atomic_ops.h index c809e69639..885fe3c4e1 100644 --- a/src/common/atomic_ops.h +++ b/src/common/atomic_ops.h @@ -16,32 +16,31 @@ namespace Common { #if _MSC_VER template -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected); +[[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected); template -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected, T& actual); +[[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected, T& actual); -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, - u8 expected) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(u8* pointer, u8 value, u8 expected) { const u8 result = _InterlockedCompareExchange8(reinterpret_cast(pointer), value, expected); return result == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, +template [[nodiscard]] inline bool AtomicCompareAndSwap(u16* pointer, u16 value, u16 expected) { const u16 result = _InterlockedCompareExchange16(reinterpret_cast(pointer), value, expected); return result == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, +template [[nodiscard]] inline bool AtomicCompareAndSwap(u32* pointer, u32 value, u32 expected) { const u32 result = _InterlockedCompareExchange(reinterpret_cast(pointer), value, expected); return result == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, +template [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 value, u64 expected) { const u64 result = _InterlockedCompareExchange64(reinterpret_cast(pointer), value, expected); @@ -54,29 +53,29 @@ template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* point reinterpret_cast<__int64*>(expected.data())) != 0; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u8* pointer, u8 value, - u8 expected, u8& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(u8* pointer, u8 value, u8 expected, + u8& actual) { actual = _InterlockedCompareExchange8(reinterpret_cast(pointer), value, expected); return actual == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u16* pointer, u16 value, - u16 expected, u16& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(u16* pointer, u16 value, u16 expected, + u16& actual) { actual = _InterlockedCompareExchange16(reinterpret_cast(pointer), value, expected); return actual == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u32* pointer, u32 value, - u32 expected, u32& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(u32* pointer, u32 value, u32 expected, + u32& actual) { actual = _InterlockedCompareExchange(reinterpret_cast(pointer), value, expected); return actual == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u64 value, - u64 expected, u64& actual) { +template [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 value, u64 expected, + u64& actual) { actual = _InterlockedCompareExchange64(reinterpret_cast(pointer), value, expected); return actual == expected; @@ -101,11 +100,11 @@ template [[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* point #else template -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected) { +[[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected) { return __sync_bool_compare_and_swap(pointer, expected, value); } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected) { +[[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u128 value, u128 expected) { unsigned __int128 value_a; unsigned __int128 expected_a; std::memcpy(&value_a, value.data(), sizeof(u128)); @@ -114,13 +113,12 @@ template } template -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile T* pointer, T value, T expected, - T& actual) { +[[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected, T& actual) { actual = __sync_val_compare_and_swap(pointer, expected, value); return actual == expected; } -[[nodiscard]] inline bool AtomicCompareAndSwap(volatile u64* pointer, u128 value, u128 expected, +[[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u128 value, u128 expected, u128& actual) { unsigned __int128 value_a; unsigned __int128 expected_a; @@ -132,7 +130,7 @@ template return actual_a == expected_a; } -[[nodiscard]] inline u128 AtomicLoad128(volatile u64* pointer) { +[[nodiscard]] inline u128 AtomicLoad128(u64* pointer) { unsigned __int128 zeros_a = 0; unsigned __int128 result_a = __sync_val_compare_and_swap((unsigned __int128*)pointer, zeros_a, zeros_a); diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 1c218566fd..e10a4601ef 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -781,8 +781,7 @@ struct Memory::Impl { }, [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(T)); }); if (ptr) { - const auto volatile_pointer = reinterpret_cast(ptr); - return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); + return Common::AtomicCompareAndSwap(reinterpret_cast(ptr), data, expected); } return true; } @@ -796,8 +795,7 @@ struct Memory::Impl { }, [&]() { HandleRasterizerWrite(GetInteger(vaddr), sizeof(u128)); }); if (ptr) { - const auto volatile_pointer = reinterpret_cast(ptr); - return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); + return Common::AtomicCompareAndSwap(reinterpret_cast(ptr), data, expected); } return true; } From 5a20d07c21b74181b88d76fda16fd83a4718ec49 Mon Sep 17 00:00:00 2001 From: Merry Date: Sat, 27 Jan 2024 21:42:16 +0000 Subject: [PATCH 3/3] atomic_ops: Fix MSVC --- src/common/atomic_ops.h | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/common/atomic_ops.h b/src/common/atomic_ops.h index 885fe3c4e1..9bf6f2f81c 100644 --- a/src/common/atomic_ops.h +++ b/src/common/atomic_ops.h @@ -20,28 +20,29 @@ template template [[nodiscard]] inline bool AtomicCompareAndSwap(T* pointer, T value, T expected, T& actual); -template [[nodiscard]] inline bool AtomicCompareAndSwap(u8* pointer, u8 value, u8 expected) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u8* pointer, u8 value, u8 expected) { const u8 result = _InterlockedCompareExchange8(reinterpret_cast(pointer), value, expected); return result == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u16* pointer, u16 value, - u16 expected) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u16* pointer, u16 value, u16 expected) { const u16 result = _InterlockedCompareExchange16(reinterpret_cast(pointer), value, expected); return result == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u32* pointer, u32 value, - u32 expected) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u32* pointer, u32 value, u32 expected) { const u32 result = _InterlockedCompareExchange(reinterpret_cast(pointer), value, expected); return result == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 value, - u64 expected) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 value, u64 expected) { const u64 result = _InterlockedCompareExchange64(reinterpret_cast(pointer), value, expected); return result == expected; @@ -53,29 +54,32 @@ template [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 v reinterpret_cast<__int64*>(expected.data())) != 0; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u8* pointer, u8 value, u8 expected, - u8& actual) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u8* pointer, u8 value, u8 expected, u8& actual) { actual = _InterlockedCompareExchange8(reinterpret_cast(pointer), value, expected); return actual == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u16* pointer, u16 value, u16 expected, - u16& actual) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u16* pointer, u16 value, u16 expected, + u16& actual) { actual = _InterlockedCompareExchange16(reinterpret_cast(pointer), value, expected); return actual == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u32* pointer, u32 value, u32 expected, - u32& actual) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u32* pointer, u32 value, u32 expected, + u32& actual) { actual = _InterlockedCompareExchange(reinterpret_cast(pointer), value, expected); return actual == expected; } -template [[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 value, u64 expected, - u64& actual) { +template <> +[[nodiscard]] inline bool AtomicCompareAndSwap(u64* pointer, u64 value, u64 expected, + u64& actual) { actual = _InterlockedCompareExchange64(reinterpret_cast(pointer), value, expected); return actual == expected;