[C++11] Replace LLVM atomics with std::atomic.

With C++11 we finally have a standardized way to specify atomic operations. Use
them to replace the existing custom implemention. Sadly the translation is not
entirely trivial as std::atomic allows more fine-grained control over the
atomicity. I tried to preserve the old semantics as well as possible.

Differential Revision: http://llvm-reviews.chandlerc.com/D2915

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202730 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer
2014-03-03 17:53:30 +00:00
parent 59a4517759
commit 4721e55a0c
9 changed files with 49 additions and 41 deletions

View File

@@ -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;
volatile llvm::sys::cas_flag Value;
std::atomic<unsigned> Value;
bool Initialized;
llvm::sys::cas_flag getValue() const { return Value; }
unsigned getValue() const { return Value; }
const char *getName() const { return Name; }
const char *getDesc() const { return Desc; }
@@ -63,48 +63,54 @@ 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.
sys::AtomicIncrement(&Value);
++Value;
return init();
}
unsigned operator++(int) {
init();
unsigned OldValue = Value;
sys::AtomicIncrement(&Value);
unsigned OldValue = Value++;
return OldValue;
}
const Statistic &operator--() {
sys::AtomicDecrement(&Value);
--Value;
return init();
}
unsigned operator--(int) {
init();
unsigned OldValue = Value;
sys::AtomicDecrement(&Value);
unsigned OldValue = Value--;
return OldValue;
}
const Statistic &operator+=(const unsigned &V) {
if (!V) return *this;
sys::AtomicAdd(&Value, V);
Value += V;
return init();
}
const Statistic &operator-=(const unsigned &V) {
if (!V) return *this;
sys::AtomicAdd(&Value, -V);
Value -= V;
return init();
}
const Statistic &operator*=(const unsigned &V) {
sys::AtomicMul(&Value, V);
unsigned Original, Result;
do {
Original = Value;
Result = Original * V;
} while (!Value.compare_exchange_strong(Original, Result));
return init();
}
const Statistic &operator/=(const unsigned &V) {
sys::AtomicDiv(&Value, V);
unsigned Original, Result;
do {
Original = Value;
Result = Original / V;
} while (!Value.compare_exchange_strong(Original, Result));
return init();
}
@@ -151,7 +157,7 @@ public:
protected:
Statistic &init() {
bool tmp = Initialized;
sys::MemoryFence();
std::atomic_thread_fence(std::memory_order_seq_cst);
if (!tmp) RegisterStatistic();
TsanHappensAfter(this);
return *this;
@@ -162,7 +168,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, 0 }
static llvm::Statistic VARNAME = { DEBUG_TYPE, DESC, {}, 0 }
/// \brief Enable the collection and printing of statistics.
void EnableStatistics();