Merge branch 'master' into topic/defaults-jmh

.travis.yml

@@ -11,19 +11,24 @@ refs:
       - 'java -version'
       - 'javac -version'
       - ./tools/sbt/bin/sbt assembly
+      - ./tools/sbt/bin/sbt renaissanceJmh/jmh:assembly
       - 'mkdir -p "$HOME/.prebuilt"'
       - 'ls "$HOME/.prebuilt"'
       - 'rm -rf "$HOME/.prebuilt"/*.jar'
       - 'cp target/renaissance-0.9.0.jar "$HOME/.prebuilt/"`git rev-parse HEAD`.jar'
+      - 'cp renaissance-jmh/target/scala-2.12/renaissance-jmh-assembly-0.9.0.jar "$HOME/.prebuilt/"`git rev-parse HEAD`-jmh-assembly.jar'
 
   - &bench
     stage: benchmark
     script:
       - mkdir -p target
+      - mkdir -p renaissance-jmh/target/scala-2.12
       - CACHED_JAR_NAME="$HOME/.prebuilt/"`git rev-parse HEAD`.jar; if [ -e "$CACHED_JAR_NAME" ]; then cp "$CACHED_JAR_NAME" target/renaissance-0.9.0.jar; else ./tools/sbt/bin/sbt assembly; fi
+      - CACHED_JMH_JAR_NAME="$HOME/.prebuilt/"`git rev-parse HEAD`-jmh-assembly.jar; if [ -e "$CACHED_JMH_JAR_NAME" ]; then cp "$CACHED_JMH_JAR_NAME" renaissance-jmh/target/scala-2.12/renaissance-jmh-assembly-0.9.0.jar; else ./tools/sbt/bin/sbt renaissanceJmh/jmh:assembly; fi
       - 'java -version'
       - 'java -jar ./target/renaissance-0.9.0.jar --raw-list >list.txt'
       - 'for BENCH in `cat list.txt`; do echo "====> $BENCH"; java -Xms2500M -Xmx2500M -jar ./target/renaissance-0.9.0.jar --functional-test -r 1 "$BENCH" || exit 1; done'
+      - 'java -Xms2500M -Xmx2500M -jar ./renaissance-jmh/target/scala-2.12/renaissance-jmh-assembly-0.9.0.jar -wi 0 -i 1 -f 1'
 
 jobs:
   include:

CONTRIBUTION.md

@@ -32,9 +32,11 @@ import org.renaissance.Benchmark._
 
 @Summary("Runs some performance-critical Java code.")
 final class MyJavaBenchmark extends RenaissanceBenchmark {
-  override protected def runIteration(config: Config): Unit = {
+  override protected def runIteration(config: Config): BenchmarkResult = {
     // This is the benchmark body, which in this case calls some Java code.
     JavaCode.runSomeJavaCode()
+    // Return object for later validation of the iteration.
+    return new MyJavaBenchmarkResult()
   }
 }
 ```

README.md

@@ -50,7 +50,7 @@ The following is a complete list of command-line options.
 Renaissance Benchmark Suite, version 0.9.0
 Usage: renaissance [options] [benchmark-specification]
 
-  --help                   Prints this usage text.
+  -h, --help               Prints this usage text.
   -r, --repetitions <value>
                            Number of repetitions used with the fixed-iterations policy.
   -w, --warmup-seconds <value>
@@ -200,7 +200,7 @@ $ tools/sbt/bin/sbt renaissanceJmh/jmh:assembly
 To run the benchmarks using JMH, you can execute the following `java` command:
 
 ```
-$ java -jar 'renaissance-jmh/target/renaissance-jmh-assembly-0.9.0.jar'
+$ java -jar 'renaissance-jmh/target/scala-2.12/renaissance-jmh-assembly-0.9.0.jar'
 ```
 
 

benchmarks/actors/src/main/scala/org/renaissance/actors/AkkaUct.scala

@@ -2,7 +2,9 @@ package org.renaissance.actors
 
 import edu.rice.habanero.actors.AkkaActorState
 import edu.rice.habanero.benchmarks.uct.UctAkkaActorBenchmark
+import org.renaissance.BenchmarkResult
 import org.renaissance.Config
+import org.renaissance.EmptyResult
 import org.renaissance.License
 import org.renaissance.RenaissanceBenchmark
 import org.renaissance.Benchmark._
@@ -37,10 +39,11 @@ class AkkaUct extends RenaissanceBenchmark {
     }
   }
 
-  protected override def runIteration(config: Config): Unit = {
-    //sys.error(" --> " + Predef.getClass.getClassLoader + " --> " + this.getClass.getClassLoader)
+  protected override def runIteration(config: Config): BenchmarkResult = {
     for (i <- 0 until numIterations) {
       bench.runIteration()
     }
+    // TODO: add proper validation
+    return new EmptyResult
   }
 }