Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove TSAN_ONLY_ATOMIC_* macros and configuration option #310

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Remove TSAN_ONLY_ATOMIC_* macros and configuration option #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2655bab
Remove TSAN_ONLY_ATOMIC stuff
adayton1 Dec 13, 2024
a5b361a
Merge branch 'develop' into feature/dayton8/rm_tsan_only
adayton1 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ The format of this file is based on [Keep a Changelog](http://keepachangelog.com

### Added
- Added CARE\_DEEP\_COPY\_RAW\_PTR configuration option.

### Added
- Added ATOMIC\_SUB, ATOMIC\_LOAD, ATOMIC\_STORE, ATOMIC\_EXCHANGE, and ATOMIC\_CAS macros.
- Added TSAN\_ONLY\_ATOMIC\_\* macros to suppress tsan data race reports. Controlled by CARE\_ENABLE\_TSAN\_ONLY\_ATOMICS configuration option.

### Removed
- Removed Accessor template parameter from host\_device\_ptr.
Expand Down
2 changes: 0 additions & 2 deletions cmake/SetupOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ option(CARE_NEVER_USE_RAJA_PARALLEL_SCAN "Disable RAJA parallel scans in SCAN lo
option(CARE_ENABLE_FUSER_BIN_32 "Enable the 32 register fusible loop bin." OFF)
option(CARE_ENABLE_PARALLEL_LOOP_BACKWARDS "Reverse the start and end for parallel loops." OFF)
option(CARE_ENABLE_STALE_DATA_CHECK "Enable checking for stale host data. Only applicable for GPU (or GPU simulation) builds." OFF)
# TODO: Investigate correctness and performance impact of this option
option(CARE_ENABLE_TSAN_ONLY_ATOMICS "Enable atomics for ThreadSanitizer (TSAN) build." OFF)

# Extra components
cmake_dependent_option(CARE_ENABLE_TESTS "Build CARE tests"
Expand Down
47 changes: 0 additions & 47 deletions src/care/atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,51 +25,4 @@ using RAJAAtomic = RAJA::auto_atomic;
#define ATOMIC_EXCHANGE(ref, val) RAJA::atomicExchange<RAJAAtomic>(&(ref), val)
#define ATOMIC_CAS(ref, compare, val) RAJA::atomicCAS<RAJAAtomic>(&(ref), compare, val)

///
/// Macros that use atomics for a ThreadSanitizer build to avoid false
/// positives, but otherwise do a non-atomic operation (for cases where
/// the order of execution does not matter, such as multiple threads
/// setting the same variable to the same value).
///
/// WARNING: The returned previous value for the TSAN_ONLY_ATOMIC_* macros
/// should generally not be used in a parallel context, since
/// another thread may have modified the value at the given memory
/// location in between the current thread's read and write. If the
/// return value is needed, use the ATOMIC_* macros instead.
///
/// TODO: Evaluate whether the compiler actually does the right thing without
/// atomics and whether using atomics detracts from performance.
///
#if defined(CARE_ENABLE_TSAN_ONLY_ATOMICS)

#define TSAN_ONLY_ATOMIC_ADD(ref, inc) ATOMIC_ADD(ref, inc)
#define TSAN_ONLY_ATOMIC_SUB(ref, inc) ATOMIC_SUB(ref, inc)
#define TSAN_ONLY_ATOMIC_MIN(ref, val) ATOMIC_MIN(ref, val)
#define TSAN_ONLY_ATOMIC_MAX(ref, val) ATOMIC_MAX(ref, val)
#define TSAN_ONLY_ATOMIC_OR(ref, val) ATOMIC_OR(ref, val)
#define TSAN_ONLY_ATOMIC_AND(ref, val) ATOMIC_AND(ref, val)
#define TSAN_ONLY_ATOMIC_XOR(ref, val) ATOMIC_XOR(ref, val)
#define TSAN_ONLY_ATOMIC_LOAD(ref) ATOMIC_LOAD(ref)
#define TSAN_ONLY_ATOMIC_STORE(ref, val) ATOMIC_STORE(ref, val)
#define TSAN_ONLY_ATOMIC_EXCHANGE(ref, val) ATOMIC_EXCHANGE(ref, val)
#define TSAN_ONLY_ATOMIC_CAS(ref, compare, val) ATOMIC_CAS(ref, compare, val)

#else

using TSANOnlyAtomic = RAJA::seq_atomic;

#define TSAN_ONLY_ATOMIC_ADD(ref, inc) RAJA::atomicAdd<TSANOnlyAtomic>(&(ref), inc)
#define TSAN_ONLY_ATOMIC_SUB(ref, inc) RAJA::atomicSub<TSANOnlyAtomic>(&(ref), inc)
#define TSAN_ONLY_ATOMIC_MIN(ref, val) RAJA::atomicMin<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_MAX(ref, val) RAJA::atomicMax<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_OR(ref, val) RAJA::atomicOr<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_AND(ref, val) RAJA::atomicAnd<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_XOR(ref, val) RAJA::atomicXor<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_LOAD(ref) RAJA::atomicLoad<TSANOnlyAtomic>(&(ref))
#define TSAN_ONLY_ATOMIC_STORE(ref, val) RAJA::atomicStore<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_EXCHANGE(ref, val) RAJA::atomicExchange<TSANOnlyAtomic>(&(ref), val)
#define TSAN_ONLY_ATOMIC_CAS(ref, compare, val) RAJA::atomicCAS<TSANOnlyAtomic>(&(ref), compare, val)

#endif

#endif // CARE_ATOMIC_H
1 change: 0 additions & 1 deletion src/care/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#cmakedefine01 CARE_ENABLE_PINNED_MEMORY_FOR_SCANS
#cmakedefine CARE_GPU_MEMORY_IS_ACCESSIBLE_ON_CPU
#cmakedefine CARE_ENABLE_STALE_DATA_CHECK
#cmakedefine CARE_ENABLE_TSAN_ONLY_ATOMICS

// Optional dependencies
#cmakedefine01 CARE_HAVE_LLNL_GLOBALID
Expand Down
Loading