mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 18:40:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial support for HLE in internal API

Browse Source 
atomic_storage<>: add compare_exchange_hle_acq and fetch_add_hle_rel
shared_mutex: add methods (un)lock_hle and (un)lock_shared_hle
Clang: 👅
This commit is contained in:
Nekotekina 2019-01-29 03:29:31 +03:00
parent 58358e85dd
commit f50d9cc136
2 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Utilities/Atomic.h
View File

@ -12,11 +12,26 @@ struct atomic_storage
/* First part: Non-MSVC intrinsics */ /* First part: Non-MSVC intrinsics */
#ifndef _MSC_VER #ifndef _MSC_VER
#if defined(__ATOMIC_HLE_ACQUIRE) && defined(__ATOMIC_HLE_RELEASE)
static constexpr int s_hle_ack = __ATOMIC_SEQ_CST | __ATOMIC_HLE_ACQUIRE;
static constexpr int s_hle_rel = __ATOMIC_SEQ_CST | __ATOMIC_HLE_RELEASE;
#else
static constexpr int s_hle_ack = __ATOMIC_SEQ_CST;
static constexpr int s_hle_rel = __ATOMIC_SEQ_CST;
#endif
static inline bool compare_exchange(T& dest, T& comp, T exch) static inline bool compare_exchange(T& dest, T& comp, T exch)
{ {
return __atomic_compare_exchange(&dest, &comp, &exch, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return __atomic_compare_exchange(&dest, &comp, &exch, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
} }
static inline bool compare_exchange_hle_acq(T& dest, T& comp, T exch)
{
static_assert(sizeof(T) == 4 || sizeof(T) == 8);
return __atomic_compare_exchange(&dest, &comp, &exch, false, s_hle_ack, s_hle_ack);
}
static inline T load(const T& dest) static inline T load(const T& dest)
{ {
T result; T result;
@ -46,6 +61,12 @@ struct atomic_storage
return __atomic_fetch_add(&dest, value, __ATOMIC_SEQ_CST); return __atomic_fetch_add(&dest, value, __ATOMIC_SEQ_CST);
} }
static inline T fetch_add_hle_rel(T& dest, T value)
{
static_assert(sizeof(T) == 4 || sizeof(T) == 8);
return __atomic_fetch_add(&dest, value, s_hle_rel);
}
static inline T add_fetch(T& dest, T value) static inline T add_fetch(T& dest, T value)
{ {
return __atomic_add_fetch(&dest, value, __ATOMIC_SEQ_CST); return __atomic_add_fetch(&dest, value, __ATOMIC_SEQ_CST);
@ -353,6 +374,14 @@ struct atomic_storage<T, 4> : atomic_storage<T, 0>
return r == v; return r == v;
} }
static inline bool compare_exchange_hle_acq(T& dest, T& comp, T exch)
{
long v = *(long*)&comp;
long r = _InterlockedCompareExchange_HLEAcquire((volatile long*)&dest, (long&)exch, v);
comp = (T&)r;
return r == v;
}
static inline T load(const T& dest) static inline T load(const T& dest)
{ {
long value = *(const volatile long*)&dest; long value = *(const volatile long*)&dest;
@ -383,6 +412,12 @@ struct atomic_storage<T, 4> : atomic_storage<T, 0>
return (T&)r; return (T&)r;
} }
static inline T fetch_add_hle_rel(T& dest, T value)
{
long r = _InterlockedExchangeAdd_HLERelease((volatile long*)&dest, (long&)value);
return (T&)r;
}
static inline T fetch_and(T& dest, T value) static inline T fetch_and(T& dest, T value)
{ {
long r = _InterlockedAnd((volatile long*)&dest, (long&)value); long r = _InterlockedAnd((volatile long*)&dest, (long&)value);
@ -458,6 +493,14 @@ struct atomic_storage<T, 8> : atomic_storage<T, 0>
return r == v; return r == v;
} }
static inline bool compare_exchange_hle_acq(T& dest, T& comp, T exch)
{
llong v = *(llong*)&comp;
llong r = _InterlockedCompareExchange64_HLEAcquire((volatile llong*)&dest, (llong&)exch, v);
comp = (T&)r;
return r == v;
}
static inline T load(const T& dest) static inline T load(const T& dest)
{ {
llong value = *(const volatile llong*)&dest; llong value = *(const volatile llong*)&dest;
@ -488,6 +531,12 @@ struct atomic_storage<T, 8> : atomic_storage<T, 0>
return (T&)r; return (T&)r;
} }
static inline T fetch_add_hle_rel(T& dest, T value)
{
llong r = _InterlockedExchangeAdd64_HLERelease((volatile llong*)&dest, (llong&)value);
return (T&)r;
}
static inline T fetch_and(T& dest, T value) static inline T fetch_and(T& dest, T value)
{ {
llong r = _InterlockedAnd64((volatile llong*)&dest, (llong&)value); llong r = _InterlockedAnd64((volatile llong*)&dest, (llong&)value);

46
Utilities/mutex.h
View File

@ -46,6 +46,22 @@ public:
} }
} }
void lock_shared_hle()
{
const u32 value = m_value.load();
if (LIKELY(value < c_one - 1))
{
u32 old = value;
if (LIKELY(atomic_storage<u32>::compare_exchange_hle_acq(m_value.raw(), old, value + 1)))
{
return;
}
}
imp_lock_shared(value);
}
void unlock_shared() void unlock_shared()
{ {
// Unconditional decrement (can result in broken state) // Unconditional decrement (can result in broken state)
@ -57,6 +73,16 @@ public:
} }
} }
void unlock_shared_hle()
{
const u32 value = atomic_storage<u32>::fetch_add_hle_rel(m_value.raw(), -1);
if (UNLIKELY(value >= c_one))
{
imp_unlock_shared(value);
}
}
bool try_lock() bool try_lock()
{ {
return m_value.compare_and_swap_test(0, c_one); return m_value.compare_and_swap_test(0, c_one);
@ -72,6 +98,16 @@ public:
} }
} }
void lock_hle()
{
u32 value = 0;
if (UNLIKELY(!atomic_storage<u32>::compare_exchange_hle_acq(m_value.raw(), value, c_one)))
{
imp_lock(value);
}
}
void unlock() void unlock()
{ {
// Unconditional decrement (can result in broken state) // Unconditional decrement (can result in broken state)
@ -83,6 +119,16 @@ public:
} }
} }
void unlock_hle()
{
const u32 value = atomic_storage<u32>::fetch_add_hle_rel(m_value.raw(), -c_one);
if (UNLIKELY(value != c_one))
{
imp_unlock(value);
}
}
bool try_lock_upgrade() bool try_lock_upgrade()
{ {
const u32 value = m_value.load(); const u32 value = m_value.load();