jdk-sandbox: comparison hotspot/test/compiler/stable/TestStableDouble.java

equal deleted inserted replaced

-:eb0d8ef2f700
+:d99065e4572b
 */
 /*
 * @test TestStableDouble
 * @summary tests on stable fields and arrays
-* @library /testlibrary
+* @library /testlibrary /testlibrary/whitebox
-* @compile -XDignore.symbol.file TestStableDouble.java
+* @build TestStableDouble StableConfiguration sun.hotspot.WhiteBox
+* @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
 * @run main ClassFileInstaller
+*           java/lang/invoke/StableConfiguration
 *           java/lang/invoke/TestStableDouble
 *           java/lang/invoke/TestStableDouble$DoubleStable
 *           java/lang/invoke/TestStableDouble$StaticDoubleStable
 *           java/lang/invoke/TestStableDouble$VolatileDoubleStable
 *           java/lang/invoke/TestStableDouble$DoubleArrayDim1
 *           java/lang/invoke/TestStableDouble$NestedStableField2
 *           java/lang/invoke/TestStableDouble$NestedStableField2$A
 *           java/lang/invoke/TestStableDouble$NestedStableField3
 *           java/lang/invoke/TestStableDouble$NestedStableField3$A
 *           java/lang/invoke/TestStableDouble$DefaultValue
+*           java/lang/invoke/TestStableDouble$DefaultStaticValue
 *           java/lang/invoke/TestStableDouble$ObjectArrayLowerDim2
 *
 * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
-*                   -XX:+UnlockDiagnosticVMOptions -XX:+FoldStableValues -XX:+UseCompressedOop
+*                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
-*                   -server -XX:-TieredCompilation -Xcomp
+*                   -server -XX:-TieredCompilation
+*                   -XX:+FoldStableValues
+*                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
+*                   java.lang.invoke.TestStableDouble
+* @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
+*                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
+*                   -server -XX:-TieredCompilation
+*                   -XX:-FoldStableValues
 *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
 *                   java.lang.invoke.TestStableDouble
 *
 * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
-*                   -XX:+UnlockDiagnosticVMOptions -XX:+FoldStableValues -XX:-UseCompressedOop
+*                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
-*                   -server -XX:-TieredCompilation -Xcomp
+*                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
+*                   -XX:+FoldStableValues
+*                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
+*                   java.lang.invoke.TestStableDouble
+* @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
+*                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
+*                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
+*                   -XX:-FoldStableValues
 *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
 *                   java.lang.invoke.TestStableDouble
 *
 * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
-*                   -XX:+UnlockDiagnosticVMOptions -XX:-FoldStableValues -XX:+UseCompressedOop
+*                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
-*                   -server -XX:-TieredCompilation -Xcomp
+*                   -client -XX:-TieredCompilation
+*                   -XX:+FoldStableValues
 *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
 *                   java.lang.invoke.TestStableDouble
-*
 * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
-*                   -XX:+UnlockDiagnosticVMOptions -XX:-FoldStableValues -XX:-UseCompressedOop
+*                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
-*                   -server -XX:-TieredCompilation -Xcomp
+*                   -client -XX:-TieredCompilation
+*                   -XX:-FoldStableValues
 *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
 *                   java.lang.invoke.TestStableDouble
 */
 package java.lang.invoke;
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.VMOption;
-import sun.management.ManagementFactoryHelper;
 import java.lang.reflect.InvocationTargetException;
 public class TestStableDouble {
+static final boolean isStableEnabled    = StableConfiguration.isStableEnabled;
+static final boolean isServerWithStable = StableConfiguration.isServerWithStable;
 public static void main(String[] args) throws Exception {
-System.out.println("@Stable enabled: "+isStableEnabled);
-System.out.println();
 run(DefaultValue.class);
 run(DoubleStable.class);
+run(DefaultStaticValue.class);
 run(StaticDoubleStable.class);
 run(VolatileDoubleStable.class);
 // @Stable arrays: Dim 1-4
 run(DoubleArrayDim1.class);
 }
 }
 /* ==================================================== */
+static class DefaultStaticValue {
+public static @Stable double v;
+public static final DefaultStaticValue c = new DefaultStaticValue();
+public static double get() { return c.v; }
+public static void test() throws Exception {
+double val1 = get();
+c.v = 1.0; double val2 = get();
+assertEquals(val1, 0);
+assertEquals(val2, 1.0);
+}
+}
+/* ==================================================== */
 static class StaticDoubleStable {
 public static @Stable double v;
 public static final StaticDoubleStable c = new StaticDoubleStable();
 public static double get() { return c.v; }
 public static void test() throws Exception {
 {
 c.v = new double[1]; c.v[0] = 1.0; double val1 = get();
 c.v[0] = 2.0; double val2 = get();
 assertEquals(val1, 1.0);
-assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
+assertEquals(val2, (isServerWithStable ? 1.0 : 2.0));
 c.v = new double[1]; c.v[0] = 3.0; double val3 = get();
-assertEquals(val3, (isStableEnabled ? 1.0 : 3.0));
+assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 3.0));
 }
 {
 c.v = new double[20]; c.v[10] = 1.0; double val1 = get1();
 c.v[10] = 2.0; double val2 = get1();
 assertEquals(val1, 1.0);
-assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
+assertEquals(val2, (isServerWithStable ? 1.0 : 2.0));
 c.v = new double[20]; c.v[10] = 3.0; double val3 = get1();
-assertEquals(val3, (isStableEnabled ? 1.0 : 3.0));
+assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 3.0));
 }
 {
 c.v = new double[1]; double[] val1 = get2();
 c.v = new double[1]; double[] val2 = get2();
 public static void test() throws Exception {
 {
 c.v = new double[1][1]; c.v[0][0] = 1.0; double val1 = get();
 c.v[0][0] = 2.0; double val2 = get();
 assertEquals(val1, 1.0);
-assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
+assertEquals(val2, (isServerWithStable ? 1.0 : 2.0));
 c.v = new double[1][1]; c.v[0][0] = 3.0; double val3 = get();
-assertEquals(val3, (isStableEnabled ? 1.0 : 3.0));
+assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 3.0));
 c.v[0] = new double[1]; c.v[0][0] = 4.0; double val4 = get();
-assertEquals(val4, (isStableEnabled ? 1.0 : 4.0));
+assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 4.0));
 }
 {
 c.v = new double[1][1]; double[] val1 = get1();
 c.v[0] = new double[1]; double[] val2 = get1();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1]; double[][] val1 = get2();
 c.v = new double[1][1]; double[][] val2 = get2();
 public static void test() throws Exception {
 {
 c.v = new double[1][1][1]; c.v[0][0][0] = 1.0; double val1 = get();
 c.v[0][0][0] = 2.0; double val2 = get();
 assertEquals(val1, 1.0);
-assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
+assertEquals(val2, (isServerWithStable ? 1.0 : 2.0));
 c.v = new double[1][1][1]; c.v[0][0][0] = 3.0; double val3 = get();
-assertEquals(val3, (isStableEnabled ? 1.0 : 3.0));
+assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 3.0));
 c.v[0] = new double[1][1]; c.v[0][0][0] = 4.0; double val4 = get();
-assertEquals(val4, (isStableEnabled ? 1.0 : 4.0));
+assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 4.0));
 c.v[0][0] = new double[1]; c.v[0][0][0] = 5.0; double val5 = get();
-assertEquals(val5, (isStableEnabled ? 1.0 : 5.0));
+assertEquals(val5, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 5.0));
 }
 {
 c.v = new double[1][1][1]; double[] val1 = get1();
 c.v[0][0] = new double[1]; double[] val2 = get1();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1][1]; double[][] val1 = get2();
 c.v[0] = new double[1][1]; double[][] val2 = get2();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1][1]; double[][][] val1 = get3();
 c.v = new double[1][1][1]; double[][][] val2 = get3();
 public static void test() throws Exception {
 {
 c.v = new double[1][1][1][1]; c.v[0][0][0][0] = 1.0; double val1 = get();
 c.v[0][0][0][0] = 2.0; double val2 = get();
 assertEquals(val1, 1.0);
-assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
+assertEquals(val2, (isServerWithStable ? 1.0 : 2.0));
 c.v = new double[1][1][1][1]; c.v[0][0][0][0] = 3.0; double val3 = get();
-assertEquals(val3, (isStableEnabled ? 1.0 : 3.0));
+assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 3.0));
 c.v[0] = new double[1][1][1]; c.v[0][0][0][0] = 4.0; double val4 = get();
-assertEquals(val4, (isStableEnabled ? 1.0 : 4.0));
+assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 4.0));
 c.v[0][0] = new double[1][1]; c.v[0][0][0][0] = 5.0; double val5 = get();
-assertEquals(val5, (isStableEnabled ? 1.0 : 5.0));
+assertEquals(val5, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 5.0));
 c.v[0][0][0] = new double[1]; c.v[0][0][0][0] = 6.0; double val6 = get();
-assertEquals(val6, (isStableEnabled ? 1.0 : 6.0));
+assertEquals(val6, (isStableEnabled ? (isServerWithStable ? 1.0 : 2.0)
+: 6.0));
 }
 {
 c.v = new double[1][1][1][1]; double[] val1 = get1();
 c.v[0][0][0] = new double[1]; double[] val2 = get1();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1][1][1]; double[][] val1 = get2();
 c.v[0][0] = new double[1][1]; double[][] val2 = get2();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1][1][1]; double[][][] val1 = get3();
 c.v[0] = new double[1][1][1]; double[][][] val2 = get3();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1][1][1]; double[][][][] val1 = get4();
 c.v = new double[1][1][1][1]; double[][][][] val2 = get4();
 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
 }
 }
 }
 /* ==================================================== */
 // Dynamic Dim is higher than static
 static class ObjectArrayLowerDim0 {
 public @Stable Object v;
 public static final ObjectArrayLowerDim0 c = new ObjectArrayLowerDim0();
 public static double get() { return ((double[])c.v)[0]; }
 {
 c.v = new double[1][1]; c.v[0] = new double[0]; double[] val1 = get1();
 c.v[0] = new double[0]; double[] val2 = get1();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[0][0]; Object[] val1 = get2();
 c.v = new double[0][0]; Object[] val2 = get2();
 {
 c.v = new double[1][1][1]; c.v[0][0] = new double[0]; double[] val1 = get1();
 c.v[0][0] = new double[0]; double[] val2 = get1();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[1][1][1]; c.v[0] = new double[0][0]; double[][] val1 = get2();
 c.v[0] = new double[0][0]; double[][] val2 = get2();
-assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
+assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
 }
 {
 c.v = new double[0][0][0]; Object[][] val1 = get3();
 c.v = new double[0][0][0]; Object[][] val2 = get3();
 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
 elem.a = 1.0; double val1 = get(); double val2 = get1();
 elem.a = 2.0; double val3 = get(); double val4 = get1();
 assertEquals(val1, 1.0);
-assertEquals(val3, (isStableEnabled ? 1.0 : 2.0));
+assertEquals(val3, (isServerWithStable ? 1.0 : 2.0));
 assertEquals(val2, 1.0);
 assertEquals(val4, 2.0);
 }
 }
 System.out.println("FAILED");
 ex.printStackTrace(System.out);
 }
 }
 }
-static final boolean isStableEnabled;
-static {
-HotSpotDiagnosticMXBean diagnostic
-= ManagementFactoryHelper.getDiagnosticMXBean();
-VMOption tmp;
-try {
-tmp = diagnostic.getVMOption("FoldStableValues");
-} catch (IllegalArgumentException e) {
-tmp = null;
-}
-isStableEnabled = (tmp == null ? false : Boolean.parseBoolean(tmp.getValue()));
-}
 }

changeset 25641	d99065e4572b
parent 23192	f6a1c8866065
child 26916	8a1deee4f9b4