# HG changeset patch
# User shade
# Date 1511446369 -3600
# Node ID 14c1bb4faa6edb0effae9a645f825298c39dd124
# Parent  d68c66d6774002b1f9f90516f25ae63e79fdcb16
Optimize imports

diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/alloc/plain/Objects.java
--- a/src/main/java/org/openjdk/gcbench/alloc/plain/Objects.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/alloc/plain/Objects.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,7 +24,6 @@
  */
 package org.openjdk.gcbench.alloc.plain;
 
-import org.openjdk.gcbench.util.ratelimit.MultiTokenBucket;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/alloc/plain/PrimArray.java
--- a/src/main/java/org/openjdk/gcbench/alloc/plain/PrimArray.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/alloc/plain/PrimArray.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,7 +24,6 @@
  */
 package org.openjdk.gcbench.alloc.plain;
 
-import org.openjdk.gcbench.util.ratelimit.MultiTokenBucket;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/alloc/plain/RefArray.java
--- a/src/main/java/org/openjdk/gcbench/alloc/plain/RefArray.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/alloc/plain/RefArray.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,7 +24,6 @@
  */
 package org.openjdk.gcbench.alloc.plain;
 
-import org.openjdk.gcbench.util.ratelimit.MultiTokenBucket;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/alloc/ratelimited/RefArray.java
--- a/src/main/java/org/openjdk/gcbench/alloc/ratelimited/RefArray.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/alloc/ratelimited/RefArray.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,7 +26,6 @@
 
 import org.openjdk.gcbench.util.ratelimit.MultiTokenBucket;
 import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.concurrent.TimeUnit;
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/alloc/special/SoftRefs.java
--- a/src/main/java/org/openjdk/gcbench/alloc/special/SoftRefs.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/alloc/special/SoftRefs.java	Thu Nov 23 15:12:49 2017 +0100
@@ -27,7 +27,6 @@
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 
-import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
 import java.util.concurrent.TimeUnit;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/alloc/special/WeakRefs.java
--- a/src/main/java/org/openjdk/gcbench/alloc/special/WeakRefs.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/alloc/special/WeakRefs.java	Thu Nov 23 15:12:49 2017 +0100
@@ -27,9 +27,7 @@
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 
-import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/fragger/ArrayFragger.java
--- a/src/main/java/org/openjdk/gcbench/fragger/ArrayFragger.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/fragger/ArrayFragger.java	Thu Nov 23 15:12:49 2017 +0100
@@ -27,7 +27,6 @@
 import org.openjdk.gcbench.util.AllocProfileSupport;
 import org.openjdk.gcbench.util.ratelimit.MultiTokenBucket;
 import org.openjdk.jmh.annotations.*;
-import org.openjdk.jol.info.GraphLayout;
 
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/fragger/LRUFragger.java
--- a/src/main/java/org/openjdk/gcbench/fragger/LRUFragger.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/fragger/LRUFragger.java	Thu Nov 23 15:12:49 2017 +0100
@@ -32,7 +32,10 @@
 import org.openjdk.jmh.results.RunResult;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.*;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+import org.openjdk.jmh.runner.options.VerboseMode;
 
 import java.io.PrintStream;
 import java.util.LinkedHashMap;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/retain/HashMaps.java
--- a/src/main/java/org/openjdk/gcbench/retain/HashMaps.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/retain/HashMaps.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,9 +26,7 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/retain/LargeGraphPhantomRef.java
--- a/src/main/java/org/openjdk/gcbench/retain/LargeGraphPhantomRef.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/retain/LargeGraphPhantomRef.java	Thu Nov 23 15:12:49 2017 +0100
@@ -27,9 +27,7 @@
 import org.openjdk.jmh.annotations.*;
 
 import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/retain/LinkedLists.java
--- a/src/main/java/org/openjdk/gcbench/retain/LinkedLists.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/retain/LinkedLists.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,8 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.LinkedList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/retain/RefArray.java
--- a/src/main/java/org/openjdk/gcbench/retain/RefArray.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/retain/RefArray.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,8 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/retain/SoftRefs.java
--- a/src/main/java/org/openjdk/gcbench/retain/SoftRefs.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/retain/SoftRefs.java	Thu Nov 23 15:12:49 2017 +0100
@@ -29,10 +29,6 @@
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.WeakHashMap;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/retain/WeakHashMaps.java
--- a/src/main/java/org/openjdk/gcbench/retain/WeakHashMaps.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/retain/WeakHashMaps.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,8 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Optional;
 import java.util.WeakHashMap;
 import java.util.concurrent.TimeUnit;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/roots/ClassGenerator.java
--- a/src/main/java/org/openjdk/gcbench/roots/ClassGenerator.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/roots/ClassGenerator.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,11 +24,12 @@
  */
 package org.openjdk.gcbench.roots;
 
-import org.objectweb.asm.*;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Type;
 
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/roots/Classes.java
--- a/src/main/java/org/openjdk/gcbench/roots/Classes.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/roots/Classes.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,7 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/roots/Code.java
--- a/src/main/java/org/openjdk/gcbench/roots/Code.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/roots/Code.java	Thu Nov 23 15:12:49 2017 +0100
@@ -25,10 +25,7 @@
 package org.openjdk.gcbench.roots;
 
 import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.infra.Blackhole;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/roots/NewSync.java
--- a/src/main/java/org/openjdk/gcbench/roots/NewSync.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/roots/NewSync.java	Thu Nov 23 15:12:49 2017 +0100
@@ -25,9 +25,7 @@
 package org.openjdk.gcbench.roots;
 
 import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.infra.Blackhole;
 
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/runtime/arraycopy/RefArray.java
--- a/src/main/java/org/openjdk/gcbench/runtime/arraycopy/RefArray.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/runtime/arraycopy/RefArray.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,7 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/runtime/cmpxchg/CasBarriersRefSuccess.java
--- a/src/main/java/org/openjdk/gcbench/runtime/cmpxchg/CasBarriersRefSuccess.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/runtime/cmpxchg/CasBarriersRefSuccess.java	Thu Nov 23 15:12:49 2017 +0100
@@ -27,7 +27,6 @@
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/runtime/reads/ReadBarriersCachePressure.java
--- a/src/main/java/org/openjdk/gcbench/runtime/reads/ReadBarriersCachePressure.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/runtime/reads/ReadBarriersCachePressure.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,7 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/runtime/writes/Plain.java
--- a/src/main/java/org/openjdk/gcbench/runtime/writes/Plain.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/runtime/writes/Plain.java	Thu Nov 23 15:12:49 2017 +0100
@@ -28,8 +28,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.openjdk.gcbench.util.Sinks.sink;
-
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Fork(1)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/runtime/writes/Volatile.java
--- a/src/main/java/org/openjdk/gcbench/runtime/writes/Volatile.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/runtime/writes/Volatile.java	Thu Nov 23 15:12:49 2017 +0100
@@ -28,8 +28,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.openjdk.gcbench.util.Sinks.sink;
-
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Fork(1)
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/tests/DimensionalTest.java
--- a/src/main/java/org/openjdk/gcbench/tests/DimensionalTest.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/tests/DimensionalTest.java	Thu Nov 23 15:12:49 2017 +0100
@@ -30,7 +30,9 @@
 import org.openjdk.jmh.results.RunResult;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.*;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 import java.util.Map;
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/tests/MachineCntTest.java
--- a/src/main/java/org/openjdk/gcbench/tests/MachineCntTest.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/tests/MachineCntTest.java	Thu Nov 23 15:12:49 2017 +0100
@@ -29,7 +29,10 @@
 import org.openjdk.jmh.results.RunResult;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.*;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
 
 import java.util.Map;
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/tests/UnderPressureTest.java
--- a/src/main/java/org/openjdk/gcbench/tests/UnderPressureTest.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/tests/UnderPressureTest.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,7 +24,7 @@
  */
 package org.openjdk.gcbench.tests;
 
-import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.annotations.Fork;
 
 @Fork(jvmArgsAppend = {"--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class UnderPressureTest {
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/util/Dummy.java
--- a/src/main/java/org/openjdk/gcbench/util/Dummy.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/util/Dummy.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,7 +24,10 @@
  */
 package org.openjdk.gcbench.util;
 
-import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Warmup;
 
 import java.util.concurrent.TimeUnit;
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/util/ratelimit/MultiTokenBucket.java
--- a/src/main/java/org/openjdk/gcbench/util/ratelimit/MultiTokenBucket.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/util/ratelimit/MultiTokenBucket.java	Thu Nov 23 15:12:49 2017 +0100
@@ -24,7 +24,8 @@
  */
 package org.openjdk.gcbench.util.ratelimit;
 
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 public class MultiTokenBucket implements RateLimiter {
 
diff -r d68c66d67740 -r 14c1bb4faa6e src/main/java/org/openjdk/gcbench/wip/ReadBarriersCountedLoop.java
--- a/src/main/java/org/openjdk/gcbench/wip/ReadBarriersCountedLoop.java	Thu Nov 23 15:10:59 2017 +0100
+++ b/src/main/java/org/openjdk/gcbench/wip/ReadBarriersCountedLoop.java	Thu Nov 23 15:12:49 2017 +0100
@@ -26,9 +26,6 @@
 
 import org.openjdk.jmh.annotations.*;
 
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)