From: Peizhao Ou <peizhaoo@uci.edu>
Date: Wed, 29 Nov 2017 20:17:34 +0000 (-0800)
Subject: Trims down unnecessary queue test casese
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=2802be1032ec0902fe213b654efd54e1f5319c77;ds=inline

Trims down unnecessary queue test casese
---

diff --git a/test/stress/queue/CMakeLists.txt b/test/stress/queue/CMakeLists.txt
index a074acee..d4618a46 100644
--- a/test/stress/queue/CMakeLists.txt
+++ b/test/stress/queue/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CDSSTRESS_QUEUE_PUSHPOP stress-queue-push-pop)
 set(CDSSTRESS_QUEUE_PUSHPOP_SOURCES
     ../main.cpp
     push_pop.cpp
-    intrusive_push_pop.cpp    
+    #intrusive_push_pop.cpp    
 )
 add_executable(${CDSSTRESS_QUEUE_PUSHPOP} ${CDSSTRESS_QUEUE_PUSHPOP_SOURCES})
 target_link_libraries(${CDSSTRESS_QUEUE_PUSHPOP} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY})
@@ -74,4 +74,4 @@ add_custom_target( stress-queue
         ${CDSSTRESS_QUEUE_RANDOM}
         ${CDSSTRESS_QUEUE_BOUNDED}
         ${CDSSTRESS_SPSC_QUEUE}
-)        
\ No newline at end of file
+)        
diff --git a/test/stress/queue/pop.cpp b/test/stress/queue/pop.cpp
index cd5ab8a5..d6f49812 100644
--- a/test/stress/queue/pop.cpp
+++ b/test/stress/queue/pop.cpp
@@ -170,10 +170,7 @@ namespace {
     CDSSTRESS_MoirQueue( queue_pop )
     CDSSTRESS_BasketQueue( queue_pop )
     CDSSTRESS_OptimsticQueue( queue_pop )
-    CDSSTRESS_FCQueue( queue_pop )
-    CDSSTRESS_FCDeque( queue_pop )
     CDSSTRESS_RWQueue( queue_pop )
-    CDSSTRESS_StdQueue( queue_pop )
 
 #undef CDSSTRESS_Queue_F
 #define CDSSTRESS_Queue_F( test_fixture, type_name ) \
diff --git a/test/stress/queue/push.cpp b/test/stress/queue/push.cpp
index 65e4aee6..57bb3697 100644
--- a/test/stress/queue/push.cpp
+++ b/test/stress/queue/push.cpp
@@ -173,10 +173,7 @@ namespace {
     CDSSTRESS_MoirQueue( queue_push )
     CDSSTRESS_BasketQueue( queue_push )
     CDSSTRESS_OptimsticQueue( queue_push )
-    CDSSTRESS_FCQueue( queue_push )
-    CDSSTRESS_FCDeque( queue_push )
     CDSSTRESS_RWQueue( queue_push )
-    CDSSTRESS_StdQueue( queue_push )
 
 #undef CDSSTRESS_Queue_F
 #define CDSSTRESS_Queue_F( test_fixture, type_name ) \
diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp
index 148fde41..bf4d2446 100644
--- a/test/stress/queue/push_pop.cpp
+++ b/test/stress/queue/push_pop.cpp
@@ -349,11 +349,7 @@ namespace {
     CDSSTRESS_MoirQueue( simple_queue_push_pop )
     CDSSTRESS_BasketQueue( simple_queue_push_pop )
     CDSSTRESS_OptimsticQueue( simple_queue_push_pop )
-    CDSSTRESS_FCQueue( simple_queue_push_pop )
-    CDSSTRESS_FCDeque( simple_queue_push_pop )
-    CDSSTRESS_FCDeque_HeavyValue( fc_with_heavy_value )
     CDSSTRESS_RWQueue( simple_queue_push_pop )
-    CDSSTRESS_StdQueue( simple_queue_push_pop )
 
 #undef CDSSTRESS_Queue_F
 #define CDSSTRESS_Queue_F( test_fixture, type_name ) \
diff --git a/test/stress/queue/queue_type.h b/test/stress/queue/queue_type.h
index c2077083..bcb14b76 100644
--- a/test/stress/queue/queue_type.h
+++ b/test/stress/queue/queue_type.h
@@ -684,27 +684,19 @@ namespace cds_test {
 
 #if defined(CDS_STRESS_TEST_LEVEL) && CDS_STRESS_TEST_LEVEL > 0
 #   define CDSSTRESS_MSQueue_1( test_fixture ) \
-        CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_seqcst  ) \
         CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_ic      ) \
-        CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_seqcst ) \
         CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_ic     ) \
 
 #   define CDSSTRESS_MoirQueue_1( test_fixture ) \
-        CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_seqcst    ) \
         CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_ic        ) \
-        CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_seqcst   ) \
         CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_ic       ) \
 
 #   define CDSSTRESS_OptimsticQueue_1( test_fixture ) \
-        CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_seqcst  ) \
         CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_ic      ) \
-        CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_seqcst ) \
         CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_ic     ) \
 
 #   define CDSSTRESS_BasketQueue_1( test_fixture ) \
-        CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_seqcst  ) \
         CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_ic      ) \
-        CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_seqcst ) \
         CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_ic     ) \
 
 #   define CDSSTRESS_FCQueue_1( test_fixture ) \
@@ -718,59 +710,39 @@ namespace cds_test {
         CDSSTRESS_Queue_F( test_fixture, FCQueue_list_elimination   ) \
 
 #   define CDSSTRESS_FCDeque_1( test_fixture ) \
-        CDSSTRESS_Queue_F( test_fixture, FCDequeL_mutex             ) \
-        CDSSTRESS_Queue_F( test_fixture, FCDequeL_stat              ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_ss           )\
         CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_sm           ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_mm           ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeL_elimination       ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost             ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_elimination ) \
-        CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_elimination_stat ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_ss           ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_sm           ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_mm           ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeR_elimination       ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost             ) \
         CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_elimination ) \
-        CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_elimination_stat ) \
 
 #   define CDSSTRESS_FCDeque_HeavyValue_1( test_fixture ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_ss          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_ss_stat     ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_sm          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_sm_stat     ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_mm          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_mm_stat     ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_elimination      ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_elimination_stat ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_boost            ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_boost_stat       ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_boost_elimination) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_boost_elimination_stat ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_default          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_mutex            ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_stat             ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_ss          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_ss_stat     ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_sm          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_sm_stat     ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_mm          ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_mm_stat     ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_elimination      ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_elimination_stat ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_boost            ) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_boost_stat       ) \
         CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_boost_elimination) \
-        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_boost_elimination_stat ) \
 
 #   define CDSSTRESS_RWQueue_1( test_fixture ) \
         CDSSTRESS_Queue_F( test_fixture, RWQueue_Spin_ic ) \
 
 #   define CDSSTRESS_SegmentedQueue_1( test_fixture ) \
-        CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_mutex_padding    ) \
         CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin_padding    ) \
-        CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_mutex_padding   ) \
 
 #   define CDSSTRESS_StdQueue_1( test_fixture ) \
         CDSSTRESS_Queue_F( test_fixture, StdQueue_deque_Mutex   ) \
@@ -791,86 +763,47 @@ namespace cds_test {
 
 #define CDSSTRESS_MSQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, MSQueue_HP         ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_stat    ) \
     CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP        ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_stat   ) \
     CDSSTRESS_MSQueue_1( test_fixture )
 
 #define CDSSTRESS_MoirQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP       ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_stat  ) \
     CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP      ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_stat ) \
     CDSSTRESS_MoirQueue_1( test_fixture )
 
 #define CDSSTRESS_OptimsticQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP         ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_stat    ) \
     CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP        ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_stat   ) \
     CDSSTRESS_OptimsticQueue_1( test_fixture )
 
 #define CDSSTRESS_BasketQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP         ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_stat    ) \
     CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP        ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_stat   ) \
     CDSSTRESS_BasketQueue_1( test_fixture )
 
 #define CDSSTRESS_FCQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_deque              ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_stat         ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_ss_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_sm_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_mm_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_elimination_stat ) \
     CDSSTRESS_Queue_F( test_fixture, FCQueue_list               ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_stat          ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_ss_stat  ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_sm_stat  ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_mm_stat  ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_elimination_stat ) \
     CDSSTRESS_FCQueue_1( test_fixture )
 
 
 #define CDSSTRESS_FCDeque( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, FCDequeL_default           ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_ss_stat      ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_sm_stat      ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_mm_stat      ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_elimination_stat  ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_stat        ) \
     CDSSTRESS_Queue_F( test_fixture, FCDequeR_default           ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_mutex             ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_stat              ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_ss_stat      ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_sm_stat      ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_mm_stat      ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_elimination_stat  ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_stat        ) \
     CDSSTRESS_FCDeque_1( test_fixture )
 
 #define CDSSTRESS_FCDeque_HeavyValue( test_fixture ) \
     CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_default  ) \
-    CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_mutex    ) \
-    CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_stat     ) \
     CDSSTRESS_FCDeque_HeavyValue_1( test_fixture )
 
 #define CDSSTRESS_RWQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, RWQueue_Spin   ) \
-    CDSSTRESS_Queue_F( test_fixture, RWQueue_mutex  ) \
     CDSSTRESS_RWQueue_1( test_fixture )
 
 #define CDSSTRESS_SegmentedQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin         ) \
     CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin_padding ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin_stat    ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_mutex        ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_mutex_stat   ) \
     CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin        ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin_stat   ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_mutex       ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_mutex_stat  ) \
     CDSSTRESS_SegmentedQueue_1( test_fixture )
 
 #define CDSSTRESS_VyukovQueue( test_fixture ) \
diff --git a/test/stress/queue/random.cpp b/test/stress/queue/random.cpp
index 7c5dea9b..5a4188a6 100644
--- a/test/stress/queue/random.cpp
+++ b/test/stress/queue/random.cpp
@@ -237,10 +237,7 @@ namespace {
     CDSSTRESS_MoirQueue( queue_random )
     CDSSTRESS_BasketQueue( queue_random )
     CDSSTRESS_OptimsticQueue( queue_random )
-    CDSSTRESS_FCQueue( queue_random )
-    CDSSTRESS_FCDeque( queue_random )
     CDSSTRESS_RWQueue( queue_random )
-    CDSSTRESS_StdQueue( queue_random )
 
 #undef CDSSTRESS_Queue_F
 #define CDSSTRESS_Queue_F( test_fixture, type_name ) \
diff --git a/test/stress/queue/spsc_queue.cpp b/test/stress/queue/spsc_queue.cpp
index 4fa440a6..bc04b787 100644
--- a/test/stress/queue/spsc_queue.cpp
+++ b/test/stress/queue/spsc_queue.cpp
@@ -200,13 +200,13 @@ namespace {
         }
     };
 
-    //CDSSTRESS_MSQueue( spsc_queue )
-    //CDSSTRESS_MoirQueue( spsc_queue )
-    //CDSSTRESS_BasketQueue( spsc_queue )
-    //CDSSTRESS_OptimsticQueue( spsc_queue )
+    CDSSTRESS_MSQueue( spsc_queue )
+    CDSSTRESS_MoirQueue( spsc_queue )
+    CDSSTRESS_BasketQueue( spsc_queue )
+    CDSSTRESS_OptimsticQueue( spsc_queue )
     //CDSSTRESS_FCQueue( spsc_queue )
     //CDSSTRESS_FCDeque( spsc_queue )
-    //CDSSTRESS_RWQueue( spsc_queue )
+    CDSSTRESS_RWQueue( spsc_queue )
     //CDSSTRESS_StdQueue( spsc_queue )
 
 #undef CDSSTRESS_Queue_F