From 8a77a98b2ed8f511e4df725a11ee83bdf1012822 Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 24 Jan 2017 22:07:33 +0300 Subject: [PATCH] Removed old test configs --- test/stress/data/test-debug.conf | 68 +++--------------------- test/stress/data/test-express-x86.conf | 61 +++------------------ test/stress/data/test-express.conf | 62 +++------------------- test/stress/data/test.conf | 73 +++++--------------------- 4 files changed, 30 insertions(+), 234 deletions(-) diff --git a/test/stress/data/test-debug.conf b/test/stress/data/test-debug.conf index 49d69e4a..59d2d053 100644 --- a/test/stress/data/test-debug.conf +++ b/test/stress/data/test-debug.conf @@ -113,30 +113,6 @@ PushThreadCount=4 PopThreadCount=4 QueueSize=10000 -[Map_Nonconcurrent_iterator] -MapSize=1000000 - -[Map_Nonconcurrent_iterator_MT] -ThreadCount=4 -MapSize=1000000 - -[map_find_int] -ThreadCount=2 -MapSize=10000 -PercentExists=50 -PassCount=2 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=256 -CuckooProbesetSize=8 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - [map_find_string] ThreadCount=2 MapSize=10000 @@ -152,24 +128,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - -[map_insdel_int] -InsertThreadCount=3 -DeleteThreadCount=3 -ThreadPassCount=2 -MapSize=30000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=256 -CuckooProbesetSize=8 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_func] InsertThreadCount=2 @@ -187,7 +146,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_item_int] InsertThreadCount=4 @@ -205,7 +164,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_string] InsertThreadCount=4 @@ -223,22 +182,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - -[map_insfind_int] -ThreadCount=0 -MapSize=2000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=256 -CuckooProbesetSize=8 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdelfind] InitialMapSize=50000 @@ -256,7 +200,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_delodd] MapSize=10000 @@ -275,7 +219,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [free_list] ThreadCount=4 diff --git a/test/stress/data/test-express-x86.conf b/test/stress/data/test-express-x86.conf index f87e6e39..6b459939 100644 --- a/test/stress/data/test-express-x86.conf +++ b/test/stress/data/test-express-x86.conf @@ -112,23 +112,6 @@ PushThreadCount=2 PopThreadCount=2 QueueSize=500000 -[map_find_int] -ThreadCount=4 -MapSize=100000 -PercentExists=50 -PassCount=4 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - [map_find_string] ThreadCount=4 MapSize=100000 @@ -144,24 +127,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - -[map_insdel_int] -InsertThreadCount=2 -DeleteThreadCount=2 -ThreadPassCount=10 -MapSize=50000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_func] InsertThreadCount=2 @@ -179,7 +145,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_item_int] InsertThreadCount=2 @@ -197,7 +163,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_string] InsertThreadCount=2 @@ -215,22 +181,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - -[map_insfind_int] -ThreadCount=0 -MapSize=10000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdelfind] InitialMapSize=500000 @@ -248,7 +199,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_delodd] MapSize=10000 @@ -267,7 +218,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [free_list] ThreadCount=4 diff --git a/test/stress/data/test-express.conf b/test/stress/data/test-express.conf index 7f29c24c..c3630383 100644 --- a/test/stress/data/test-express.conf +++ b/test/stress/data/test-express.conf @@ -12,7 +12,6 @@ dhp_init_guard_count=16 # cds::urcu::gc initialization parameters rcu_buffer_size=256 - [Stack_Push] ThreadCount=8 StackSize=500000 @@ -112,23 +111,6 @@ PushThreadCount=4 PopThreadCount=4 QueueSize=500000 -[map_find_int] -ThreadCount=8 -MapSize=100000 -PercentExists=50 -PassCount=4 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - [map_find_string] ThreadCount=8 MapSize=100000 @@ -144,24 +126,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - -[map_insdel_int] -InsertThreadCount=4 -DeleteThreadCount=4 -ThreadPassCount=15 -MapSize=50000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_func] InsertThreadCount=4 @@ -179,7 +144,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_item_int] InsertThreadCount=4 @@ -197,7 +162,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdel_string] InsertThreadCount=4 @@ -215,22 +180,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 - -[map_insfind_int] -ThreadCount=0 -MapSize=10000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_insdelfind] InitialMapSize=500000 @@ -248,7 +198,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [map_delodd] MapSize=10000 @@ -267,7 +217,7 @@ CuckooProbesetThreshold=0 # *** FeldmanHashMap properties FeldmanMapHeadBits=8 -FeldmanMapArrayBits=4 +FeldmanMapArrayBits=8 [free_list] ThreadCount=4 diff --git a/test/stress/data/test.conf b/test/stress/data/test.conf index 35449f8e..44e520f9 100644 --- a/test/stress/data/test.conf +++ b/test/stress/data/test.conf @@ -113,23 +113,6 @@ PushThreadCount=4 PopThreadCount=4 QueueSize=10000000 -[map_find_int] -ThreadCount=8 -MapSize=2000000 -PercentExists=50 -PassCount=1 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 - [map_find_string] ThreadCount=8 MapSize=2000000 @@ -144,25 +127,8 @@ CuckooProbesetSize=16 CuckooProbesetThreshold=0 # *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 - -[map_insdel_int] -InsertThreadCount=4 -DeleteThreadCount=4 -ThreadPassCount=5 -MapSize=50000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 [map_insdel_func] InsertThreadCount=4 @@ -179,8 +145,8 @@ CuckooProbesetSize=16 CuckooProbesetThreshold=0 # *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 [map_insdel_item_int] InsertThreadCount=4 @@ -196,8 +162,8 @@ CuckooProbesetSize=16 # 0 - use default CuckooProbesetThreshold=0 # *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 [map_insdel_string] InsertThreadCount=4 @@ -213,23 +179,8 @@ CuckooProbesetSize=16 CuckooProbesetThreshold=0 # *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 - -[map_insfind_int] -ThreadCount=0 -MapSize=5000 -MaxLoadFactor=4 - -# *** Cuckoo map properties -CuckooInitialSize=1024 -CuckooProbesetSize=16 -# 0 - use default -CuckooProbesetThreshold=0 - -# *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 [map_insdelfind] InitialMapSize=500000 @@ -246,8 +197,8 @@ CuckooProbesetSize=16 CuckooProbesetThreshold=0 # *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 [map_delodd] @@ -266,8 +217,8 @@ CuckooProbesetSize=16 CuckooProbesetThreshold=0 # *** FeldmanHashMap properties -FeldmanMapHeadBits=10 -FeldmanMapArrayBits=4 +FeldmanMapHeadBits=8 +FeldmanMapArrayBits=8 [free_list] ThreadCount=4 -- 2.34.1