From 7e58366e3d89fd5b1e3db85d2c6e1f1385f2927f Mon Sep 17 00:00:00 2001 From: Peizhao Ou Date: Wed, 29 Nov 2017 15:28:39 -0800 Subject: [PATCH] Trims down unnecessary pqueue test cases --- test/stress/pqueue/pop.cpp | 26 -------------------------- test/stress/pqueue/push.cpp | 25 ------------------------- test/stress/pqueue/push_pop.cpp | 33 --------------------------------- 3 files changed, 84 deletions(-) diff --git a/test/stress/pqueue/pop.cpp b/test/stress/pqueue/pop.cpp index f1d3d14b..3006c314 100644 --- a/test/stress/pqueue/pop.cpp +++ b/test/stress/pqueue/pop.cpp @@ -209,7 +209,6 @@ namespace { test( pq ); \ } CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_less ) - CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_less_stat ) CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_cmp ) //CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_mutex ) // too slow @@ -233,50 +232,27 @@ namespace { pqueue_type pq; \ test( pq ); \ } - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_vector ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_vector_stat ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_deque ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_deque_stat ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_deque ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_deque_stat ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_stable_vector ) - CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_stable_vector_stat ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_min_stat ) // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_max ) // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_max_stat ) // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_min ) // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_min_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_min_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_min_stat ) #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_min_stat ) #endif CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_HP_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_HP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_HP_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_HP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_DHP_max ) - CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_DHP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_DHP_min ) - CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_DHP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpi_max ) CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpi_min ) CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpb_max ) @@ -289,8 +265,6 @@ namespace { #endif CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_vector_spin ) - CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_vector_mutex ) CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_deque_spin ) - CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_deque_mutex ) } // namespace diff --git a/test/stress/pqueue/push.cpp b/test/stress/pqueue/push.cpp index 71640a9a..73942706 100644 --- a/test/stress/pqueue/push.cpp +++ b/test/stress/pqueue/push.cpp @@ -170,7 +170,6 @@ namespace pqueue { test( pq ); \ } CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_less ) - CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_less_stat ) CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_cmp ) //CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_mutex ) // too slow @@ -194,50 +193,28 @@ namespace pqueue { pqueue_type pq; \ test( pq ); \ } - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_vector ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_vector_stat ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_deque ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_deque_stat ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_boost_deque ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_boost_deque_stat ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_boost_stable_vector ) - CDSSTRESS_PriorityQueue( pqueue_push, FCPQueue_boost_stable_vector_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_HP_max ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_HP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_HP_min ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_HP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_DHP_max ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_DHP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_DHP_min ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_DHP_min_stat ) // CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpi_max ) // CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpi_max_stat ) // CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpi_min ) // CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpi_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpb_max ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpb_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpb_min ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpb_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpt_max ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpt_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpt_min ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_gpt_min_stat ) #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_max ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_min ) - CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_min_stat ) #endif CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_max ) - CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_min ) - CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_max ) - CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_min ) - CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpi_max ) CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpi_min ) CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpb_max ) @@ -250,9 +227,7 @@ namespace pqueue { #endif CDSSTRESS_PriorityQueue( pqueue_push, StdPQueue_vector_spin ) - CDSSTRESS_PriorityQueue( pqueue_push, StdPQueue_vector_mutex ) CDSSTRESS_PriorityQueue( pqueue_push, StdPQueue_deque_spin ) - CDSSTRESS_PriorityQueue( pqueue_push, StdPQueue_deque_mutex ) } // namespace queue diff --git a/test/stress/pqueue/push_pop.cpp b/test/stress/pqueue/push_pop.cpp index 0b99adc6..eff6abb5 100644 --- a/test/stress/pqueue/push_pop.cpp +++ b/test/stress/pqueue/push_pop.cpp @@ -224,7 +224,6 @@ namespace { test( pq ); \ } CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_less ) - CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_less_stat ) CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_cmp ) //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_mutex ) // too slow @@ -248,66 +247,36 @@ namespace { pqueue_type pq; \ test( pq ); \ } - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_vector ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_vector_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_deque ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_deque_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_deque ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_deque_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_stable_vector ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_stable_vector_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_min_stat ) // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_max ) // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_max_stat ) // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_min ) // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_min_stat ) #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_min_stat ) #endif CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_max ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_max ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_max_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_max_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_min ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_min ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_min_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_min_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_max ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_max ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_max ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_max_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_max_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_max_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_min ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_min ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_min ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_min_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_min_stat ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_min_stat ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpi_max ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpi_min ) CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpb_max ) @@ -324,8 +293,6 @@ namespace { #endif CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_vector_spin ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_vector_mutex ) CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_deque_spin ) - CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_deque_mutex ) } // namespace -- 2.34.1