8342958: Use jvmArgs consistently in microbenchmarks

Reviewed-by: ecaspole, jvernee

test/micro/org/openjdk/bench/java/lang/CallerClassBench.java

@@ -36,7 +36,7 @@ import org.openjdk.jmh.annotations.Warmup;
 
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgsAppend = {"-Xmx1g", "-Xms1g"})
+@Fork(value = 3, jvmArgs = {"-Xmx1g", "-Xms1g"})
 @State(Scope.Benchmark)
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)

test/micro/org/openjdk/bench/java/lang/ObjectHashCode.java

@@ -50,37 +50,37 @@ public class ObjectHashCode {
     // Experimental hashCode generation schemes. See synchronizer.cpp get_next_hash
     /*
     @Benchmark
-    @Fork(jvmArgsPrepend = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=0"})
+    @Fork(jvmArgs = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=0"})
     public int mode_0() {
         return System.identityHashCode(new Object());
     }
 
     @Benchmark
-    @Fork(jvmArgsPrepend = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=1"})
+    @Fork(jvmArgs = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=1"})
     public int mode_1() {
         return System.identityHashCode(new Object());
     }
 
     @Benchmark
-    @Fork(jvmArgsPrepend = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=2"})
+    @Fork(jvmArgs = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=2"})
     public int mode_2() {
         return System.identityHashCode(new Object());
     }
 
     @Benchmark
-    @Fork(jvmArgsPrepend = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=3"})
+    @Fork(jvmArgs = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=3"})
     public int mode_3() {
         return System.identityHashCode(new Object());
     }
 
     @Benchmark
-    @Fork(jvmArgsPrepend = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=4"})
+    @Fork(jvmArgs = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=4"})
     public int mode_4() {
         return System.identityHashCode(new Object());
     }
 
     @Benchmark
-    @Fork(jvmArgsPrepend = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=5"})
+    @Fork(jvmArgs = {"-XX:+UnlockExperimentalVMOptions", "-XX:hashCode=5"})
     public int mode_5() {
         return System.identityHashCode(new Object());
     }

test/micro/org/openjdk/bench/java/lang/ScopedValues.java

@@ -40,7 +40,7 @@ import static org.openjdk.bench.java.lang.ScopedValuesData.*;
 @Measurement(iterations=10, time=1)
 @Threads(1)
 @Fork(value = 1,
-      jvmArgsPrepend = {"-Djmh.executor.class=org.openjdk.bench.java.lang.ScopedValuesExecutorService",
+      jvmArgs = {"-Djmh.executor.class=org.openjdk.bench.java.lang.ScopedValuesExecutorService",
                         "-Djmh.executor=CUSTOM",
                         "-Djmh.blackhole.mode=COMPILER",
                         "--enable-preview"})

test/micro/org/openjdk/bench/java/lang/StringHashCode.java

@@ -96,7 +96,7 @@ public class StringHashCode {
     @State(Scope.Thread)
     @Warmup(iterations = 5, time = 1)
     @Measurement(iterations = 5, time = 1)
-    @Fork(value = 3, jvmArgsAppend = {"--add-exports", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED"})
+    @Fork(value = 3, jvmArgs = {"--add-exports", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED"})
     public static class Algorithm {
 
         private final static String alphabet = "abcdefghijklmnopqrstuvwxyz";

test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java

@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 3, time = 2)
 @Measurement(iterations = 6, time = 1)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @State(Scope.Thread)
 public class TypeKindBench {
 

test/micro/org/openjdk/bench/java/lang/classfile/Utf8EntryWriteTo.java

@@ -56,7 +56,7 @@ import jdk.internal.classfile.impl.*;
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 1, time = 2)
 @Measurement(iterations = 3, time = 1)
-@Fork(jvmArgsAppend = "--enable-preview", value = 3)
+@Fork(jvmArgs = "--enable-preview", value = 3)
 @State(Scope.Thread)
 public class Utf8EntryWriteTo {
     static final ClassDesc STRING_BUILDER = ClassDesc.ofDescriptor("Ljava/lang/StringBuilder;");

test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java

@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 public class AllocFromSliceTest extends CLayouts {
 
     @Param({"5", "20", "100", "500", "1000"})

test/micro/org/openjdk/bench/java/lang/foreign/AllocFromTest.java

@@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 public class AllocFromTest extends CLayouts {
 
     Arena arena = Arena.ofConfined();

test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java

@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 public class AllocTest extends CLayouts {
 
     Arena arena = Arena.ofConfined();

test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadConstant.java

@@ -41,7 +41,7 @@ import static org.openjdk.bench.java.lang.foreign.CallOverheadHelper.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class CallOverheadConstant {
 
     @Benchmark

test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadVirtual.java

@@ -41,7 +41,7 @@ import static org.openjdk.bench.java.lang.foreign.CallOverheadHelper.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class CallOverheadVirtual {
 
     @Benchmark

test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java

@@ -51,7 +51,7 @@ import static java.lang.foreign.ValueLayout.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class CriticalCalls {
 
     static final MethodHandle PINNED;

test/micro/org/openjdk/bench/java/lang/foreign/InternalStrLen.java

@@ -50,7 +50,7 @@ import static jdk.internal.foreign.StringSupport.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = {"--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED", "--enable-native-access=ALL-UNNAMED", "--enable-preview"})
+@Fork(value = 3, jvmArgs = {"--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED", "--enable-native-access=ALL-UNNAMED", "--enable-preview"})
 public class InternalStrLen {
 
     private MemorySegment singleByteSegment;

test/micro/org/openjdk/bench/java/lang/foreign/LinkUpcall.java

@@ -47,7 +47,7 @@ import static java.lang.invoke.MethodHandles.lookup;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 public class LinkUpcall extends CLayouts {
 
     static final Linker LINKER = Linker.nativeLinker();

test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstantAsType.java

@@ -54,7 +54,7 @@ import static java.lang.foreign.ValueLayout.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgsAppend = { "-XX:-TieredCompilation" })
+@Fork(value = 3, jvmArgs = { "-XX:-TieredCompilation" })
 public class LoopOverNonConstantAsType extends JavaLayouts {
 
     static final Unsafe unsafe = Utils.unsafe;

test/micro/org/openjdk/bench/java/lang/foreign/LoopOverOfAddress.java

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 public class LoopOverOfAddress extends JavaLayouts {
 
     static final int ITERATIONS = 1_000_000;

test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentCopyUnsafe.java

@@ -45,7 +45,7 @@ import static java.lang.foreign.ValueLayout.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = {"--enable-native-access=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED"})
 public class MemorySegmentCopyUnsafe {
 
     static final Unsafe UNSAFE = Utils.unsafe;

test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentGetUnsafe.java

@@ -50,7 +50,7 @@ import static java.lang.foreign.ValueLayout.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = {"--enable-native-access=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED"})
 public class MemorySegmentGetUnsafe {
 
     static final Unsafe UNSAFE = Utils.unsafe;

test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java

@@ -44,7 +44,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = {"--enable-native-access=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED"})
 public class MemorySegmentZeroUnsafe {
 
     static final Unsafe UNSAFE = Utils.unsafe;

test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class PointerInvoke extends CLayouts {
 
     Arena arena = Arena.ofConfined();

test/micro/org/openjdk/bench/java/lang/foreign/QSort.java

@@ -46,7 +46,7 @@ import static java.lang.foreign.ValueLayout.JAVA_INT;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class QSort extends CLayouts {
 
     static final Linker abi = Linker.nativeLinker();

test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkCopy.java

@@ -84,25 +84,25 @@ public class SegmentBulkCopy {
         dstBuffer.put(srcBuffer);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
     @Benchmark
     public void heapSegmentCopyJava() {
         MemorySegment.copy(heapSrcSegment, 0, heapDstSegment, 0, ELEM_SIZE);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
     @Benchmark
     public void heapSegmentCopyUnsafe() {
         MemorySegment.copy(heapSrcSegment, 0, heapDstSegment, 0, ELEM_SIZE);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
     @Benchmark
     public void nativeSegmentCopyJava() {
         MemorySegment.copy(nativeSrcSegment, 0, nativeDstSegment, 0, ELEM_SIZE);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
     @Benchmark
     public void nativeSegmentCopyUnsafe() {
         MemorySegment.copy(nativeSrcSegment, 0, nativeDstSegment, 0, ELEM_SIZE);

test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java

@@ -74,37 +74,37 @@ public class SegmentBulkFill {
         Arrays.fill(array, (byte) 0);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
     @Benchmark
     public void heapSegmentFillJava() {
         heapSegment.fill((byte) 0);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
     @Benchmark
     public void heapSegmentFillUnsafe() {
         heapSegment.fill((byte) 0);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
     @Benchmark
     public void nativeSegmentFillJava() {
         nativeSegment.fill((byte) 0);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
     @Benchmark
     public void nativeSegmentFillUnsafe() {
         nativeSegment.fill((byte) 0);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
     @Benchmark
     public void unalignedSegmentFillJava() {
         unalignedSegment.fill((byte) 0);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
     @Benchmark
     public void unalignedSegmentFillUnsafe() {
         unalignedSegment.fill((byte) 0);

test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkMismatch.java

@@ -79,25 +79,25 @@ public class SegmentBulkMismatch {
         dstHeap = MemorySegment.ofArray(dstArray);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
     @Benchmark
     public long nativeSegmentJava() {
         return srcNative.mismatch(dstNative);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
     @Benchmark
     public long heapSegmentJava() {
         return srcHeap.mismatch(dstHeap);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
     @Benchmark
     public long nativeSegmentUnsafe() {
         return srcNative.mismatch(dstNative);
     }
 
-    @Fork(value = 3, jvmArgsAppend = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
+    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
     @Benchmark
     public long heapSegmentUnsafe() {
         return srcHeap.mismatch(dstHeap);

test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java

@@ -48,7 +48,7 @@ import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class StrLenTest extends CLayouts {
 
     Arena arena = Arena.ofConfined();

test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java

@@ -51,7 +51,7 @@ import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class ToCStringTest extends CLayouts {
 
     @Param({"5", "20", "100", "200"})

test/micro/org/openjdk/bench/java/lang/foreign/ToJavaStringTest.java

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "--enable-preview", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "--enable-preview", "-Djava.library.path=micro/native" })
 public class ToJavaStringTest {
 
     private MemorySegment strSegment;

test/micro/org/openjdk/bench/java/lang/foreign/UnrolledAccess.java

@@ -40,7 +40,7 @@ import static java.lang.foreign.ValueLayout.*;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 public class UnrolledAccess extends JavaLayouts {
 
     static final Unsafe U = Utils.unsafe;

test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java

@@ -45,7 +45,7 @@ import static java.lang.invoke.MethodHandles.lookup;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class Upcalls extends CLayouts {
 
     static final Linker abi = Linker.nativeLinker();

test/micro/org/openjdk/bench/java/lang/foreign/pointers/PointerBench.java

@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
 @Warmup(iterations = 3, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED" })
 @State(Scope.Benchmark)
 public class PointerBench {
 

test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAccess.java

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class PointsAccess {
 
     BBPoint BBPoint;

test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAlloc.java

@@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class PointsAlloc {
 
     @Benchmark

test/micro/org/openjdk/bench/java/lang/foreign/points/PointsDistance.java

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class PointsDistance {
 
     BBPoint jniP1;

test/micro/org/openjdk/bench/java/lang/foreign/points/PointsFree.java

@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class PointsFree {
 
     JNIPoint jniPoint;

test/micro/org/openjdk/bench/java/lang/foreign/xor/XorTest.java

@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 
 public class XorTest {
 

test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java

@@ -52,7 +52,7 @@ import static java.lang.classfile.ClassFile.ACC_STATIC;
 @BenchmarkMode(Mode.SingleShotTime)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Thread)
-@Fork(value = 10, warmups = 5, jvmArgsAppend = {
+@Fork(value = 10, warmups = 5, jvmArgs = {
         "--enable-preview"
 })
 public class LazyStaticColdStart {

test/micro/org/openjdk/bench/java/lang/invoke/Wrappers.java

@@ -45,7 +45,7 @@ import sun.invoke.util.Wrapper;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)
-@Fork(value = 3, jvmArgsAppend = "--add-exports=java.base/sun.invoke.util=ALL-UNNAMED")
+@Fork(value = 3, jvmArgs = "--add-exports=java.base/sun.invoke.util=ALL-UNNAMED")
 public class Wrappers {
 
     public static Class<?>[] PRIM_CLASSES = {

test/micro/org/openjdk/bench/java/lang/reflect/proxy/ProxyGeneratorBench.java

@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Warmup(iterations = 5, time = 2)
 @Measurement(iterations = 5, time = 2)
-@Fork(value = 1, jvmArgsPrepend = "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED")
+@Fork(value = 1, jvmArgs = "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED")
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)

test/micro/org/openjdk/bench/java/net/NetworkInterfaceLookup.java

@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
-@Fork(value = 2, jvmArgsAppend = "--add-opens=java.base/java.net=ALL-UNNAMED")
+@Fork(value = 2, jvmArgs = "--add-opens=java.base/java.net=ALL-UNNAMED")
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 public class NetworkInterfaceLookup {

test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java

@@ -125,7 +125,7 @@ public class SocketChannelConnectionSetup {
 
         opt = new OptionsBuilder()
                 .include(org.openjdk.bench.java.net.SocketChannelConnectionSetup.class.getSimpleName())
-                .jvmArgsPrepend("-Djdk.net.useFastTcpLoopback=true")
+                .jvmArgs("-Djdk.net.useFastTcpLoopback=true")
                 .warmupForks(1)
                 .forks(2)
                 .build();

test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java

@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
 @State(Scope.Thread)
 public class SocketEventOverhead {
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED" })
     @Benchmark
@@ -53,7 +53,7 @@ public class SocketEventOverhead {
         return fixture.write();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED",
         "-XX:StartFlightRecording:jdk.SocketWrite#enabled=false"})
@@ -62,7 +62,7 @@ public class SocketEventOverhead {
         return fixture.write();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED",
         "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s"})
@@ -71,7 +71,7 @@ public class SocketEventOverhead {
         return fixture.write();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
         "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false"})
     @Benchmark
@@ -79,7 +79,7 @@ public class SocketEventOverhead {
         return fixture.write();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED" })
     @Benchmark
@@ -87,7 +87,7 @@ public class SocketEventOverhead {
         return fixture.read();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED",
         "-XX:StartFlightRecording:jdk.SocketRead#enabled=false"})
@@ -96,7 +96,7 @@ public class SocketEventOverhead {
         return fixture.read();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED",
         "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s"})
@@ -105,7 +105,7 @@ public class SocketEventOverhead {
         return fixture.read();
     }
 
-    @Fork(value = 1, jvmArgsAppend = {
+    @Fork(value = 1, jvmArgs = {
         "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
         "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false"})
     @Benchmark

test/micro/org/openjdk/bench/java/net/ThreadLocalParseUtil.java

@@ -48,7 +48,7 @@ import static java.lang.invoke.MethodType.methodType;
 @State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsAppend = "--add-exports=java.base/sun.net.www=ALL-UNNAMED")
+@Fork(value = 1, jvmArgs = "--add-exports=java.base/sun.net.www=ALL-UNNAMED")
 public class ThreadLocalParseUtil {
 
     private static final MethodHandle MH_DECODE;

test/micro/org/openjdk/bench/java/security/AlgorithmConstraintsPermits.java

@@ -45,7 +45,7 @@ import static sun.security.util.DisabledAlgorithmConstraints.PROPERTY_TLS_DISABL
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
 @State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)

test/micro/org/openjdk/bench/java/security/CacheBench.java

@@ -44,7 +44,7 @@ import sun.security.util.Cache;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 public class CacheBench {

test/micro/org/openjdk/bench/java/security/CipherSuiteBench.java

@@ -30,7 +30,7 @@ import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
 
-@Fork(value = 3, jvmArgsAppend = {"--add-exports", "java.base/sun.security.ssl=ALL-UNNAMED", "--add-opens", "java.base/sun.security.ssl=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--add-exports", "java.base/sun.security.ssl=ALL-UNNAMED", "--add-opens", "java.base/sun.security.ssl=ALL-UNNAMED"})
 @State(Scope.Thread)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @BenchmarkMode(Mode.Throughput)

test/micro/org/openjdk/bench/java/security/HSS.java

@@ -55,7 +55,7 @@ import sun.security.util.RawKeySpec;
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgsAppend = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
 
 // Tests 1-2 are from RFC 8554, Appendix F.
 

test/micro/org/openjdk/bench/java/security/MessageDigests.java

@@ -47,7 +47,7 @@ import org.openjdk.jmh.annotations.Warmup;
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(jvmArgsAppend = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
+@Fork(jvmArgs = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
 public class MessageDigests {
 
     @Param({"64", "16384"})

test/micro/org/openjdk/bench/java/security/PKCS12KeyStores.java

@@ -41,7 +41,7 @@ import org.openjdk.jmh.annotations.*;
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 @BenchmarkMode(Mode.AverageTime)
-@Fork(jvmArgsAppend = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
+@Fork(jvmArgs = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
 public class PKCS12KeyStores {
 
     private static final char[] PASS = "changeit".toCharArray();

test/micro/org/openjdk/bench/java/security/ProtectionDomainBench.java

@@ -123,7 +123,7 @@ public class ProtectionDomainBench {
     }
 
     @Benchmark
-    @Fork(value = 3, jvmArgsPrepend={"-Djava.security.manager=allow"})
+    @Fork(value = 3, jvmArgs={"-Djava.security.manager=allow"})
     public void withSecurityManager()  throws ClassNotFoundException {
         work();
     }

test/micro/org/openjdk/bench/java/security/Signatures.java

@@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit;
 @State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(jvmArgsAppend = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
+@Fork(jvmArgs = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
 public class Signatures {
     private static Signature signer;
 

test/micro/org/openjdk/bench/java/util/ArraysSort.java

@@ -47,7 +47,7 @@ import java.lang.reflect.Method;
 /**
  * Performance test of Arrays.sort() methods
  */
-@Fork(value=1, jvmArgsAppend={"-XX:CompileThreshold=1", "-XX:-TieredCompilation"})
+@Fork(value=1, jvmArgs={"-XX:CompileThreshold=1", "-XX:-TieredCompilation"})
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Thread)

test/micro/org/openjdk/bench/java/util/ListArgs.java

@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
  */
 @State(Scope.Thread)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgsAppend = { "-verbose:gc", "-XX:+UseParallelGC", "-Xms4g", "-Xmx4g", "-Xint" })
+@Fork(value = 3, jvmArgs = { "-verbose:gc", "-XX:+UseParallelGC", "-Xms4g", "-Xmx4g", "-Xint" })
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 public class ListArgs {

test/micro/org/openjdk/bench/java/util/StringJoinerBenchmark.java

@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgsAppend = {"-Xms1g", "-Xmx1g"})
+@Fork(value = 3, jvmArgs = {"-Xms1g", "-Xmx1g"})
 public class StringJoinerBenchmark {
 
     @Benchmark

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java

@@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFMRPar {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java

@@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFMRSeq {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java

@@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFlatMapInfinitySeq {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java

@@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherFlatMapSeq {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java

@@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMapPar {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java

@@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMapSeq {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java

@@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMiscPar {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java

@@ -51,7 +51,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherMiscSeq {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java

@@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherReducePar {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java

@@ -51,7 +51,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherReduceSeq {

test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java

@@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls.
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@Fork(jvmArgs = "--enable-preview", value = 1)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class GatherWhileOrdered {

test/micro/org/openjdk/bench/javax/crypto/AES.java

@@ -59,19 +59,19 @@ public class AES {
     }
 
     @Benchmark
-    @Fork(jvmArgsAppend = {"-XX:+UnlockDiagnosticVMOptions", "-XX:-UseAES", "-XX:-UseAESIntrinsics"})
+    @Fork(jvmArgs = {"-XX:+UnlockDiagnosticVMOptions", "-XX:-UseAES", "-XX:-UseAESIntrinsics"})
     public byte[] testBaseline() throws Exception {
         return cipher.doFinal(src);
     }
 
     @Benchmark
-    @Fork(jvmArgsAppend = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseAES", "-XX:-UseAESIntrinsics"})
+    @Fork(jvmArgs = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseAES", "-XX:-UseAESIntrinsics"})
     public byte[] testUseAes() throws Exception {
         return cipher.doFinal(src);
     }
 
     @Benchmark
-    @Fork(jvmArgsAppend = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseAES", "-XX:+UseAESIntrinsics"})
+    @Fork(jvmArgs = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseAES", "-XX:+UseAESIntrinsics"})
     public byte[] testUseAesIntrinsics() throws Exception {
         return cipher.doFinal(src);
     }

test/micro/org/openjdk/bench/javax/crypto/AESReinit.java

@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 
 @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Fork(value = 3, jvmArgsAppend = {"-Xms1g", "-Xmx1g"})
+@Fork(value = 3, jvmArgs = {"-Xms1g", "-Xmx1g"})
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)

test/micro/org/openjdk/bench/javax/crypto/Crypto.java

@@ -51,7 +51,7 @@ import org.openjdk.jmh.annotations.Warmup;
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @Warmup(iterations = 5)
 @Measurement(iterations = 10)
-@Fork(jvmArgsAppend = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 5)
+@Fork(jvmArgs = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 5)
 public class Crypto {
 
     @Param({"64", "1024", "16384"})

test/micro/org/openjdk/bench/javax/crypto/full/CryptoBase.java

@@ -45,7 +45,7 @@ import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
 
-@Fork(jvmArgsAppend = {"-XX:+AlwaysPreTouch"}, value = 5)
+@Fork(jvmArgs = {"-XX:+AlwaysPreTouch"}, value = 5)
 @Warmup(iterations = 3, time = 3)
 @Measurement(iterations = 8, time = 2)
 @OutputTimeUnit(TimeUnit.SECONDS)

test/micro/org/openjdk/bench/javax/crypto/full/Poly1305DigestBench.java

@@ -41,7 +41,7 @@ import java.nio.ByteBuffer;
 
 @Measurement(iterations = 3, time = 10)
 @Warmup(iterations = 3, time = 10)
-@Fork(value = 1, jvmArgsAppend = {"--add-opens", "java.base/com.sun.crypto.provider=ALL-UNNAMED"})
+@Fork(value = 1, jvmArgs = {"--add-opens", "java.base/com.sun.crypto.provider=ALL-UNNAMED"})
 public class Poly1305DigestBench extends CryptoBase {
     public static final int SET_SIZE = 128;
 

test/micro/org/openjdk/bench/javax/crypto/full/PolynomialP256Bench.java

@@ -40,7 +40,7 @@ import sun.security.util.math.intpoly.IntegerPolynomialP256;
 import sun.security.util.math.MutableIntegerModuloP;
 import sun.security.util.math.ImmutableIntegerModuloP;
 
-@Fork(jvmArgsAppend = {"-XX:+AlwaysPreTouch",
+@Fork(jvmArgs = {"-XX:+AlwaysPreTouch",
     "--add-exports", "java.base/sun.security.util.math.intpoly=ALL-UNNAMED",
     "--add-exports", "java.base/sun.security.util.math=ALL-UNNAMED"}, value = 1)
 @Warmup(iterations = 3, time = 3)

test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java

@@ -43,7 +43,7 @@ import org.openjdk.jmh.annotations.Warmup;
  */
 @Warmup(iterations = 2)
 @Measurement(iterations = 4)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
         "--add-exports", "java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED",
         "--enable-preview",

test/micro/org/openjdk/bench/jdk/classfile/ClassfileBenchmark.java

@@ -50,7 +50,7 @@ import org.openjdk.jmh.infra.Blackhole;
  */
 @Warmup(iterations = 3)
 @Measurement(iterations = 5)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--enable-preview"})
 
 @State(Scope.Benchmark)

test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java

@@ -55,7 +55,7 @@ import org.openjdk.jmh.infra.Blackhole;
 
 @BenchmarkMode(Mode.Throughput)
 @State(Scope.Benchmark)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--enable-preview",
         "--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED"})
 @Warmup(iterations = 2)

test/micro/org/openjdk/bench/jdk/classfile/ConstantPoolBuildingClassEntry.java

@@ -43,7 +43,7 @@ import static org.openjdk.bench.jdk.classfile.TestConstants.*;
 @Measurement(iterations = 5)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @BenchmarkMode(Mode.Throughput)
-@Fork(value = 1, jvmArgsAppend = {"--enable-preview"})
+@Fork(value = 1, jvmArgs = {"--enable-preview"})
 @State(Scope.Benchmark)
 public class ConstantPoolBuildingClassEntry {
     // JDK-8338546

test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java

@@ -37,7 +37,7 @@ import org.openjdk.jmh.annotations.*;
 
 @BenchmarkMode(Mode.Throughput)
 @State(Scope.Benchmark)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--enable-preview"})
 @Warmup(iterations = 2)
 @Measurement(iterations = 4)

test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java

@@ -36,7 +36,7 @@ import org.openjdk.jmh.annotations.*;
 
 @BenchmarkMode(Mode.Throughput)
 @State(Scope.Benchmark)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--enable-preview"})
 @Warmup(iterations = 3)
 @Measurement(iterations = 4)

test/micro/org/openjdk/bench/jdk/classfile/Write.java

@@ -56,7 +56,7 @@ import static org.openjdk.bench.jdk.classfile.TestConstants.*;
  */
 @Warmup(iterations = 3)
 @Measurement(iterations = 5)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
         "--add-exports", "java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED",
         "--enable-preview",

test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java

@@ -47,7 +47,7 @@ import java.util.random.RandomGenerator;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class ArrayMismatchBenchmark {
 
     @Param({"9", "257", "100000"})

test/micro/org/openjdk/bench/jdk/incubator/vector/BlackScholes.java

@@ -39,7 +39,7 @@ import java.util.function.IntUnaryOperator;
 @State(Scope.Thread)
 @Warmup(iterations = 3, time = 5)
 @Measurement(iterations = 3, time = 5)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class BlackScholes {
 
     @Param("1024")

test/micro/org/openjdk/bench/jdk/incubator/vector/ColumnFilterBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.infra.Blackhole;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector", "-XX:UseAVX=2"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector", "-XX:UseAVX=2"})
 public class ColumnFilterBenchmark {
     @Param({"1024", "2047", "4096"})
     int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/EqualsIgnoreCaseBenchmark.java

@@ -46,7 +46,7 @@ import static jdk.incubator.vector.VectorOperators.*;
 @State(Scope.Benchmark)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 3, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class EqualsIgnoreCaseBenchmark {
     static final VectorSpecies<Byte> SPECIES = ByteVector.SPECIES_PREFERRED;
     private byte[] a;

test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class GatherOperationsBenchmark {
     @Param({"64", "256", "1024", "4096"})
     int SIZE;

test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.*;
 @State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class IndexInRangeBenchmark {
     @Param({"7", "256", "259", "512"})
     private int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/IndexVectorBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.*;
 @State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class IndexVectorBenchmark {
     @Param({"1024"})
     private int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/LoadMaskedIOOBEBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.*;
 @State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class LoadMaskedIOOBEBenchmark {
     @Param({"1026"})
     private int inSize;

test/micro/org/openjdk/bench/jdk/incubator/vector/MaskCastOperationsBenchmark.java

@@ -30,7 +30,7 @@ import org.openjdk.jmh.annotations.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class MaskCastOperationsBenchmark {
     VectorMask<Byte> bmask64;
     VectorMask<Byte> bmask128;

test/micro/org/openjdk/bench/jdk/incubator/vector/MaskFromLongBenchmark.java

@@ -29,7 +29,7 @@ import org.openjdk.jmh.annotations.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class MaskFromLongBenchmark {
     private static final int ITERATION = 20000;
 

test/micro/org/openjdk/bench/jdk/incubator/vector/MaskQueryOperationsBenchmark.java

@@ -31,7 +31,7 @@ import org.openjdk.jmh.infra.Blackhole;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class MaskQueryOperationsBenchmark {
     @Param({"128","256","512"})
     int bits;

test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java

@@ -32,7 +32,7 @@ import java.util.Random;
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class MaskedLogicOpts {
     @Param({"256","512","1024"})
     private int ARRAYLEN;

test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java

@@ -48,7 +48,7 @@ import org.openjdk.jmh.annotations.Warmup;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
     "--add-modules=jdk.incubator.vector",
     "--enable-native-access", "ALL-UNNAMED"})
 public class MemorySegmentVectorAccess {

test/micro/org/openjdk/bench/jdk/incubator/vector/RearrangeBytesBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.infra.Blackhole;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class RearrangeBytesBenchmark {
     @Param({"256", "512", "1024"})
     int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/RotateBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.infra.Blackhole;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class RotateBenchmark {
     @Param({"256","512"})
     int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/SelectFromBenchmark.java

@@ -33,7 +33,7 @@ import org.openjdk.jmh.infra.Blackhole;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class SelectFromBenchmark {
     @Param({"1024","2048"})
     int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskTrueCount.java

@@ -30,7 +30,7 @@ import org.openjdk.jmh.annotations.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class StoreMaskTrueCount {
     private static final VectorSpecies<Short> S_SPECIES = ShortVector.SPECIES_PREFERRED;
     private static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_PREFERRED;

test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedBenchmark.java

@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.*;
 @State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class StoreMaskedBenchmark {
     @Param({"1024"})
     private int size;

test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java

@@ -31,7 +31,7 @@ import org.openjdk.jmh.annotations.*;
 @State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class StoreMaskedIOOBEBenchmark {
     @Param({"1024"})
     private int inSize;

test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadSegmentVarious.java

@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
         "--add-modules=jdk.incubator.vector",
         "--enable-native-access", "ALL-UNNAMED"})
 public class TestLoadSegmentVarious {

test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreBytes.java

@@ -47,7 +47,7 @@ import org.openjdk.jmh.annotations.Warmup;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
     "--add-modules=jdk.incubator.vector",
     "--enable-native-access", "ALL-UNNAMED",
     "-Djdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK=1"})

test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreShorts.java

@@ -50,7 +50,7 @@ import org.openjdk.jmh.annotations.Warmup;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 1, jvmArgsAppend = {
+@Fork(value = 1, jvmArgs = {
     "--add-modules=jdk.incubator.vector",
     "--enable-native-access", "ALL-UNNAMED"})
 public class TestLoadStoreShorts {

test/micro/org/openjdk/bench/jdk/incubator/vector/VectorExtractBenchmark.java

@@ -28,7 +28,7 @@ import org.openjdk.jmh.annotations.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class VectorExtractBenchmark {
     private int idx = 0;
     private boolean[] res = new boolean[8];