From cfb6168dc5eef906b2552c7b40765db1d6720652 Mon Sep 17 00:00:00 2001 From: Aleksandar Pokopec Date: Mon, 13 Sep 2010 16:07:33 +0000 Subject: Improving parallel scan. No review --- .../parallel/benchmarks/parallel_array/ScanLight.scala | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/ScanLight.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/ScanLight.scala index b18b98a208..02a52ac207 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/ScanLight.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/ScanLight.scala @@ -8,10 +8,13 @@ import scala.collection.parallel.mutable.ParArray object ScanLight extends Companion { def benchName = "scan-light"; def apply(sz: Int, parallelism: Int, what: String) = new ScanLight(sz, parallelism, what) - override def comparisons = List() + override def comparisons = List("jsr") override def defaultSize = 40000 val op = (a: Cont, b: Cont) => { + operation(a, b) + } + def operation(a: Cont, b: Cont) = { val m = if (a.in < 0) 1 else 0 new Cont(a.in + b.in + m * (0 until 10).reduceLeft(_ + _)) } @@ -21,12 +24,15 @@ object ScanLight extends Companion { class ScanLight(sz: Int, p: Int, what: String) extends Resettable[Cont](sz, p, what, new Cont(_), new Array[Any](_), classOf[Cont]) { def companion = ScanLight - override def repetitionsPerRun = 10 - override val runs = 10 + override def repetitionsPerRun = 50 + override val runs = 12 def runpar = pa.scan(new Cont(0))(ScanLight.op) def runseq = sequentialScan(new Cont(0), ScanLight.op, sz) - override def comparisonMap = collection.Map() + def runjsr = jsrarr.cumulate(new extra166y.Ops.Reducer[Cont] { + def op(a: Cont, b: Cont) = ScanLight.operation(a, b) + }, new Cont(0)) + override def comparisonMap = collection.Map("jsr" -> runjsr _) } -- cgit v1.2.3