summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-11-10 16:21:31 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-11-10 16:21:31 +0000
commitbd86b89077131370e422eccd4939ddef6c32c98c (patch)
tree5cbbae315aca3be662976994997b0255f7f37c1b /test
parenta1b86a7e513f16f93aa2bc4294664f46bcac95d9 (diff)
downloadscala-bd86b89077131370e422eccd4939ddef6c32c98c.tar.gz
scala-bd86b89077131370e422eccd4939ddef6c32c98c.tar.bz2
scala-bd86b89077131370e422eccd4939ddef6c32c98c.zip
Benchmarking parallel sets.
No review.
Diffstat (limited to 'test')
-rw-r--r--test/benchmarks/src/scala/collection/parallel/Benchmarking.scala11
-rw-r--r--test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTableSets.scala2
-rw-r--r--test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala2
3 files changed, 12 insertions, 3 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala b/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala
index 0eb6c6ef13..32c3ca154f 100644
--- a/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala
+++ b/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala
@@ -109,7 +109,7 @@ trait BenchmarkRegister {
register(hashtries.RefParHashTrieBenches.Map)
register(hashtries.RefParHashTrieBenches.Map2)
- // parallel hash table benchmarks
+ // parallel hash table map benchmarks
register(hashtables.RefParHashTableBenches.Reduce)
register(hashtables.RefParHashTableBenches.Reduce2)
register(hashtables.RefParHashTableBenches.Foreach)
@@ -117,6 +117,15 @@ trait BenchmarkRegister {
register(hashtables.RefParHashTableBenches.Map)
register(hashtables.RefParHashTableBenches.Map2)
register(hashtables.RefParHashTableBenches.HeavyMap)
+
+ // parallel hash table set benchmarks
+ register(hashtables.RefParHashTableSetBenches.Reduce)
+ register(hashtables.RefParHashTableSetBenches.Reduce2)
+ register(hashtables.RefParHashTableSetBenches.Foreach)
+ register(hashtables.RefParHashTableSetBenches.ForeachSet)
+ register(hashtables.RefParHashTableSetBenches.Map)
+ register(hashtables.RefParHashTableSetBenches.Map2)
+ register(hashtables.RefParHashTableSetBenches.HeavyMap)
}
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTableSets.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTableSets.scala
index 2ac1e1c110..d0b7bae834 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTableSets.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTableSets.scala
@@ -19,7 +19,7 @@ trait ParHashTableSetBenches[T] extends StandardParIterableBenches[T, ParHashSet
val forkJoinPool = new scala.concurrent.forkjoin.ForkJoinPool
object Map2 extends IterableBenchCompanion {
- override def defaultSize = 5000
+ override def defaultSize = 50000
override def comparisons = List()
def benchName = "map2";
def apply(sz: Int, p: Int, w: String) = new Map2(sz, p, w)
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala
index ad2a8750c1..291f7ec62d 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtables/ParallelHashTables.scala
@@ -19,7 +19,7 @@ trait ParHashTableBenches[K, V] extends StandardParIterableBenches[(K, V), ParHa
val forkJoinPool = new scala.concurrent.forkjoin.ForkJoinPool
object Map2 extends IterableBenchCompanion {
- override def defaultSize = 5000
+ override def defaultSize = 40000
override def comparisons = List("jhashtable")
def benchName = "map2";
def apply(sz: Int, p: Int, w: String) = new Map2(sz, p, w)