# HG changeset patch
# User dpochepk
# Date 1481566683 -10800
# Node ID 8883ad66f6a9da293fe56cd732528906dd191cbf
# Parent  1f304d0c888b6a704128472f32177c4552dc9f02
8171060: [AOT] aot tests: WARNING: Requested compilation levels are out of current vm capabilities.
Reviewed-by: kvn

diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -37,15 +37,15 @@
  * @run main compiler.aot.AotCompiler -libname AotInvokeDynamic2CompiledTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeDynamic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCallee 1
- *      -checkCalleeCompileLevel 1 -checkCallerCompileLevel -1
- * @run main/othervm -XX:+UseAOT
+ *      -checkCalleeCompileLevel 1
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeDynamic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCallee 4
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 4
+ *      -checkCalleeCompileLevel 4
  * @summary check calls from aot to jit-compiled code using invokedynamic
  */
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -34,15 +34,15 @@
  *      -libname AotInvokeInterface2CompiledTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeInterface2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCallee 1
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ *      -checkCalleeCompileLevel 1
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeInterface2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCallee 4
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 4
+ *      -checkCalleeCompileLevel 4
  * @summary check calls from aot to jit-compiled code using invokeinterface
  */
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -33,15 +33,15 @@
  * @run main compiler.aot.AotCompiler -libname AotInvokeSpecial2CompiledTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeSpecial2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCallee 1
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ *      -checkCalleeCompileLevel 1
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeSpecial2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCallee 4
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 4
+ *      -checkCalleeCompileLevel 4
  * @summary check calls from aot to jit-compiled code using invokespecial
  */
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -33,15 +33,15 @@
  * @run main compiler.aot.AotCompiler -libname AotInvokeStatic2CompiledTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeStatic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCallee 1
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ *      -checkCalleeCompileLevel 1
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeStatic2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCallee 4
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 4
+ *      -checkCalleeCompileLevel 4
  * @summary check calls from aot to jit-compiled code using invokestatic
  */
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -33,15 +33,15 @@
  * @run main compiler.aot.AotCompiler -libname AotInvokeVirtual2CompiledTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeVirtual2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCallee 1
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ *      -checkCalleeCompileLevel 1
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./AotInvokeVirtual2CompiledTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCallee 4
- *      -checkCallerCompileLevel -1 -checkCalleeCompileLevel 4
+ *      -checkCalleeCompileLevel 4
  * @summary check calls from aot to jit-compiled code, using invokevirtual
  */
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -36,12 +36,12 @@
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeDynamic2AotTest.so
  *      -class compiler.calls.common.InvokeDynamic
  *      -compile compiler.calls.common.InvokeDynamic.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeDynamic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeDynamic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeDynamic -compileCaller 4
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -34,12 +34,12 @@
  *      -libname CompiledInvokeInterface2AotTest.so
  *      -class compiler.calls.common.InvokeInterface
  *      -compile compiler.calls.common.InvokeInterface.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeInterface2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeInterface2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeInterface -compileCaller 4
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -33,12 +33,12 @@
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeSpecial2AotTest.so
  *      -class compiler.calls.common.InvokeSpecial
  *      -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeSpecial2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeSpecial -compileCaller 4
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -33,12 +33,12 @@
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeStatic2AotTest.so
  *      -class compiler.calls.common.InvokeStatic
  *      -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeStatic2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeStatic -compileCaller 4
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Mon Dec 12 21:18:03 2016 +0300
@@ -33,12 +33,12 @@
  * @run main compiler.aot.AotCompiler -libname CompiledInvokeVirtual2AotTest.so
  *      -class compiler.calls.common.InvokeVirtual
  *      -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCaller 1
  *      -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UseAOT
  *      -XX:AOTLibrary=./CompiledInvokeVirtual2AotTest.so
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *      compiler.calls.common.InvokeVirtual -compileCaller 4
diff -r 1f304d0c888b -r 8883ad66f6a9 hotspot/test/compiler/calls/common/CallsBase.java
--- a/hotspot/test/compiler/calls/common/CallsBase.java	Sun Dec 11 19:07:04 2016 -0800
+++ b/hotspot/test/compiler/calls/common/CallsBase.java	Mon Dec 12 21:18:03 2016 +0300
@@ -82,16 +82,16 @@
      */
     protected final boolean compilationLevelsSupported() {
         int[] compLevels = CompilerUtils.getAvailableCompilationLevels();
-        boolean callerCompLevelSupported = compileCaller > 0
+        boolean callerCompLevelSupported = compileCaller <= 0 || (compileCaller > 0
                 && Arrays.stream(compLevels)
                         .filter(elem -> elem == compileCaller)
                         .findAny()
-                        .isPresent();
-        boolean calleeCompLevelSupported = compileCallee > 0
+                        .isPresent());
+        boolean calleeCompLevelSupported = compileCallee <= 0 || (compileCallee > 0
                 && Arrays.stream(compLevels)
                         .filter(elem -> elem == compileCallee)
                         .findAny()
-                        .isPresent();
+                        .isPresent());
         return callerCompLevelSupported && calleeCompLevelSupported;
     }