Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/test/compiler/whitebox/CompilerWhiteBoxTest.java	Sat Sep 28 12:32:09 2013 +0400
     1.2 +++ b/test/compiler/whitebox/CompilerWhiteBoxTest.java	Sat Sep 28 12:32:10 2013 +0400
     1.3 @@ -74,6 +74,9 @@
     1.4      protected static final int THRESHOLD;
     1.5      /** count of invocation to triger OSR compilation */
     1.6      protected static final long BACKEDGE_THRESHOLD;
     1.7 +    /** Value of {@code java.vm.info} (interpreted|mixed|comp mode) */
     1.8 +    protected static final String MODE
     1.9 +            = System.getProperty("java.vm.info");
    1.10  
    1.11      static {
    1.12          if (TIERED_COMPILATION) {
    1.13 @@ -202,7 +205,7 @@
    1.14          if (WHITE_BOX.getMethodCompilationLevel(method, true) != 0) {
    1.15              throw new RuntimeException(method + " osr_comp_level must be == 0");
    1.16          }
    1.17 -    }
    1.18 +   }
    1.19  
    1.20      /**
    1.21       * Checks, that {@linkplain #method} is compiled.

     2.1 --- a/test/compiler/whitebox/DeoptimizeAllTest.java	Sat Sep 28 12:32:09 2013 +0400
     2.2 +++ b/test/compiler/whitebox/DeoptimizeAllTest.java	Sat Sep 28 12:32:10 2013 +0400
     2.3 @@ -53,6 +53,12 @@
     2.4       */
     2.5      @Override
     2.6      protected void test() throws Exception {
     2.7 +        if (testCase.isOsr && CompilerWhiteBoxTest.MODE.startsWith(
     2.8 +                "compiled ")) {
     2.9 +          System.err.printf("Warning: %s is not applicable in %s%n",
    2.10 +                testCase.name(), CompilerWhiteBoxTest.MODE);
    2.11 +          return;
    2.12 +        }
    2.13          compile();
    2.14          checkCompiled();
    2.15          WHITE_BOX.deoptimizeAll();

     3.1 --- a/test/compiler/whitebox/DeoptimizeMethodTest.java	Sat Sep 28 12:32:09 2013 +0400
     3.2 +++ b/test/compiler/whitebox/DeoptimizeMethodTest.java	Sat Sep 28 12:32:10 2013 +0400
     3.3 @@ -53,6 +53,12 @@
     3.4       */
     3.5      @Override
     3.6      protected void test() throws Exception {
     3.7 +        if (testCase.isOsr && CompilerWhiteBoxTest.MODE.startsWith(
     3.8 +                "compiled ")) {
     3.9 +          System.err.printf("Warning: %s is not applicable in %s%n",
    3.10 +                testCase.name(), CompilerWhiteBoxTest.MODE);
    3.11 +          return;
    3.12 +        }
    3.13          compile();
    3.14          checkCompiled();
    3.15          deoptimize();

     4.1 --- a/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Sat Sep 28 12:32:09 2013 +0400
     4.2 +++ b/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Sat Sep 28 12:32:10 2013 +0400
     4.3 @@ -70,12 +70,10 @@
     4.4  
     4.5          int compLevel = getCompLevel();
     4.6          int bci = WHITE_BOX.getMethodEntryBci(method);
     4.7 -        System.out.println("bci = " + bci);
     4.8 -        printInfo();
     4.9          deoptimize();
    4.10 -        printInfo();
    4.11          checkNotCompiled();
    4.12 -        printInfo();
    4.13 +        WHITE_BOX.clearMethodState(method);
    4.14 +
    4.15          WHITE_BOX.enqueueMethodForCompilation(method, compLevel, bci);
    4.16          checkCompiled();
    4.17          deoptimize();

     5.1 --- a/test/compiler/whitebox/IsMethodCompilableTest.java	Sat Sep 28 12:32:09 2013 +0400
     5.2 +++ b/test/compiler/whitebox/IsMethodCompilableTest.java	Sat Sep 28 12:32:10 2013 +0400
     5.3 @@ -68,6 +68,12 @@
     5.4       */
     5.5      @Override
     5.6      protected void test() throws Exception {
     5.7 +        if (testCase.isOsr && CompilerWhiteBoxTest.MODE.startsWith(
     5.8 +                "compiled ")) {
     5.9 +          System.err.printf("Warning: %s is not applicable in %s%n",
    5.10 +                testCase.name(), CompilerWhiteBoxTest.MODE);
    5.11 +          return;
    5.12 +        }
    5.13          if (!isCompilable()) {
    5.14              throw new RuntimeException(method + " must be compilable");
    5.15          }

     6.1 --- a/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Sat Sep 28 12:32:09 2013 +0400
     6.2 +++ b/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Sat Sep 28 12:32:10 2013 +0400
     6.3 @@ -62,6 +62,12 @@
     6.4       */
     6.5      @Override
     6.6      protected void test() throws Exception {
     6.7 +        if (testCase.isOsr && CompilerWhiteBoxTest.MODE.startsWith(
     6.8 +                "compiled ")) {
     6.9 +          System.err.printf("Warning: %s is not applicable in %s%n",
    6.10 +                testCase.name(), CompilerWhiteBoxTest.MODE);
    6.11 +          return;
    6.12 +        }
    6.13          checkNotCompiled();
    6.14          if (!isCompilable()) {
    6.15              throw new RuntimeException(method + " must be compilable");