This is an archive of the discontinued LLVM Phabricator instance.

Differential D112604

tsan: remove hacky call
ClosedPublic

Authored by dvyukov on Oct 27 2021, 2:02 AM.

Details

Reviewers
vitalybuka
melver
Commits
rG22a251c3d0d3: tsan: remove hacky call
Summary

It's unused in the new tsan runtime.

Depends on D112603.

Diff Detail

Event Timeline

dvyukov requested review of this revision.Oct 27 2021, 2:02 AM
dvyukov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptOct 27 2021, 2:02 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
dvyukov added a child revision: D112605: tsan: remove old vector clocks.Oct 27 2021, 2:03 AM
Harbormaster completed remote builds in B130884: Diff 382562.Oct 27 2021, 2:25 AM
dvyukov updated this revision to Diff 382660.Oct 27 2021, 7:06 AM

rebase

Harbormaster completed remote builds in B130950: Diff 382660.Oct 27 2021, 7:06 AM
vitalybuka accepted this revision.Oct 27 2021, 1:47 PM
This revision is now accepted and ready to land.Oct 27 2021, 1:47 PM
dvyukov updated this revision to Diff 386247.Nov 10 2021, 10:49 AM

rebase

Harbormaster completed remote builds in B133538: Diff 386247.Nov 10 2021, 12:43 PM
dvyukov mentioned this in D113742: tsan: fix XMM register corruption in hacky call.Nov 12 2021, 3:51 AM
dvyukov updated this revision to Diff 386792.Nov 12 2021, 4:01 AM

rebase

Herald added a subscriber: krytarowski. · View Herald TranscriptNov 12 2021, 4:01 AM
dvyukov updated this revision to Diff 386799.Nov 12 2021, 4:06 AM

restore wrongly deleted asm file

Harbormaster completed remote builds in B133921: Diff 386799.Nov 12 2021, 4:36 AM
melver accepted this revision.Nov 12 2021, 4:44 AM

Nice!

dvyukov updated this revision to Diff 387564.Nov 16 2021, 3:45 AM

rebase

Harbormaster completed remote builds in B134478: Diff 387564.Nov 16 2021, 3:46 AM
dvyukov updated this revision to Diff 387685.Nov 16 2021, 9:25 AM

rebase

Harbormaster completed remote builds in B134560: Diff 387685.Nov 16 2021, 9:26 AM
This revision was landed with ongoing or failed builds.Dec 21 2021, 10:53 AM
Closed by commit rG22a251c3d0d3: tsan: remove hacky call (authored by dvyukov). · Explain Why
This revision was automatically updated to reflect the committed changes.
dvyukov added a commit: rG22a251c3d0d3: tsan: remove hacky call.

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
rtl/
21 lines
6 lines
162 lines

Diff 386247

compiler-rt/lib/tsan/rtl/tsan_rtl.h

Show First 20 Lines • Show All 565 Lines • ▼ Show 20 Lines
// approximation of the actual required synchronization. // approximation of the actual required synchronization.
void AcquireGlobal(ThreadState *thr); void AcquireGlobal(ThreadState *thr);
void Release(ThreadState *thr, uptr pc, uptr addr); void Release(ThreadState *thr, uptr pc, uptr addr);
void ReleaseStoreAcquire(ThreadState *thr, uptr pc, uptr addr); void ReleaseStoreAcquire(ThreadState *thr, uptr pc, uptr addr);
void ReleaseStore(ThreadState *thr, uptr pc, uptr addr); void ReleaseStore(ThreadState *thr, uptr pc, uptr addr);
void AfterSleep(ThreadState *thr, uptr pc); void AfterSleep(ThreadState *thr, uptr pc);
void IncrementEpoch(ThreadState *thr); void IncrementEpoch(ThreadState *thr);
// The hacky call uses custom calling convention and an assembly thunk.
// It is considerably faster that a normal call for the caller
// if it is not executed (it is intended for slow paths from hot functions).
// The trick is that the call preserves all registers and the compiler
// does not treat it as a call.
// If it does not work for you, use normal call.
#if !SANITIZER_DEBUG && defined(__x86_64__) && !SANITIZER_MAC
// The caller may not create the stack frame for itself at all,
// so we create a reserve stack frame for it (1024b must be enough).
#define HACKY_CALL(f) \
__asm__ __volatile__("sub $1024, %%rsp;" \
CFI_INL_ADJUST_CFA_OFFSET(1024) \
".hidden " #f "_thunk;" \
"call " #f "_thunk;" \
"add $1024, %%rsp;" \
CFI_INL_ADJUST_CFA_OFFSET(-1024) \
::: "memory", "cc");
#else
#define HACKY_CALL(f) f()
#endif
#if !SANITIZER_GO #if !SANITIZER_GO
uptr ALWAYS_INLINE HeapEnd() { uptr ALWAYS_INLINE HeapEnd() {
return HeapMemEnd() + PrimaryAllocator::AdditionalSize(); return HeapMemEnd() + PrimaryAllocator::AdditionalSize();
} }
#endif #endif
void SlotAttachAndLock(ThreadState *thr) ACQUIRE(thr->slot->mtx); void SlotAttachAndLock(ThreadState *thr) ACQUIRE(thr->slot->mtx);
void SlotDetach(ThreadState *thr); void SlotDetach(ThreadState *thr);
▲ Show 20 Lines • Show All 200 Lines • Show Last 20 Lines

compiler-rt/lib/tsan/rtl/tsan_rtl.cpp

Show First 20 Lines • Show All 910 Lines • ▼ Show 20 Lines for (uptr i = 0; i < thr->mset.Size(); i++) {
if (recycle) if (recycle)
ctx->trace_part_recycle.PushBack(recycle); ctx->trace_part_recycle.PushBack(recycle);
} }
DPrintf("#%d: TraceSwitchPart exit parts=%p-%p pos=0x%zx\n", thr->tid, DPrintf("#%d: TraceSwitchPart exit parts=%p-%p pos=0x%zx\n", thr->tid,
trace->parts.Front(), trace->parts.Back(), trace->parts.Front(), trace->parts.Back(),
atomic_load_relaxed(&thr->trace_pos)); atomic_load_relaxed(&thr->trace_pos));
} }
#if !SANITIZER_GO
extern "C" void __tsan_trace_switch() {}
extern "C" void __tsan_report_race() {}
#endif
void ThreadIgnoreBegin(ThreadState* thr, uptr pc) { void ThreadIgnoreBegin(ThreadState* thr, uptr pc) {
DPrintf("#%d: ThreadIgnoreBegin\n", thr->tid); DPrintf("#%d: ThreadIgnoreBegin\n", thr->tid);
thr->ignore_reads_and_writes++; thr->ignore_reads_and_writes++;
CHECK_GT(thr->ignore_reads_and_writes, 0); CHECK_GT(thr->ignore_reads_and_writes, 0);
thr->fast_state.SetIgnoreBit(); thr->fast_state.SetIgnoreBit();
#if !SANITIZER_GO #if !SANITIZER_GO
if (pc && !ctx->after_multithreaded_fork) if (pc && !ctx->after_multithreaded_fork)
thr->mop_ignore_set.Add(CurrentStackId(thr, pc)); thr->mop_ignore_set.Add(CurrentStackId(thr, pc));
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines

compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S

// The content of this file is x86_64-only: // The content of this file is x86_64-only:
#if defined(__x86_64__) #if defined(__x86_64__)
#include "sanitizer_common/sanitizer_asm.h" #include "sanitizer_common/sanitizer_asm.h"
#if !defined(__APPLE__) #if !defined(__APPLE__)
.section .text .section .text
#else #else
.section __TEXT,__text .section __TEXT,__text
#endif #endif
ASM_HIDDEN(__tsan_trace_switch)
.globl ASM_SYMBOL(__tsan_trace_switch_thunk)
ASM_SYMBOL(__tsan_trace_switch_thunk):
CFI_STARTPROC
_CET_ENDBR
# Save scratch registers.
push %rax
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rax, 0)
push %rcx
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rcx, 0)
push %rdx
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rdx, 0)
push %rsi
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rsi, 0)
push %rdi
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rdi, 0)
push %r8
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r8, 0)
push %r9
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r9, 0)
push %r10
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r10, 0)
push %r11
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r11, 0)
# Align stack frame.
push %rbx # non-scratch
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rbx, 0)
mov %rsp, %rbx # save current rsp
CFI_DEF_CFA_REGISTER(%rbx)
shr $4, %rsp # clear 4 lsb, align to 16
shl $4, %rsp
call ASM_SYMBOL(__tsan_trace_switch)
# Unalign stack frame back.
mov %rbx, %rsp # restore the original rsp
CFI_DEF_CFA_REGISTER(%rsp)
pop %rbx
CFI_ADJUST_CFA_OFFSET(-8)
# Restore scratch registers.
pop %r11
CFI_ADJUST_CFA_OFFSET(-8)
pop %r10
CFI_ADJUST_CFA_OFFSET(-8)
pop %r9
CFI_ADJUST_CFA_OFFSET(-8)
pop %r8
CFI_ADJUST_CFA_OFFSET(-8)
pop %rdi
CFI_ADJUST_CFA_OFFSET(-8)
pop %rsi
CFI_ADJUST_CFA_OFFSET(-8)
pop %rdx
CFI_ADJUST_CFA_OFFSET(-8)
pop %rcx
CFI_ADJUST_CFA_OFFSET(-8)
pop %rax
CFI_ADJUST_CFA_OFFSET(-8)
CFI_RESTORE(%rax)
CFI_RESTORE(%rbx)
CFI_RESTORE(%rcx)
CFI_RESTORE(%rdx)
CFI_RESTORE(%rsi)
CFI_RESTORE(%rdi)
CFI_RESTORE(%r8)
CFI_RESTORE(%r9)
CFI_RESTORE(%r10)
CFI_RESTORE(%r11)
ret
CFI_ENDPROC
ASM_HIDDEN(__tsan_report_race)
.globl ASM_SYMBOL(__tsan_report_race_thunk)
ASM_SYMBOL(__tsan_report_race_thunk):
CFI_STARTPROC
_CET_ENDBR
# Save scratch registers.
push %rax
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rax, 0)
push %rcx
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rcx, 0)
push %rdx
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rdx, 0)
push %rsi
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rsi, 0)
push %rdi
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rdi, 0)
push %r8
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r8, 0)
push %r9
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r9, 0)
push %r10
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r10, 0)
push %r11
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%r11, 0)
# Align stack frame.
push %rbx # non-scratch
CFI_ADJUST_CFA_OFFSET(8)
CFI_REL_OFFSET(%rbx, 0)
mov %rsp, %rbx # save current rsp
CFI_DEF_CFA_REGISTER(%rbx)
shr $4, %rsp # clear 4 lsb, align to 16
shl $4, %rsp
call ASM_SYMBOL(__tsan_report_race)
# Unalign stack frame back.
mov %rbx, %rsp # restore the original rsp
CFI_DEF_CFA_REGISTER(%rsp)
pop %rbx
CFI_ADJUST_CFA_OFFSET(-8)
# Restore scratch registers.
pop %r11
CFI_ADJUST_CFA_OFFSET(-8)
pop %r10
CFI_ADJUST_CFA_OFFSET(-8)
pop %r9
CFI_ADJUST_CFA_OFFSET(-8)
pop %r8
CFI_ADJUST_CFA_OFFSET(-8)
pop %rdi
CFI_ADJUST_CFA_OFFSET(-8)
pop %rsi
CFI_ADJUST_CFA_OFFSET(-8)
pop %rdx
CFI_ADJUST_CFA_OFFSET(-8)
pop %rcx
CFI_ADJUST_CFA_OFFSET(-8)
pop %rax
CFI_ADJUST_CFA_OFFSET(-8)
CFI_RESTORE(%rax)
CFI_RESTORE(%rbx)
CFI_RESTORE(%rcx)
CFI_RESTORE(%rdx)
CFI_RESTORE(%rsi)
CFI_RESTORE(%rdi)
CFI_RESTORE(%r8)
CFI_RESTORE(%r9)
CFI_RESTORE(%r10)
CFI_RESTORE(%r11)
ret
CFI_ENDPROC
ASM_HIDDEN(__tsan_setjmp) ASM_HIDDEN(__tsan_setjmp)
#if defined(__NetBSD__) #if defined(__NetBSD__)
.comm _ZN14__interception15real___setjmp14E,8,8 .comm _ZN14__interception15real___setjmp14E,8,8
#elif !defined(__APPLE__) #elif !defined(__APPLE__)
.comm _ZN14__interception11real_setjmpE,8,8 .comm _ZN14__interception11real_setjmpE,8,8
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
.globl ASM_SYMBOL_INTERCEPTOR(__setjmp14) .globl ASM_SYMBOL_INTERCEPTOR(__setjmp14)
▲ Show 20 Lines • Show All 191 Lines • Show Last 20 Lines