changeset 977:962a1d288d71

samples: use the shorter matches "A" instead of ".*A.*".
author shade
date Fri, 22 Aug 2014 13:47:10 +0400
parents a128b58999b1
children 9a19d4380a95
files jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_01_HelloWorld.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_03_States.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_04_DefaultState.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_05_StateFixtures.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_06_FixtureLevel.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_18_Control.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_20_Annotations.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_22_FalseSharing.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_23_AuxCounters.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_24_Inheritance.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_25_API_GA.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_26_BatchSize.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_27_Params.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_28_BlackholeHelpers.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_29_StatesDAG.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_30_Interrupts.java jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_31_InfraParams.java
diffstat 29 files changed, 65 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_01_HelloWorld.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_01_HelloWorld.java	Fri Aug 22 13:47:10 2014 +0400
@@ -74,7 +74,7 @@
      *
      * a) Via command-line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_01.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_01
      *
      * JMH generates self-contained JARs, bundling JMH together with it.
      * The runtime options for the JMH are available with "-h":
@@ -87,7 +87,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_01_HelloWorld.class.getSimpleName() + ".*")
+                .include(JMHSample_01_HelloWorld.class.getSimpleName())
                 .forks(1)
                 .build();
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java	Fri Aug 22 13:47:10 2014 +0400
@@ -158,7 +158,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_02.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_02 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -168,7 +168,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_02_BenchmarkModes.class.getSimpleName() + ".*")
+                .include(JMHSample_02_BenchmarkModes.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_03_States.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_03_States.java	Fri Aug 22 13:47:10 2014 +0400
@@ -100,7 +100,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_03.*" -wi 5 -i 5 -t 4 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_03 -wi 5 -i 5 -t 4 -f 1
      *    (we requested 5 measurement/warmup iterations, with 4 threads, single fork)
      *
      * b) Via the Java API:
@@ -110,7 +110,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_03_States.class.getSimpleName() + ".*")
+                .include(JMHSample_03_States.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .threads(4)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_04_DefaultState.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_04_DefaultState.java	Fri Aug 22 13:47:10 2014 +0400
@@ -58,7 +58,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_04.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_04 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -68,7 +68,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_04_DefaultState.class.getSimpleName() + ".*")
+                .include(JMHSample_04_DefaultState.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_05_StateFixtures.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_05_StateFixtures.java	Fri Aug 22 13:47:10 2014 +0400
@@ -108,7 +108,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -ea -jar target/benchmarks.jar ".*JMHSample_05.*" -wi 5 -i 5 -f 1
+     *    $ java -ea -jar target/benchmarks.jar JMHSample_05 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -118,7 +118,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_05_StateFixtures.class.getSimpleName() + ".*")
+                .include(JMHSample_05_StateFixtures.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_06_FixtureLevel.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_06_FixtureLevel.java	Fri Aug 22 13:47:10 2014 +0400
@@ -80,7 +80,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -ea -jar target/benchmarks.jar ".*JMHSample_06.*" -wi 5 -i 5 -f 1
+     *    $ java -ea -jar target/benchmarks.jar JMHSample_06 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      *    You can optionally supply -foe to fail the complete run.
@@ -92,7 +92,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_06_FixtureLevel.class.getSimpleName() + ".*")
+                .include(JMHSample_06_FixtureLevel.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java	Fri Aug 22 13:47:10 2014 +0400
@@ -154,7 +154,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_07.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_07 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -164,7 +164,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_07_FixtureLevelInvocation.class.getSimpleName() + ".*")
+                .include(JMHSample_07_FixtureLevelInvocation.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,8 +24,8 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -81,7 +81,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_08.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_08 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -91,7 +91,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_08_DeadCode.class.getSimpleName() + ".*")
+                .include(JMHSample_08_DeadCode.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,8 +24,8 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -110,7 +110,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_09.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_09 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -120,7 +120,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_09_Blackholes.class.getSimpleName() + ".*")
+                .include(JMHSample_09_Blackholes.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,8 +24,8 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -84,7 +84,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_10.*" -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_10 -i 5 -f 1
      *    (we requested 5 iterations, single fork)
      *
      * b) Via the Java API:
@@ -94,7 +94,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_10_ConstantFold.class.getSimpleName() + ".*")
+                .include(JMHSample_10_ConstantFold.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,8 +24,8 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -138,7 +138,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_11.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_11 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -148,7 +148,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_11_Loops.class.getSimpleName() + ".*")
+                .include(JMHSample_11_Loops.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java	Fri Aug 22 13:47:10 2014 +0400
@@ -166,7 +166,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_12.*" -wi 5 -i 5
+     *    $ java -jar target/benchmarks.jar JMHSample_12 -wi 5 -i 5
      *    (we requested 5 warmup/measurement iterations)
      *
      * b) Via the Java API:
@@ -176,7 +176,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_12_Forking.class.getSimpleName() + ".*")
+                .include(JMHSample_12_Forking.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .build();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java	Fri Aug 22 13:47:10 2014 +0400
@@ -102,7 +102,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_13.*" -wi 0 -i 3
+     *    $ java -jar target/benchmarks.jar JMHSample_13 -wi 0 -i 3
      *    (we requested no warmup, 3 measurement iterations)
      *
      * b) Via the Java API:
@@ -112,7 +112,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_13_RunToRun.class.getSimpleName() + ".*")
+                .include(JMHSample_13_RunToRun.class.getSimpleName())
                 .warmupIterations(0)
                 .measurementIterations(5)
                 .build();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java	Fri Aug 22 13:47:10 2014 +0400
@@ -101,7 +101,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_15.*" -wi 5 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_15 -wi 5 -i 5 -f 1
      *    (we requested 5 warmup/measurement iterations, single fork)
      *
      * b) Via the Java API:
@@ -111,7 +111,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_15_Asymmetric.class.getSimpleName() + ".*")
+                .include(JMHSample_15_Asymmetric.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.CompilerControl;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
@@ -118,7 +118,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_16.*" -wi 1 -i 3 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_16 -wi 1 -i 3 -f 1
      *    (we requested 1 warmup iterations, 3 iterations, single fork)
      *
      * b) Via the Java API:
@@ -128,7 +128,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_16_CompilerControl.class.getSimpleName() + ".*")
+                .include(JMHSample_16_CompilerControl.class.getSimpleName())
                 .warmupIterations(1)
                 .measurementIterations(3)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java	Fri Aug 22 13:47:10 2014 +0400
@@ -96,7 +96,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_17.*" \
+     *    $ java -jar target/benchmarks.jar JMHSample_17 \
      *        -i 20 -wi 1 -f 1 -t ${CPU*16} -si {true|false}
      *    (we requested 1 warmup iterations, 20 iterations, single fork,
      *     lots of threads, and changeable "synchronize iterations" option)
@@ -108,7 +108,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_17_SyncIterations.class.getSimpleName() + ".*")
+                .include(JMHSample_17_SyncIterations.class.getSimpleName())
                 .warmupIterations(1)
                 .measurementIterations(20)
                 .threads(Runtime.getRuntime().availableProcessors()*16)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_18_Control.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_18_Control.java	Fri Aug 22 13:47:10 2014 +0400
@@ -78,7 +78,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_18.*" -wi 1 -i 5 -t 2 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_18 -wi 1 -i 5 -t 2 -f 1
      *    (we requested 1 warmup iterations, 5 iterations, 2 threads, and single fork)
      *
      * b) Via the Java API:
@@ -88,7 +88,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_18_Control.class.getSimpleName() + ".*")
+                .include(JMHSample_18_Control.class.getSimpleName())
                 .warmupIterations(1)
                 .measurementIterations(5)
                 .threads(2)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_20_Annotations.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_20_Annotations.java	Fri Aug 22 13:47:10 2014 +0400
@@ -76,7 +76,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_20.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_20
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -85,7 +85,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_20_Annotations.class.getSimpleName() + ".*")
+                .include(JMHSample_20_Annotations.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java	Fri Aug 22 13:47:10 2014 +0400
@@ -122,7 +122,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_21.*" -w 1 -i 5 -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_21 -w 1 -i 5 -f 1
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -131,7 +131,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_21_ConsumeCPU.class.getSimpleName() + ".*")
+                .include(JMHSample_21_ConsumeCPU.class.getSimpleName())
                 .warmupIterations(1)
                 .measurementIterations(5)
                 .forks(1)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_22_FalseSharing.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_22_FalseSharing.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Group;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
@@ -225,7 +225,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_22.*" -t $CPU
+     *    $ java -jar target/benchmarks.jar JMHSample_22 -t $CPU
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -234,7 +234,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_22_FalseSharing.class.getSimpleName() + ".*")
+                .include(JMHSample_22_FalseSharing.class.getSimpleName())
                 .threads(Runtime.getRuntime().availableProcessors())
                 .build();
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_23_AuxCounters.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_23_AuxCounters.java	Fri Aug 22 13:47:10 2014 +0400
@@ -94,7 +94,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_23.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_23
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -103,7 +103,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_23_AuxCounters.class.getSimpleName() + ".*")
+                .include(JMHSample_23_AuxCounters.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_24_Inheritance.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_24_Inheritance.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -106,7 +106,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_24.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_24
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -115,7 +115,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_24_Inheritance.class.getSimpleName() + ".*")
+                .include(JMHSample_24_Inheritance.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_25_API_GA.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_25_API_GA.java	Fri Aug 22 13:47:10 2014 +0400
@@ -87,7 +87,7 @@
         // measurement runs. That is, all measurement runs will inherit these,
         // see how it's done below.
         Options baseOpts = new OptionsBuilder()
-                .include(".*" + JMHSample_25_API_GA.class.getName() + ".*")
+                .include(JMHSample_25_API_GA.class.getName())
                 .warmupTime(TimeValue.milliseconds(200))
                 .measurementTime(TimeValue.milliseconds(200))
                 .warmupIterations(5)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_26_BatchSize.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_26_BatchSize.java	Fri Aug 22 13:47:10 2014 +0400
@@ -24,8 +24,8 @@
  */
 package org.openjdk.jmh.samples;
 
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
@@ -114,7 +114,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_26.*" -f 1
+     *    $ java -jar target/benchmarks.jar JMHSample_26 -f 1
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -123,7 +123,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_26_BatchSize.class.getSimpleName() + ".*")
+                .include(JMHSample_26_BatchSize.class.getSimpleName())
                 .forks(1)
                 .build();
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_27_Params.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_27_Params.java	Fri Aug 22 13:47:10 2014 +0400
@@ -76,7 +76,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_27.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_27
      *
      *    You can juggle parameters through the command line, e.g. with "-p arg=41,42"
      *
@@ -87,7 +87,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_27_Params.class.getSimpleName() + ".*")
+                .include(JMHSample_27_Params.class.getSimpleName())
 //                .param("arg", "41", "42") // Use this to selectively constrain/override parameters
                 .build();
 
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_28_BlackholeHelpers.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_28_BlackholeHelpers.java	Fri Aug 22 13:47:10 2014 +0400
@@ -126,7 +126,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_28.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_28
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -135,7 +135,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_28_BlackholeHelpers.class.getSimpleName() + ".*")
+                .include(JMHSample_28_BlackholeHelpers.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_29_StatesDAG.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_29_StatesDAG.java	Fri Aug 22 13:47:10 2014 +0400
@@ -146,7 +146,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_29.*"
+     *    $ java -jar target/benchmarks.jar JMHSample_29
      *
      * b) Via the Java API:
      *    (see the JMH homepage for possible caveats when running from IDE:
@@ -155,7 +155,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_29_StatesDAG.class.getSimpleName() + ".*")
+                .include(JMHSample_29_StatesDAG.class.getSimpleName())
                 .build();
 
         new Runner(opt).run();
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_30_Interrupts.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_30_Interrupts.java	Fri Aug 22 13:47:10 2014 +0400
@@ -89,7 +89,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_30.*" -wi 5 -i 5 -t 2 -f 5
+     *    $ java -jar target/benchmarks.jar JMHSample_30 -wi 5 -i 5 -t 2 -f 5
      *    (we requested 5 warmup iterations, 5 iterations, 2 threads, and 5 forks)
      *
      * b) Via the Java API:
@@ -99,7 +99,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_30_Interrupts.class.getSimpleName() + ".*")
+                .include(JMHSample_30_Interrupts.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .threads(2)
--- a/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_31_InfraParams.java	Fri Aug 22 13:25:24 2014 +0400
+++ b/jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_31_InfraParams.java	Fri Aug 22 13:47:10 2014 +0400
@@ -114,7 +114,7 @@
      *
      * a) Via the command line:
      *    $ mvn clean install
-     *    $ java -jar target/benchmarks.jar ".*JMHSample_31.*" -wi 5 -i 5 -t 4 -f 5
+     *    $ java -jar target/benchmarks.jar JMHSample_31 -wi 5 -i 5 -t 4 -f 5
      *    (we requested 5 warmup iterations, 5 iterations, 2 threads, and 5 forks)
      *
      * b) Via the Java API:
@@ -124,7 +124,7 @@
 
     public static void main(String[] args) throws RunnerException {
         Options opt = new OptionsBuilder()
-                .include(".*" + JMHSample_31_InfraParams.class.getSimpleName() + ".*")
+                .include(JMHSample_31_InfraParams.class.getSimpleName())
                 .warmupIterations(5)
                 .measurementIterations(5)
                 .threads(4)