diff options
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] |