diff options
-rw-r--r-- | include/llvm/ADT/Statistic.h | 36 | ||||
-rw-r--r-- | include/llvm/PassSupport.h | 18 | ||||
-rw-r--r-- | include/llvm/Support/ManagedStatic.h | 14 | ||||
-rw-r--r-- | lib/IR/Attributes.cpp | 1 | ||||
-rw-r--r-- | lib/IR/DiagnosticInfo.cpp | 6 | ||||
-rw-r--r-- | lib/Support/ManagedStatic.cpp | 3 | ||||
-rw-r--r-- | lib/Support/Statistic.cpp | 2 | ||||
-rw-r--r-- | lib/Support/Threading.cpp | 6 | ||||
-rw-r--r-- | lib/Support/Timer.cpp | 4 |
9 files changed, 41 insertions, 49 deletions
diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h index 5e7a433e44..26aac7bea6 100644 --- a/include/llvm/ADT/Statistic.h +++ b/include/llvm/ADT/Statistic.h @@ -26,8 +26,8 @@ #ifndef LLVM_ADT_STATISTIC_H #define LLVM_ADT_STATISTIC_H +#include "llvm/Support/Atomic.h" #include "llvm/Support/Valgrind.h" -#include <atomic> namespace llvm { class raw_ostream; @@ -36,10 +36,10 @@ class Statistic { public: const char *Name; const char *Desc; - std::atomic<unsigned> Value; + volatile llvm::sys::cas_flag Value; bool Initialized; - unsigned getValue() const { return Value; } + llvm::sys::cas_flag getValue() const { return Value; } const char *getName() const { return Name; } const char *getDesc() const { return Desc; } @@ -63,54 +63,48 @@ public: // atomic operation to update the value safely in the presence of // concurrent accesses, but not to read the return value, so the // return value is not thread safe. - ++Value; + sys::AtomicIncrement(&Value); return init(); } unsigned operator++(int) { init(); - unsigned OldValue = Value++; + unsigned OldValue = Value; + sys::AtomicIncrement(&Value); return OldValue; } const Statistic &operator--() { - --Value; + sys::AtomicDecrement(&Value); return init(); } unsigned operator--(int) { init(); - unsigned OldValue = Value--; + unsigned OldValue = Value; + sys::AtomicDecrement(&Value); return OldValue; } const Statistic &operator+=(const unsigned &V) { if (!V) return *this; - Value += V; + sys::AtomicAdd(&Value, V); return init(); } const Statistic &operator-=(const unsigned &V) { if (!V) return *this; - Value -= V; + sys::AtomicAdd(&Value, -V); return init(); } const Statistic &operator*=(const unsigned &V) { - unsigned Original, Result; - do { - Original = Value; - Result = Original * V; - } while (!Value.compare_exchange_strong(Original, Result)); + sys::AtomicMul(&Value, V); return init(); } const Statistic &operator/=(const unsigned &V) { - unsigned Original, Result; - do { - Original = Value; - Result = Original / V; - } while (!Value.compare_exchange_strong(Original, Result)); + sys::AtomicDiv(&Value, V); return init(); } @@ -157,7 +151,7 @@ public: protected: Statistic &init() { bool tmp = Initialized; - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); if (!tmp) RegisterStatistic(); TsanHappensAfter(this); return *this; @@ -168,7 +162,7 @@ protected: // STATISTIC - A macro to make definition of statistics really simple. This // automatically passes the DEBUG_TYPE of the file into the statistic. #define STATISTIC(VARNAME, DESC) \ - static llvm::Statistic VARNAME = { DEBUG_TYPE, DESC, {}, 0 } + static llvm::Statistic VARNAME = { DEBUG_TYPE, DESC, 0, 0 } /// \brief Enable the collection and printing of statistics. void EnableStatistics(); diff --git a/include/llvm/PassSupport.h b/include/llvm/PassSupport.h index c746506f47..baee77f133 100644 --- a/include/llvm/PassSupport.h +++ b/include/llvm/PassSupport.h @@ -24,8 +24,8 @@ #include "Pass.h" #include "llvm/InitializePasses.h" #include "llvm/PassRegistry.h" +#include "llvm/Support/Atomic.h" #include "llvm/Support/Valgrind.h" -#include <atomic> #include <vector> namespace llvm { @@ -147,21 +147,21 @@ private: }; #define CALL_ONCE_INITIALIZATION(function) \ - static std::atomic<int> initialized; \ - int old_val = 0; \ - if (initialized.compare_exchange_strong(old_val, 1)) { \ + static volatile sys::cas_flag initialized = 0; \ + sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \ + if (old_val == 0) { \ function(Registry); \ - std::atomic_thread_fence(std::memory_order_seq_cst); \ + sys::MemoryFence(); \ TsanIgnoreWritesBegin(); \ TsanHappensBefore(&initialized); \ initialized = 2; \ TsanIgnoreWritesEnd(); \ } else { \ - int tmp = initialized.load(); \ - std::atomic_thread_fence(std::memory_order_seq_cst); \ + sys::cas_flag tmp = initialized; \ + sys::MemoryFence(); \ while (tmp != 2) { \ - tmp = initialized.load(); \ - std::atomic_thread_fence(std::memory_order_seq_cst); \ + tmp = initialized; \ + sys::MemoryFence(); \ } \ } \ TsanHappensAfter(&initialized); diff --git a/include/llvm/Support/ManagedStatic.h b/include/llvm/Support/ManagedStatic.h index 4a12a1ba8e..5587618d11 100644 --- a/include/llvm/Support/ManagedStatic.h +++ b/include/llvm/Support/ManagedStatic.h @@ -14,9 +14,9 @@ #ifndef LLVM_SUPPORT_MANAGED_STATIC_H #define LLVM_SUPPORT_MANAGED_STATIC_H +#include "llvm/Support/Atomic.h" #include "llvm/Support/Threading.h" #include "llvm/Support/Valgrind.h" -#include <atomic> namespace llvm { @@ -64,8 +64,7 @@ public: // Accessors. C &operator*() { void* tmp = Ptr; - if (llvm_is_multithreaded()) - std::atomic_thread_fence(std::memory_order_seq_cst); + if (llvm_is_multithreaded()) sys::MemoryFence(); if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call); TsanHappensAfter(this); @@ -73,8 +72,7 @@ public: } C *operator->() { void* tmp = Ptr; - if (llvm_is_multithreaded()) - std::atomic_thread_fence(std::memory_order_seq_cst); + if (llvm_is_multithreaded()) sys::MemoryFence(); if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call); TsanHappensAfter(this); @@ -82,8 +80,7 @@ public: } const C &operator*() const { void* tmp = Ptr; - if (llvm_is_multithreaded()) - std::atomic_thread_fence(std::memory_order_seq_cst); + if (llvm_is_multithreaded()) sys::MemoryFence(); if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call); TsanHappensAfter(this); @@ -91,8 +88,7 @@ public: } const C *operator->() const { void* tmp = Ptr; - if (llvm_is_multithreaded()) - std::atomic_thread_fence(std::memory_order_seq_cst); + if (llvm_is_multithreaded()) sys::MemoryFence(); if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call); TsanHappensAfter(this); diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp index 24cd6c7c1a..9d9d948527 100644 --- a/lib/IR/Attributes.cpp +++ b/lib/IR/Attributes.cpp @@ -18,6 +18,7 @@ #include "LLVMContextImpl.h" #include "llvm/ADT/StringExtras.h" #include "llvm/IR/Type.h" +#include "llvm/Support/Atomic.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Mutex.h" diff --git a/lib/IR/DiagnosticInfo.cpp b/lib/IR/DiagnosticInfo.cpp index 75ddd94b35..86e8788eb0 100644 --- a/lib/IR/DiagnosticInfo.cpp +++ b/lib/IR/DiagnosticInfo.cpp @@ -19,14 +19,14 @@ #include "llvm/IR/Function.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Metadata.h" -#include <atomic> +#include "llvm/Support/Atomic.h" #include <string> using namespace llvm; int llvm::getNextAvailablePluginDiagnosticKind() { - static std::atomic<int> PluginKindID(DK_FirstPluginKind); - return ++PluginKindID; + static sys::cas_flag PluginKindID = DK_FirstPluginKind; + return (int)sys::AtomicIncrement(&PluginKindID); } DiagnosticInfoInlineAsm::DiagnosticInfoInlineAsm(const Instruction &I, diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp index c19f8cb485..098cccb68d 100644 --- a/lib/Support/ManagedStatic.cpp +++ b/lib/Support/ManagedStatic.cpp @@ -13,6 +13,7 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Config/config.h" +#include "llvm/Support/Atomic.h" #include <cassert> using namespace llvm; @@ -27,7 +28,7 @@ void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(), void* tmp = Creator ? Creator() : 0; TsanHappensBefore(this); - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); // This write is racy against the first read in the ManagedStatic // accessors. The race is benign because it does a second read after a diff --git a/lib/Support/Statistic.cpp b/lib/Support/Statistic.cpp index 9d075736b3..56c3b0f565 100644 --- a/lib/Support/Statistic.cpp +++ b/lib/Support/Statistic.cpp @@ -76,7 +76,7 @@ void Statistic::RegisterStatistic() { StatInfo->addStatistic(this); TsanHappensBefore(this); - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); // Remember we have been registered. TsanIgnoreWritesBegin(); Initialized = true; diff --git a/lib/Support/Threading.cpp b/lib/Support/Threading.cpp index 15dd8a9805..9d7ac6c18d 100644 --- a/lib/Support/Threading.cpp +++ b/lib/Support/Threading.cpp @@ -13,8 +13,8 @@ #include "llvm/Support/Threading.h" #include "llvm/Config/config.h" +#include "llvm/Support/Atomic.h" #include "llvm/Support/Mutex.h" -#include <atomic> #include <cassert> using namespace llvm; @@ -31,7 +31,7 @@ bool llvm::llvm_start_multithreaded() { // We fence here to ensure that all initialization is complete BEFORE we // return from llvm_start_multithreaded(). - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); return true; #else return false; @@ -44,7 +44,7 @@ void llvm::llvm_stop_multithreaded() { // We fence here to insure that all threaded operations are complete BEFORE we // return from llvm_stop_multithreaded(). - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); multithreaded_mode = false; delete global_lock; diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index 03845f21f2..0456f5d638 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -81,14 +81,14 @@ raw_ostream *llvm::CreateInfoOutputFile() { static TimerGroup *DefaultTimerGroup = 0; static TimerGroup *getDefaultTimerGroup() { TimerGroup *tmp = DefaultTimerGroup; - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); if (tmp) return tmp; llvm_acquire_global_lock(); tmp = DefaultTimerGroup; if (!tmp) { tmp = new TimerGroup("Miscellaneous Ungrouped Timers"); - std::atomic_thread_fence(std::memory_order_seq_cst); + sys::MemoryFence(); DefaultTimerGroup = tmp; } llvm_release_global_lock(); |