diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-06-16 10:07:42 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-06-16 10:07:42 +0000 |
| commit | 85d5a0cfcd549224d28774b4b13ced5e8367298f (patch) | |
| tree | c2546160126066fb7616e8747512ddff4fb51ca4 /test/benchmarks | |
| parent | 0c6cbdac433a001f76b1f9afd00f4280d17d1832 (diff) | |
| download | scala-85d5a0cfcd549224d28774b4b13ced5e8367298f.tar.gz scala-85d5a0cfcd549224d28774b4b13ced5e8367298f.tar.bz2 scala-85d5a0cfcd549224d28774b4b13ced5e8367298f.zip | |
Fixed hash trie splitting. No review.
Diffstat (limited to 'test/benchmarks')
| -rw-r--r-- | test/benchmarks/src/scala/collection/parallel/Benchmarking.scala | 4 | ||||
| -rw-r--r-- | test/benchmarks/src/scala/collection/parallel/benchmarks/generic/ParallelBenches.scala | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala b/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala index c52724757a..01b522cd99 100644 --- a/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala +++ b/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala @@ -94,6 +94,10 @@ trait BenchmarkRegister { register(hashtries.Lookup) register(hashtries.Combine) register(hashtries.MultipleCombine) + + // parallel hash trie benchmarks + register(hashtries.RefParallelHashTrieBenches.Reduce) + register(hashtries.RefParallelHashTrieBenches.ReduceMedium) } diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/generic/ParallelBenches.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/generic/ParallelBenches.scala index 4e81cacd4d..a7488858b2 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/generic/ParallelBenches.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/generic/ParallelBenches.scala @@ -9,7 +9,7 @@ package generic trait ParallelIterableBench[T, Coll <: ParallelIterable[T]] extends collection.parallel.benchmarks.Bench { - self => +self => protected var seqcoll: Iterable[T] = null protected var parcoll: Coll = null.asInstanceOf[Coll] |