From b9cc349d6c078542911df01f2a98840a0183581a Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 12 Mar 2017 10:40:43 +0300 Subject: [PATCH] Added setup for set-stress-iter-erase --- test/stress/data/test-debug.conf | 13 +++++++ test/stress/data/test-express-x86.conf | 13 +++++++ test/stress/data/test-express.conf | 13 +++++++ test/stress/data/test.conf | 15 +++++++- test/stress/set/iter_erase/set_iter_erase.cpp | 35 ++++++------------- test/stress/set/iter_erase/set_iter_erase.h | 7 ---- 6 files changed, 63 insertions(+), 33 deletions(-) diff --git a/test/stress/data/test-debug.conf b/test/stress/data/test-debug.conf index 29b8d9c3..8fc92197 100644 --- a/test/stress/data/test-debug.conf +++ b/test/stress/data/test-debug.conf @@ -231,6 +231,19 @@ PassCount=500 FeldmanMapHeadBits=8 FeldmanMapArrayBits=8 +[map_iter_erase] +MapSize=5000 +InsThreadCount=3 +DelThreadCount=2 +ExtractThreadCount=2 +FindThreadCount=2 +MaxLoadFactor=4 +PassCount=400 + +# *** FeldmanHashMap properties +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 + [free_list] ThreadCount=4 PassCount=100000 \ No newline at end of file diff --git a/test/stress/data/test-express-x86.conf b/test/stress/data/test-express-x86.conf index 01a05e7d..6c6ff5ce 100644 --- a/test/stress/data/test-express-x86.conf +++ b/test/stress/data/test-express-x86.conf @@ -230,6 +230,19 @@ PassCount=500 FeldmanMapHeadBits=8 FeldmanMapArrayBits=8 +[map_iter_erase] +MapSize=5000 +InsThreadCount=2 +DelThreadCount=2 +ExtractThreadCount=2 +FindThreadCount=2 +MaxLoadFactor=4 +PassCount=200 + +# *** FeldmanHashMap properties +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 + [free_list] ThreadCount=4 PassCount=1000000 diff --git a/test/stress/data/test-express.conf b/test/stress/data/test-express.conf index ec4c979d..05dc3677 100644 --- a/test/stress/data/test-express.conf +++ b/test/stress/data/test-express.conf @@ -229,6 +229,19 @@ PassCount=1000 FeldmanMapHeadBits=8 FeldmanMapArrayBits=8 +[map_iter_erase] +MapSize=5000 +InsThreadCount=3 +DelThreadCount=2 +ExtractThreadCount=2 +FindThreadCount=2 +MaxLoadFactor=4 +PassCount=500 + +# *** FeldmanHashMap properties +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 + [free_list] ThreadCount=4 PassCount=1000000 \ No newline at end of file diff --git a/test/stress/data/test.conf b/test/stress/data/test.conf index 10d9c249..1cf4ca8a 100644 --- a/test/stress/data/test.conf +++ b/test/stress/data/test.conf @@ -200,7 +200,6 @@ CuckooProbesetThreshold=0 FeldmanMapHeadBits=8 FeldmanMapArrayBits=8 - [map_delodd] MapSize=10000 InsThreadCount=4 @@ -230,6 +229,20 @@ PassCount=1000 FeldmanMapHeadBits=8 FeldmanMapArrayBits=8 +[map_iter_erase] +MapSize=5000 +InsThreadCount=4 +DelThreadCount=4 +ExtractThreadCount=2 +FindThreadCount=2 +MaxLoadFactor=4 +PassCount=1000 + +# *** FeldmanHashMap properties +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 + + [free_list] ThreadCount=4 PassCount=1000000 \ No newline at end of file diff --git a/test/stress/set/iter_erase/set_iter_erase.cpp b/test/stress/set/iter_erase/set_iter_erase.cpp index 79874e8e..d984b61c 100644 --- a/test/stress/set/iter_erase/set_iter_erase.cpp +++ b/test/stress/set/iter_erase/set_iter_erase.cpp @@ -32,28 +32,23 @@ namespace set { - size_t Set_Iter_Del3::s_nSetSize = 1000000; + size_t Set_Iter_Del3::s_nSetSize = 5000; size_t Set_Iter_Del3::s_nInsThreadCount = 4; size_t Set_Iter_Del3::s_nDelThreadCount = 4; size_t Set_Iter_Del3::s_nExtractThreadCount = 4; size_t Set_Iter_Del3::s_nFindThreadCount = 2; - size_t Set_Iter_Del3::s_nMaxLoadFactor = 8; - size_t Set_Iter_Del3::s_nInsertPassCount = 100; - - size_t Set_Iter_Del3::s_nCuckooInitialSize = 1024; - size_t Set_Iter_Del3::s_nCuckooProbesetSize = 16; - size_t Set_Iter_Del3::s_nCuckooProbesetThreshold = 0; - - size_t Set_Iter_Del3::s_nFeldmanSet_HeadBits = 10; - size_t Set_Iter_Del3::s_nFeldmanSet_ArrayBits = 4; + size_t Set_Iter_Del3::s_nMaxLoadFactor = 4; + size_t Set_Iter_Del3::s_nInsertPassCount = 1000; + size_t Set_Iter_Del3::s_nFeldmanSet_HeadBits = 8; + size_t Set_Iter_Del3::s_nFeldmanSet_ArrayBits = 8; size_t Set_Iter_Del3::s_nLoadFactor = 1; std::vector Set_Iter_Del3::m_arrData; void Set_Iter_Del3::SetUpTestCase() { - cds_test::config const& cfg = get_config( "map_delodd" ); + cds_test::config const& cfg = get_config( "map_iter_erase" ); s_nSetSize = cfg.get_size_t( "MapSize", s_nSetSize ); if ( s_nSetSize < 1000 ) @@ -73,25 +68,15 @@ namespace set { s_nInsertPassCount = cfg.get_size_t( "PassCount", s_nInsertPassCount ); if ( s_nInsertPassCount == 0 ) - s_nInsertPassCount = 100; - - s_nCuckooInitialSize = cfg.get_size_t( "CuckooInitialSize", s_nCuckooInitialSize ); - if ( s_nCuckooInitialSize < 256 ) - s_nCuckooInitialSize = 256; - - s_nCuckooProbesetSize = cfg.get_size_t( "CuckooProbesetSize", s_nCuckooProbesetSize ); - if ( s_nCuckooProbesetSize < 8 ) - s_nCuckooProbesetSize = 8; - - s_nCuckooProbesetThreshold = cfg.get_size_t( "CuckooProbesetThreshold", s_nCuckooProbesetThreshold ); + s_nInsertPassCount = 1000; s_nFeldmanSet_HeadBits = cfg.get_size_t( "FeldmanMapHeadBits", s_nFeldmanSet_HeadBits ); if ( s_nFeldmanSet_HeadBits == 0 ) - s_nFeldmanSet_HeadBits = 2; + s_nFeldmanSet_HeadBits = 8; s_nFeldmanSet_ArrayBits = cfg.get_size_t( "FeldmanMapArrayBits", s_nFeldmanSet_ArrayBits ); if ( s_nFeldmanSet_ArrayBits == 0 ) - s_nFeldmanSet_ArrayBits = 2; + s_nFeldmanSet_ArrayBits = 8; m_arrData.resize( s_nSetSize ); for ( size_t i = 0; i < s_nSetSize; ++i ) @@ -106,7 +91,7 @@ namespace set { std::vector Set_Iter_Del3_LF::get_load_factors() { - cds_test::config const& cfg = get_config( "map_delodd" ); + cds_test::config const& cfg = get_config( "map_iter_erase" ); s_nMaxLoadFactor = cfg.get_size_t( "MaxLoadFactor", s_nMaxLoadFactor ); if ( s_nMaxLoadFactor == 0 ) diff --git a/test/stress/set/iter_erase/set_iter_erase.h b/test/stress/set/iter_erase/set_iter_erase.h index 9537c686..1615311d 100644 --- a/test/stress/set/iter_erase/set_iter_erase.h +++ b/test/stress/set/iter_erase/set_iter_erase.h @@ -125,10 +125,6 @@ namespace set { static size_t s_nInsertPassCount; static size_t s_nFindThreadCount; // find thread count - static size_t s_nCuckooInitialSize; // initial size for CuckooSet - static size_t s_nCuckooProbesetSize; // CuckooSet probeset size (only for list-based probeset) - static size_t s_nCuckooProbesetThreshold; // CUckooSet probeset threshold (0 - use default) - static size_t s_nFeldmanSet_HeadBits; static size_t s_nFeldmanSet_ArrayBits; @@ -853,9 +849,6 @@ namespace set { template void run_feldman(); - - template - void run_feldman_reverse(); }; class Set_Iter_Del3_reverse: public Set_Iter_Del3 -- 2.34.1