RSan: Use TSan epoch

Author: rymrg

compiler-rt/lib/tsan/rtl/rsan_defs.hpp

@@ -16,7 +16,13 @@ namespace Robustness{
 	using __tsan::s64;
 	using __tsan::u64;
 	using __tsan::uptr;
-	typedef s64 timestamp_t;
+	using __tsan::Epoch;
+	using __tsan::EpochInc;
+	using __tsan::EpochOverflow;
+	using __tsan::kEpochZero;
+	using __tsan::kEpochOver;
+	using __tsan::kEpochLast;
+	typedef __tsan::Epoch timestamp_t;
 	typedef s64 ssize_t;
 	typedef u64 uint64_t;
 	typedef s64 int64_t;

compiler-rt/lib/tsan/rtl/rsan_robustnessmodel.hpp

@@ -28,8 +28,8 @@ namespace Robustness {
 		};
 		//! Location component
 		struct Location{
-			timestamp_t stamp = 0;
-			timestamp_t stampu = 0;
+			timestamp_t stamp = kEpochZero;
+			timestamp_t stampu = kEpochZero;
 			VectorClock m, w;
 			VectorClock mu, wu;
 		};
@@ -53,12 +53,12 @@ namespace Robustness {
 		 * Memory order is ignored for SC
 		 */
 		void updateStoreStatement(ThreadId , LocationId a, Thread &ts, Location &ls, morder, u64 val){
-			ls.m |= timestamp(a, ++ls.stamp);
+			ls.m |= timestamp(a, EpochInc(ls.stamp));
 			ts.v |= ls.m;
 			ls.w = ts.v;
 			ls.m = ts.v;
 
-			ls.mu |= timestamp(a, ++ls.stampu);
+			ls.mu |= timestamp(a, EpochInc(ls.stampu));
 			ts.vu |= ls.mu;
 			ls.wu = ts.vu;
 			ls.mu = ts.vu;
@@ -71,7 +71,7 @@ namespace Robustness {
 		 */
 		void updateRmwStatement(ThreadId t, LocationId a, Thread &ts, Location &ls, morder mo, u64 val){
 			//return updateStoreStatement(t, a, ts, ls, mo);
-			ls.m |= timestamp(a, ++ls.stamp);
+			ls.m |= timestamp(a, EpochInc(ls.stamp));
 			ts.v |= ls.m;
 			ls.w = ts.v;
 			ls.m = ts.v;
@@ -91,12 +91,6 @@ namespace Robustness {
 		timestamp_t getLastTimeStampU(ThreadId , LocationId l, Thread &ts, Location &ls) const{
 			return ts.vu[l].ts;
 		}
-		timestamp_t getLastTimeStampV(ThreadId , LocationId l, Thread &ts, Location &ls, u64 val) const{
-			return ts.v[l].ts - 1;
-		}
-		timestamp_t getLastTimeStampUV(ThreadId , LocationId l, Thread &ts, Location &ls, u64 val) const{
-			return ts.vu[l].ts - 1;
-		}
 
 		//! Remove locations when freeing memory
 		void freeLocation(LocationId l, Location &ls){
@@ -138,7 +132,7 @@ namespace Robustness {
 		};
 		//! Location component
 		struct Location{
-			timestamp_t writeStamp = 0, writeStampU = 0;
+			timestamp_t writeStamp = kEpochZero, writeStampU = kEpochZero;
 			VectorClock w;
 			VectorClock wu;
 		};
@@ -162,8 +156,8 @@ namespace Robustness {
 
 		//! Update store statement
 		void updateStoreStatement(ThreadId t, LocationId a, Thread &ts, Location &ls, morder mo, uint64_t oldValue){
-			const auto timestampV =  timestamp(a, ++ls.writeStamp);
-			const auto timestampVU = timestamp(a, ++ls.writeStampU);
+			const auto timestampV =  timestamp(a, EpochInc(ls.writeStamp));
+			const auto timestampVU = timestamp(a, EpochInc(ls.writeStampU));
 			ls.w  |= timestampV;
 			ls.wu |= timestampVU;
 			ts.va |= timestampV;
@@ -185,7 +179,7 @@ namespace Robustness {
 
 		//! Update RMW statement
 		void updateRmwStatement(ThreadId t, LocationId a, Thread &ts, Location &ls, morder mo, uint64_t oldValue){
-			const auto timestampV =  timestamp(a, ++ls.writeStamp);
+			const auto timestampV =  timestamp(a, EpochInc(ls.writeStamp));
 			ls.w  |= timestampV;
 			ts.va |= timestampV;
 			ts.vc |= timestampV;

compiler-rt/lib/tsan/rtl/rsan_vectorclock.hpp

@@ -13,7 +13,7 @@ template <typename T>
 class Timestamp{
 	public:
 	T key{};
-	timestamp_t ts = 0;
+	timestamp_t ts = kEpochZero;
 
 	/// Check if the timestamp is newer than rhs
 	public:
@@ -50,7 +50,7 @@ class VectorClock {
 		/// Increment a timestamp t in the vector
 		auto inc(LocationId t){
 			impl.ensureSize(t+1);
-			timestamp(t, ++impl[t]);
+			timestamp(t, EpochInc(impl[t]));
 		}
 		/// Reset the vector clock
 		void reset(){
@@ -96,7 +96,7 @@ class VectorClock {
 				if (impl[i] < rhs.impl[i])
 					return false;
 			for (; i < S2; ++i)
-				if (rhs.impl[i] > 0)
+				if (rhs.impl[i] > kEpochZero)
 					return false;
 			return true;
 		}
@@ -105,7 +105,7 @@ class VectorClock {
 			if (t < impl.size()) {
 				return timestamp(t, impl[t]);
 			}
-			return timestamp(t, 0);
+			return timestamp(t, kEpochZero);
 		}
 
 		bool contains(const Timestamp<LocationId> &rhs) const{