maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

tsan: do not allocate sync vars on relaxed atomic operations 

helps to reduce memory consumption if an atomic is used only with relaxed ops (stats)

llvm-svn: 177381
This commit is contained in:
Dmitry Vyukov 2013-03-19 09:15:31 +00:00
parent 227eb6fc5f
commit b59fa875ad
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cc
View File

@ -290,16 +290,20 @@ static void AtomicStore(ThreadState *thr, uptr pc, volatile T *a, T v,
template<typename T, T (*F)(volatile T *v, T op)> template<typename T, T (*F)(volatile T *v, T op)>
static T AtomicRMW(ThreadState *thr, uptr pc, volatile T *a, T v, morder mo) { static T AtomicRMW(ThreadState *thr, uptr pc, volatile T *a, T v, morder mo) {
MemoryWriteAtomic(thr, pc, (uptr)a, SizeLog<T>()); MemoryWriteAtomic(thr, pc, (uptr)a, SizeLog<T>());
SyncVar *s = CTX()->synctab.GetOrCreateAndLock(thr, pc, (uptr)a, true); SyncVar *s = 0;
thr->clock.set(thr->tid, thr->fast_state.epoch()); if (mo != mo_relaxed) {
if (IsAcqRelOrder(mo)) s = CTX()->synctab.GetOrCreateAndLock(thr, pc, (uptr)a, true);
thr->clock.acq_rel(&s->clock); thr->clock.set(thr->tid, thr->fast_state.epoch());
else if (IsReleaseOrder(mo)) if (IsAcqRelOrder(mo))
thr->clock.release(&s->clock); thr->clock.acq_rel(&s->clock);
else if (IsAcquireOrder(mo)) else if (IsReleaseOrder(mo))
thr->clock.acquire(&s->clock); thr->clock.release(&s->clock);
else if (IsAcquireOrder(mo))
thr->clock.acquire(&s->clock);
}
v = F(a, v); v = F(a, v);
s->mtx.Unlock(); if (s)
s->mtx.Unlock();
return v; return v;
} }
@ -350,17 +354,21 @@ static bool AtomicCAS(ThreadState *thr, uptr pc,
volatile T *a, T *c, T v, morder mo, morder fmo) { volatile T *a, T *c, T v, morder mo, morder fmo) {
(void)fmo; // Unused because llvm does not pass it yet. (void)fmo; // Unused because llvm does not pass it yet.
MemoryWriteAtomic(thr, pc, (uptr)a, SizeLog<T>()); MemoryWriteAtomic(thr, pc, (uptr)a, SizeLog<T>());
SyncVar *s = CTX()->synctab.GetOrCreateAndLock(thr, pc, (uptr)a, true); SyncVar *s = 0;
thr->clock.set(thr->tid, thr->fast_state.epoch()); if (mo != mo_relaxed) {
if (IsAcqRelOrder(mo)) s = CTX()->synctab.GetOrCreateAndLock(thr, pc, (uptr)a, true);
thr->clock.acq_rel(&s->clock); thr->clock.set(thr->tid, thr->fast_state.epoch());
else if (IsReleaseOrder(mo)) if (IsAcqRelOrder(mo))
thr->clock.release(&s->clock); thr->clock.acq_rel(&s->clock);
else if (IsAcquireOrder(mo)) else if (IsReleaseOrder(mo))
thr->clock.acquire(&s->clock); thr->clock.release(&s->clock);
else if (IsAcquireOrder(mo))
thr->clock.acquire(&s->clock);
}
T cc = *c; T cc = *c;
T pr = func_cas(a, cc, v); T pr = func_cas(a, cc, v);
s->mtx.Unlock(); if (s)
s->mtx.Unlock();
if (pr == cc) if (pr == cc)
return true; return true;
*c = pr; *c = pr;