X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=test%2Fstress%2Fdata%2Ftest-express.conf;h=05dc3677ec5f01e27bc680f61b8dd459cfc4ef2f;hp=c9bec83bc8a93b33c96bf6fb4ca372c328c9852c;hb=dab7e44fb97097a9d7ccbed46e067a30b03340a7;hpb=9112d00bdff81ddb743a88c3c6467339840a8dd6

diff --git a/test/stress/data/test-express.conf b/test/stress/data/test-express.conf
index c9bec83b..05dc3677 100644
--- a/test/stress/data/test-express.conf
+++ b/test/stress/data/test-express.conf
@@ -1,65 +1,17 @@
 [General]
-# HZP scan strategy, possible values are "classic", "inplace". Default is "classic"
-HZP_scan_strategy=inplace
+# HP scan strategy, possible values are "classic", "inplace". Default is "classic"
+hp_scan_strategy=inplace
 # Hazard pointer count per thread, for gc::HP
 hazard_pointer_count=72
+#hp_max_thread_count=32
+#hp_retired_ptr_count=256
 
 # cds::gc::DHP initialization parameters
-dhp_liberate_threshold=1024
 dhp_init_guard_count=16
-dhp_epoch_count=16
 
 # cds::urcu::gc initialization parameters
 rcu_buffer_size=256
 
-[Atomic_ST]
-iterCount=1000000
-
-[thread_init_fini]
-ThreadCount=8
-PassCount=100000
-
-[Allocator_ST]
-PassCount=5
-# Total allocation per pass, Megabytes
-AllocPerPass=256
-
-[Linux_Scale]
-# Allocation count per test
-PassCount=100000
-# Max allocated block size in bytes
-MaxBlockSize=10000
-# Max thread count. 0 is processor_count * 2
-MaxThreadCount=4
-
-[Hoard_ThreadTest]
-MinBlockSize=16
-MaxBlockSize=64
-BlockCount=10000
-PassCount=10
-# Max thread count. 0 is processor_count * 2
-MaxThreadCount=4
-
-[Larson]
-MinBlockSize=8
-MaxBlockSize=1024
-BlocksPerThread=1000
-PassCount=1000000
-# Max thread count. 0 is processor_count * 2
-MaxThreadCount=4
-
-[Random_Alloc]
-DataSize=1000
-MinBlockSize=8
-MaxBlockSize=65000
-PassCount=100000
-# Max thread count. 0 is processor_count * 2
-MaxThreadCount=4
-
-[Spinlock_MT]
-ThreadCount=8
-LoopCount=1000000
-
 [Stack_Push]
 ThreadCount=8
 StackSize=500000
@@ -88,7 +40,7 @@ FCCompactFactor=64
 
 [queue_push]
 ThreadCount=8
-QueueSize=500000
+QueueSize=3000000
 # SegmentedQueue parameters:
 # SegmentedQueue_Iterate: 
 #    1 - run test iteratively for segment size from 4 up to SegmentedQueue_SegmentSize
@@ -98,7 +50,7 @@ SegmentedQueue_SegmentSize=64
 
 [queue_pop]
 ThreadCount=8
-QueueSize=500000
+QueueSize=3000000
 # SegmentedQueue parameters:
 # SegmentedQueue_Iterate: 
 #    1 - run test iteratively for segment size from 4 up to SegmentedQueue_SegmentSize
@@ -109,7 +61,7 @@ SegmentedQueue_SegmentSize=64
 [queue_push_pop]
 ConsumerCount=4
 ProducerCount=4
-QueueSize=500000
+QueueSize=3000000
 # SegmentedQueue parameters:
 # SegmentedQueue_Iterate: 
 #    1 - run test iteratively for segment size from 4 up to SegmentedQueue_SegmentSize
@@ -119,7 +71,7 @@ SegmentedQueue_SegmentSize=64
 
 [queue_random]
 ThreadCount=8
-QueueSize=500000
+QueueSize=3000000
 # SegmentedQueue parameters:
 # SegmentedQueue_Iterate: 
 #    1 - run test iteratively for segment size from 4 up to SegmentedQueue_SegmentSize
@@ -130,7 +82,7 @@ SegmentedQueue_SegmentSize=64
 [intrusive_queue_push_pop]
 ReaderCount=4
 WriterCount=4
-QueueSize=500000
+QueueSize=3000000
 # Flat combining queue parameters
 FCCompactFactor=64
 FCPassCount=8
@@ -148,37 +100,20 @@ PassCount=100000
 
 [pqueue_pop]
 ThreadCount=8
-QueueSize=1000000
+QueueSize=500000
 
 [pqueue_push]
 ThreadCount=8
-QueueSize=1000000
+QueueSize=500000
 
 [pqueue_push_pop]
 PushThreadCount=4
 PopThreadCount=4
 QueueSize=500000
 
-[map_find_int]
-ThreadCount=8
-MapSize=100000
-PercentExists=50
-PassCount=2
-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
+MapSize=10000
 PercentExists=50
 PassCount=2
 MaxLoadFactor=4
@@ -191,11 +126,12 @@ CuckooProbesetThreshold=0
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
+FeldmanMapArrayBits=8
 
-[map_insdel_int]
+[map_insdel_func]
 InsertThreadCount=4
 DeleteThreadCount=4
+UpdateThreadCount=4
 ThreadPassCount=4
 MapSize=50000
 MaxLoadFactor=4
@@ -208,14 +144,14 @@ CuckooProbesetThreshold=0
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
+FeldmanMapArrayBits=8
 
-[map_insdel_func]
+[map_insdel_item_int]
 InsertThreadCount=4
 DeleteThreadCount=4
-UpdateThreadCount=4
-ThreadPassCount=4
-MapSize=50000
+MapSize=10000
+GoalItem=5000
+AttemptCount=10000
 MaxLoadFactor=4
 
 # *** Cuckoo map properties
@@ -226,30 +162,13 @@ CuckooProbesetThreshold=0
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
-
-[Map_InsDel_Item_int]
-ThreadCount=8
-MapSize=100000
-GoalItem=50000
-AttemptCount=100
-MaxLoadFactor=4
-PrintGCStateFlag=1
-# *** Cuckoo map properties
-CuckooInitialSize=1024
-CuckooProbesetSize=16
-# 0 - use default
-CuckooProbesetThreshold=0
-
-# *** FeldmanHashMap properties
-FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
+FeldmanMapArrayBits=8
 
 [map_insdel_string]
 InsertThreadCount=4
 DeleteThreadCount=4
-ThreadPassCount=3
-MapSize=30000
+ThreadPassCount=6
+MapSize=10000
 MaxLoadFactor=4
 PrintGCStateFlag=1
 
@@ -261,15 +180,16 @@ CuckooProbesetThreshold=0
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
+FeldmanMapArrayBits=8
 
-[Map_InsDel_Item_string]
+[map_insdelfind]
+InitialMapSize=50000
 ThreadCount=8
-MapSize=100000
-GoalItemIndex=50000
-AttemptCount=100
 MaxLoadFactor=4
-PrintGCStateFlag=1
+InsertPercentage=20
+DeletePercentage=20
+Duration=3
+
 # *** Cuckoo map properties
 CuckooInitialSize=1024
 CuckooProbesetSize=16
@@ -278,14 +198,18 @@ CuckooProbesetThreshold=0
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
+FeldmanMapArrayBits=8
 
-[Map_InsFind_int]
-ThreadCount=0
-MapSize=1000
+[map_delodd]
+MapSize=10000
+InsThreadCount=3
+DelThreadCount=2
+ExtractThreadCount=2
+FindThreadCount=2
 MaxLoadFactor=4
-PrintGCStateFlag=1
-# *** Cuckoo map properties
+PassCount=70
+
+#Cuckoo map properties
 CuckooInitialSize=1024
 CuckooProbesetSize=16
 # 0 - use default
@@ -293,39 +217,31 @@ CuckooProbesetThreshold=0
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
-
-[map_insdelfind]
-InitialMapSize=500000
-ThreadCount=8
-MaxLoadFactor=4
-InsertPercentage=5
-DeletePercentage=5
-Duration=5
+FeldmanMapArrayBits=8
 
-# *** Cuckoo map properties
-CuckooInitialSize=1024
-CuckooProbesetSize=16
-# 0 - use default
-CuckooProbesetThreshold=0
+[map_minmax]
+MapSize=50000
+InsThreadCount=2
+ExtractThreadCount=2
+PassCount=1000
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
-
-[map_delodd]
-MapSize=500000
-InsThreadCount=4
-DelThreadCount=3
-ExtractThreadCount=3
+FeldmanMapArrayBits=8
+
+[map_iter_erase]
+MapSize=5000
+InsThreadCount=3
+DelThreadCount=2
+ExtractThreadCount=2
+FindThreadCount=2
 MaxLoadFactor=4
-
-#Cuckoo map properties
-CuckooInitialSize=1024
-CuckooProbesetSize=16
-# 0 - use default
-CuckooProbesetThreshold=0
+PassCount=500
 
 # *** FeldmanHashMap properties
 FeldmanMapHeadBits=8
-FeldmanMapArrayBits=4
+FeldmanMapArrayBits=8
+
+[free_list]
+ThreadCount=4
+PassCount=1000000
\ No newline at end of file