Removes gpt related benchmarks

diff --git a/test/stress/sequential/sequential-map/map_type_split_list.h b/test/stress/sequential/sequential-map/map_type_split_list.h
index 2c0eefcd5cf8a1c1fcd6228b0036c558eb323471..0eb56bbb4698435742279607fcdbe4c31fc5603f 100644 (file)
--- a/test/stress/sequential/sequential-map/map_type_split_list.h
+++ b/test/stress/sequential/sequential-map/map_type_split_list.h
@@ -649,18 +649,13 @@ namespace map {
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_HP_st_less,                 key_type, value_type ) \
 
 #   define CDSSTRESS_SplitListMap_RCU_1( fixture, test_case, key_type, value_type ) \
-        CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPT_dyn_cmp,         key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPI_st_cmp,          key_type, value_type ) \
-        CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPT_st_cmp,          key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPB_dyn_less,        key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPI_st_less,         key_type, value_type ) \
-        CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPT_st_less,         key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPB_dyn_cmp,            key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPI_st_cmp,             key_type, value_type ) \
-        CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPT_st_cmp,             key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPB_dyn_less,           key_type, value_type ) \
         CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPI_st_less,            key_type, value_type ) \
-        CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPT_st_less,            key_type, value_type ) \
         CDSSTRESS_SplitListMap_SHRCU( fixture, test_case, key_type, value_type ) \
 
 #   define CDSSTRESS_SplitListMap_1( fixture, test_case, key_type, value_type ) \
@@ -693,13 +688,10 @@ namespace map {
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPB_dyn_cmp_swar,    key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPB_st_cmp,          key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPI_dyn_less,        key_type, value_type ) \
-    CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPT_dyn_less,        key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Michael_RCU_GPB_st_less,         key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPI_dyn_cmp,            key_type, value_type ) \
-    CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPT_dyn_cmp,            key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPB_st_cmp,             key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPI_dyn_less,           key_type, value_type ) \
-    CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPT_dyn_less,           key_type, value_type ) \
     CDSSTRESS_SplitListMap_case( fixture, test_case, SplitList_Lazy_RCU_GPB_st_less,            key_type, value_type ) \
     CDSSTRESS_SplitListMap_RCU_1( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_SplitListMap_RCU_2( fixture, test_case, key_type, value_type ) \

diff --git a/test/stress/sequential/sequential-set/set_type_michael.h b/test/stress/sequential/sequential-set/set_type_michael.h
index 2682511f462325a8127a13868080bf4bc9505c34..a454033057fce3790f37e4e3d073b90da2b50bfe 100644 (file)
--- a/test/stress/sequential/sequential-set/set_type_michael.h
+++ b/test/stress/sequential/sequential-set/set_type_michael.h
@@ -277,11 +277,9 @@ namespace set {
 #   define CDSSTRESS_MichaelSet_RCU_1( fixture, test_case, key_type, value_type ) \
         CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_RCU_GPB_cmp,             key_type, value_type ) \
         CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_RCU_GPI_less,            key_type, value_type ) \
-        CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_RCU_GPT_less,            key_type, value_type ) \
         \
         CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_Lazy_RCU_GPB_cmp,        key_type, value_type ) \
         CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_Lazy_RCU_GPI_less,       key_type, value_type ) \
-        CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_Lazy_RCU_GPT_less,       key_type, value_type ) \
         \
         CDSSTRESS_MichaelSet_SHRCU( fixture, test_case, key_type, value_type ) \
 
@@ -308,11 +306,9 @@ namespace set {
 
 #define CDSSTRESS_MichaelSet_RCU( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_RCU_GPI_cmp,             key_type, value_type ) \
-    CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_RCU_GPT_cmp,             key_type, value_type ) \
     CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_RCU_GPB_less,            key_type, value_type ) \
     \
     CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_Lazy_RCU_GPI_cmp,        key_type, value_type ) \
-    CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_Lazy_RCU_GPT_cmp,        key_type, value_type ) \
     CDSSTRESS_MichaelSet_case( fixture, test_case, MichaelSet_Lazy_RCU_GPB_less,       key_type, value_type ) \
     \
     CDSSTRESS_MichaelSet_RCU_1( fixture, test_case, key_type, value_type ) \

diff --git a/test/stress/sequential/sequential-set/set_type_skip_list.h b/test/stress/sequential/sequential-set/set_type_skip_list.h
index 922c544eacd5de8f400e9f60b42a0dc630f3c518..45e9908c61b6a344b42c0b71853fc85d7f4949db 100644 (file)
--- a/test/stress/sequential/sequential-set/set_type_skip_list.h
+++ b/test/stress/sequential/sequential-set/set_type_skip_list.h
@@ -396,10 +396,8 @@ namespace set {
 #   define CDSSTRESS_SkipListSet_RCU_1( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpb_less_turbo32,        key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpi_cmp_turbo32,         key_type, value_type ) \
-    CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpt_cmp_turbo32,         key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpb_less_xorshift32,      key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpi_cmp_xorshift32,       key_type, value_type ) \
-    CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpt_cmp_xorshift32,       key_type, value_type ) \
     CDSSTRESS_SkipListSet_SHRCU( fixture, test_case, key_type, value_type ) \
 
 #else
@@ -422,10 +420,8 @@ namespace set {
 
 #define CDSSTRESS_SkipListSet_RCU( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpi_less_turbo32,        key_type, value_type ) \
-    CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpt_less_turbo32,        key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpb_cmp_turbo32,         key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpi_less_xorshift32,      key_type, value_type ) \
-    CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpt_less_xorshift32,      key_type, value_type ) \
     CDSSTRESS_SkipListSet_case( fixture, test_case, SkipListSet_rcu_gpb_cmp_xorshift32,       key_type, value_type ) \
     CDSSTRESS_SkipListSet_RCU_1( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_SkipListSet_RCU_2( fixture, test_case, key_type, value_type ) \

diff --git a/test/stress/sequential/sequential-set/set_type_split_list.h b/test/stress/sequential/sequential-set/set_type_split_list.h
index 0e7621f378affff2b431f140837b5ced97cdff15..d9401d4ad5639b60c00ef305cd9b90248de6d211 100644 (file)
--- a/test/stress/sequential/sequential-set/set_type_split_list.h
+++ b/test/stress/sequential/sequential-set/set_type_split_list.h
@@ -622,7 +622,6 @@ namespace set {
         CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPT_st_cmp,          key_type, value_type ) \
         CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPB_dyn_less,        key_type, value_type ) \
         CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPI_st_less,         key_type, value_type ) \
-        CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPT_st_less,         key_type, value_type ) \
         \
         CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPB_dyn_cmp,            key_type, value_type ) \
         CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPB_st_cmp,             key_type, value_type ) \
@@ -656,19 +655,14 @@ namespace set {
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPI_dyn_cmp,         key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPB_dyn_cmp,         key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPB_dyn_cmp_swar,    key_type, value_type ) \
-    CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPT_dyn_cmp,         key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPB_st_cmp,          key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPI_dyn_less,        key_type, value_type ) \
-    CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPT_dyn_less,        key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Michael_RCU_GPB_st_less,         key_type, value_type ) \
     \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPI_dyn_cmp,            key_type, value_type ) \
-    CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPT_dyn_cmp,            key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPI_st_cmp,             key_type, value_type ) \
-    CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPT_st_cmp,             key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPB_dyn_less,           key_type, value_type ) \
     CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPI_st_less,            key_type, value_type ) \
-    CDSSTRESS_SplitListSet_case( fixture, test_case, SplitList_Lazy_RCU_GPT_st_less,            key_type, value_type ) \
     CDSSTRESS_SplitListSet_RCU_1( fixture, test_case, key_type, value_type ) \
     CDSSTRESS_SplitListSet_RCU_2( fixture, test_case, key_type, value_type ) \
 

diff --git a/test/stress/sequential/sequential_queue.cpp b/test/stress/sequential/sequential_queue.cpp
index 1a537dd63b6804a5a0bd703e3eb4ff7e04bc7a38..4fe932a58ae37089bdc8b79f44af0d79ecab35b9 100644 (file)
--- a/test/stress/sequential/sequential_queue.cpp
+++ b/test/stress/sequential/sequential_queue.cpp
@@ -151,7 +151,7 @@ CDSSTRESS_Sequential_MoirQueue(simple_sequential_queue);
 CDSSTRESS_Sequential_BasketQueue(simple_sequential_queue);
 CDSSTRESS_Sequential_OptimsticQueue(simple_sequential_queue);
 CDSSTRESS_Sequential_RWQueue(simple_sequential_queue);
-CDSSTRESS_Sequential_WeakRingBuffer(simple_sequential_queue);
+//CDSSTRESS_Sequential_WeakRingBuffer(simple_sequential_queue);
 
 // ********************************************************************
 // SegmentedQueue test