use tbb::speculative_spin_mutex for TSX impl

cmpxchg16 · Apr 22, 2014 · 1a1a9d1 · 1a1a9d1
1 parent f2b831a
commit 1a1a9d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 126 deletions.
diff --git a/HybridLock.h b/HybridLock.h
diff --git a/README b/README
@@ -6,6 +6,8 @@ Benchmark multiple implementation of multi-producer multi-consumer queue:
 4. Intel TSX (Transactional Synchronization Extensions)
 
 Build:
-$> g++ -Wall -std=c++11 -O3 -D DCACHE1_LINESIZE=`getconf LEVEL1_DCACHE_LINESIZE` main.cpp -pthread -Wl,--no-as-needed -mrtm
+$> g++ -Wall -std=c++11 -O3 -D DCACHE1_LINESIZE=`getconf LEVEL1_DCACHE_LINESIZE` main.cpp -pthread -ltbb -Wl,--no-as-needed
+
+Note: the tsx implementation based on the tbb::speculative_spin_mutex
 
 Author: Uri Shamay ([email protected])
diff --git a/main.cpp b/main.cpp
@@ -3,7 +3,7 @@
  * performance and verification tests.
  *
  * Build with (g++ version must be >= 4.5.0):
- * $> g++ -Wall -std=c++11 -O3 -D DCACHE1_LINESIZE=`getconf LEVEL1_DCACHE_LINESIZE` main.cpp -pthread -Wl,--no-as-needed -mrtm
+ * $> g++ -Wall -std=c++11 -O3 -D DCACHE1_LINESIZE=`getconf LEVEL1_DCACHE_LINESIZE` main.cpp -pthread -ltbb -Wl,--no-as-needed
  *
  * I verified the program with g++ 4.5.3, 4.6.1, 4.6.3 and 4.8.1.
  *
@@ -341,8 +341,7 @@ class LockFreeQueue {
     T		**ptr_array_;
 };
 
-#include "HybridLock.h"
-
+#include <tbb/spin_mutex.h>
 /*
  * ----------------------------------------------------------------------------------------------------
  * Intel TSX (Transactional Synchronization Extensions) fixed size multi-producer multi-consumer queue
@@ -358,7 +357,7 @@ class TSXQueue
     {
         while(1)
         {
-            std::lock_guard<HybridLock> lock(lock_);
+            tbb::speculative_spin_mutex::scoped_lock guard(lock_);
             if (counter_ >= Q_SIZE)
             {
                 continue;
@@ -375,7 +374,7 @@ class TSXQueue
         T* t = nullptr;
         while(1)
         {
-            std::lock_guard<HybridLock> lock(lock_);
+            tbb::speculative_spin_mutex::scoped_lock guard(lock_);
             if (counter_ == 0)
             {
                 continue;
@@ -388,7 +387,8 @@ class TSXQueue
     }
 
 private:
-    HybridLock lock_;
+
+    tbb::speculative_spin_mutex lock_;
     unsigned long counter_;
     T ____cacheline_aligned* array_[Q_SIZE] ____cacheline_aligned;
 };