AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simple_mtx: Replace GCC sync intrinsics with u_atomic ops

Browse Source 
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17529>
This commit is contained in:
Jesse Natalie
2022-07-08 11:16:14 -07:00
committed by Marge Bot
parent 4845bc7072
commit 13e73e39cc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/simple_mtx.h
+5 -4
View File
@@ -26,6 +26,7 @@
#include "util/futex.h"
#include "util/macros.h"
#include "u_atomic.h"
#include "c11/threads.h"
@@ -95,16 +96,16 @@ simple_mtx_lock(simple_mtx_t *mtx)
{
uint32_t c;
c = __sync_val_compare_and_swap(&mtx->val, 0, 1);
c = p_atomic_cmpxchg(&mtx->val, 0, 1);
assert(c != _SIMPLE_MTX_INVALID_VALUE);
if (__builtin_expect(c != 0, 0)) {
if (c != 2)
c = __sync_lock_test_and_set(&mtx->val, 2);
c = p_atomic_xchg(&mtx->val, 2);
while (c != 0) {
futex_wait(&mtx->val, 2, NULL);
c = __sync_lock_test_and_set(&mtx->val, 2);
c = p_atomic_xchg(&mtx->val, 2);
}
}
@@ -118,7 +119,7 @@ simple_mtx_unlock(simple_mtx_t *mtx)
HG(ANNOTATE_RWLOCK_RELEASED(mtx, 1));
c = __sync_fetch_and_sub(&mtx->val, 1);
c = p_atomic_fetch_add(&mtx->val, -1);
assert(c != _SIMPLE_MTX_INVALID_VALUE);