caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OMPT] Use __tsan_init to detect TSan binaries rather than RunningOnValgrind (#128357)

Browse Source 
Switch to using __tsan_init rather than RunningOnValgrind as the means
for detecting TSan instumented binaries. RunningOnValgrind is present in
other libraries (such as Google perftools tcmalloc). An exe that links
with a tcmalloc static library and exports symbols with -rdynamic will
appear to be TSan instrumented even when it is not resulting in "Unable
to fint TSan function ..." messages.

Fixes issue #122319.
This commit is contained in:
Paul Floyd
2025-02-25 23:35:32 +01:00
committed by GitHub
parent 65cf534139
commit 789bfdc3e6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openmp/tools/archer/ompt-tsan.cpp
View File

@@ -166,9 +166,6 @@ DECLARE_TSAN_FUNCTION(AnnotateNewMemory, const char *, int,
const volatile void *, size_t) const volatile void *, size_t)
DECLARE_TSAN_FUNCTION(__tsan_func_entry, const void *) DECLARE_TSAN_FUNCTION(__tsan_func_entry, const void *)
DECLARE_TSAN_FUNCTION(__tsan_func_exit) DECLARE_TSAN_FUNCTION(__tsan_func_exit)
// RunningOnValgrind is used to detect absence of TSan and must intentionally be a nullptr.
static int (*RunningOnValgrind)(void);
} }
// This marker is used to define a happens-before arc. The race detector will // This marker is used to define a happens-before arc. The race detector will
@@ -1252,13 +1249,15 @@ ompt_start_tool(unsigned int omp_version, const char *runtime_version) {
// The OMPT start-up code uses dlopen with RTLD_LAZY. Therefore, we cannot // The OMPT start-up code uses dlopen with RTLD_LAZY. Therefore, we cannot
// rely on dlopen to fail if TSan is missing, but would get a runtime error // rely on dlopen to fail if TSan is missing, but would get a runtime error
// for the first TSan call. We use RunningOnValgrind to detect whether // for the first TSan call. We use __tsan_init to detect whether
// an implementation of the Annotation interface is available in the // an implementation of the Annotation interface is available in the
// execution or disable the tool (by returning NULL). // execution or disable the tool (by returning NULL).
findTsanFunctionSilent(RunningOnValgrind, (int (*)(void))); void (*__tsan_init)(void) = nullptr;
if (!RunningOnValgrind) // if we are not running on TSAN, give a different
// tool the chance to be loaded findTsanFunctionSilent(__tsan_init, (void (*)(void)));
if (!__tsan_init) // if we are not running on TSAN, give a different
// tool the chance to be loaded
{ {
if (archer_flags->verbose) if (archer_flags->verbose)
std::cout << "Archer detected OpenMP application without TSan; " std::cout << "Archer detected OpenMP application without TSan; "