Skip to content

Commit e561933

Browse files
author
Eric Caspole
committed
8292623: Reduce runtime of java.io microbenchmarks
Reviewed-by: rriggs
1 parent dcd7802 commit e561933

10 files changed

+44
-2
lines changed

‎test/micro/org/openjdk/bench/java/io/DataOutputStreamTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
@BenchmarkMode(Mode.AverageTime)
3232
@OutputTimeUnit(TimeUnit.MICROSECONDS)
33-
@Fork(value = 1, warmups = 0)
33+
@Fork(2)
3434
@Measurement(iterations = 6, time = 1)
35-
@Warmup(iterations=2, time = 2)
35+
@Warmup(iterations=4, time = 2)
3636
@State(Scope.Benchmark)
3737
public class DataOutputStreamTest {
3838

‎test/micro/org/openjdk/bench/java/io/FileChannelRead.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
*/
3939
@BenchmarkMode(Mode.Throughput)
4040
@OutputTimeUnit(TimeUnit.MILLISECONDS)
41+
@Fork(2)
42+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
43+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4144
@State(Scope.Thread)
4245
public class FileChannelRead {
4346

‎test/micro/org/openjdk/bench/java/io/FileChannelWrite.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
*/
3838
@BenchmarkMode(Mode.Throughput)
3939
@OutputTimeUnit(TimeUnit.MILLISECONDS)
40+
@Fork(2)
41+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
42+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4043
@State(Scope.Thread)
4144
public class FileChannelWrite {
4245

‎test/micro/org/openjdk/bench/java/io/FileRead.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
*/
3838
@BenchmarkMode(Mode.Throughput)
3939
@OutputTimeUnit(TimeUnit.MILLISECONDS)
40+
@Fork(2)
41+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
42+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4043
@State(Scope.Thread)
4144
public class FileRead {
4245

‎test/micro/org/openjdk/bench/java/io/FileWrite.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
*/
3737
@BenchmarkMode(Mode.Throughput)
3838
@OutputTimeUnit(TimeUnit.MILLISECONDS)
39+
@Fork(2)
40+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
41+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
3942
@State(Scope.Thread)
4043
public class FileWrite {
4144

‎test/micro/org/openjdk/bench/java/io/ObjectStreamClasses.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@
2424

2525
import org.openjdk.jmh.annotations.Benchmark;
2626
import org.openjdk.jmh.annotations.BenchmarkMode;
27+
import org.openjdk.jmh.annotations.Fork;
28+
import org.openjdk.jmh.annotations.Measurement;
2729
import org.openjdk.jmh.annotations.Mode;
2830
import org.openjdk.jmh.annotations.OutputTimeUnit;
2931
import org.openjdk.jmh.annotations.Scope;
3032
import org.openjdk.jmh.annotations.Setup;
3133
import org.openjdk.jmh.annotations.State;
34+
import org.openjdk.jmh.annotations.Warmup;
3235
import org.openjdk.jmh.infra.Blackhole;
3336

3437
import java.io.ObjectStreamClass;
@@ -41,6 +44,9 @@
4144
*/
4245
@BenchmarkMode(Mode.AverageTime)
4346
@OutputTimeUnit(TimeUnit.NANOSECONDS)
47+
@Fork(2)
48+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
49+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4450
@State(Scope.Thread)
4551
public class ObjectStreamClasses {
4652

‎test/micro/org/openjdk/bench/java/io/RandomAccessRead.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@
3030

3131
import org.openjdk.jmh.annotations.Benchmark;
3232
import org.openjdk.jmh.annotations.BenchmarkMode;
33+
import org.openjdk.jmh.annotations.Fork;
3334
import org.openjdk.jmh.annotations.Level;
35+
import org.openjdk.jmh.annotations.Measurement;
3436
import org.openjdk.jmh.annotations.Mode;
3537
import org.openjdk.jmh.annotations.OutputTimeUnit;
3638
import org.openjdk.jmh.annotations.Param;
3739
import org.openjdk.jmh.annotations.Scope;
3840
import org.openjdk.jmh.annotations.Setup;
3941
import org.openjdk.jmh.annotations.State;
42+
import org.openjdk.jmh.annotations.Warmup;
4043
import org.openjdk.jmh.annotations.TearDown;
4144

4245
/**
@@ -45,6 +48,9 @@
4548
*/
4649
@BenchmarkMode(Mode.Throughput)
4750
@OutputTimeUnit(TimeUnit.MILLISECONDS)
51+
@Fork(2)
52+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
53+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4854
@State(Scope.Thread)
4955
public class RandomAccessRead {
5056

‎test/micro/org/openjdk/bench/java/io/RandomAccessWrite.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@
3030

3131
import org.openjdk.jmh.annotations.Benchmark;
3232
import org.openjdk.jmh.annotations.BenchmarkMode;
33+
import org.openjdk.jmh.annotations.Fork;
3334
import org.openjdk.jmh.annotations.Level;
35+
import org.openjdk.jmh.annotations.Measurement;
3436
import org.openjdk.jmh.annotations.Mode;
3537
import org.openjdk.jmh.annotations.OutputTimeUnit;
3638
import org.openjdk.jmh.annotations.Param;
3739
import org.openjdk.jmh.annotations.Scope;
3840
import org.openjdk.jmh.annotations.Setup;
3941
import org.openjdk.jmh.annotations.State;
42+
import org.openjdk.jmh.annotations.Warmup;
4043
import org.openjdk.jmh.annotations.TearDown;
4144

4245
/**
@@ -45,6 +48,9 @@
4548
*/
4649
@BenchmarkMode(Mode.Throughput)
4750
@OutputTimeUnit(TimeUnit.MILLISECONDS)
51+
@Fork(2)
52+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
53+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4854
@State(Scope.Thread)
4955
public class RandomAccessWrite {
5056

‎test/micro/org/openjdk/bench/java/io/SerializationWriteReplace.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@
2525
import org.openjdk.bench.java.io.BlackholedOutputStream;
2626
import org.openjdk.jmh.annotations.Benchmark;
2727
import org.openjdk.jmh.annotations.BenchmarkMode;
28+
import org.openjdk.jmh.annotations.Fork;
29+
import org.openjdk.jmh.annotations.Measurement;
2830
import org.openjdk.jmh.annotations.Mode;
2931
import org.openjdk.jmh.annotations.OutputTimeUnit;
3032
import org.openjdk.jmh.annotations.Scope;
3133
import org.openjdk.jmh.annotations.Setup;
3234
import org.openjdk.jmh.annotations.State;
3335
import org.openjdk.jmh.annotations.TearDown;
36+
import org.openjdk.jmh.annotations.Warmup;
3437
import org.openjdk.jmh.infra.Blackhole;
3538

3639
import java.io.IOException;
@@ -41,6 +44,9 @@
4144

4245
@BenchmarkMode(Mode.AverageTime)
4346
@OutputTimeUnit(TimeUnit.NANOSECONDS)
47+
@Fork(2)
48+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
49+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4450
@State(Scope.Thread)
4551
public class SerializationWriteReplace {
4652

‎test/micro/org/openjdk/bench/java/io/UTF8.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@
2424

2525
import org.openjdk.jmh.annotations.Benchmark;
2626
import org.openjdk.jmh.annotations.BenchmarkMode;
27+
import org.openjdk.jmh.annotations.Fork;
28+
import org.openjdk.jmh.annotations.Measurement;
2729
import org.openjdk.jmh.annotations.Mode;
2830
import org.openjdk.jmh.annotations.OutputTimeUnit;
2931
import org.openjdk.jmh.annotations.Scope;
3032
import org.openjdk.jmh.annotations.Setup;
3133
import org.openjdk.jmh.annotations.State;
34+
import org.openjdk.jmh.annotations.Warmup;
3235
import org.openjdk.jmh.infra.Blackhole;
3336

3437
import java.io.DataOutputStream;
@@ -40,6 +43,9 @@
4043
*/
4144
@BenchmarkMode(Mode.AverageTime)
4245
@OutputTimeUnit(TimeUnit.NANOSECONDS)
46+
@Fork(2)
47+
@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
48+
@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
4349
@State(Scope.Thread)
4450
public class UTF8 {
4551

0 commit comments

Comments
 (0)