8171060: [AOT] aot tests: WARNING: Requested compilation levels are out of current vm capabilities

Reviewed-by: kvn
This commit is contained in:
Dmitrij Pochepko 2016-12-12 21:18:03 +03:00
parent 2841c5eb2b
commit 55dcedfbc8
11 changed files with 34 additions and 34 deletions

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -82,16 +82,16 @@ public abstract class CallsBase {
*/
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;
}