1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8198915: [Graal] 3rd testcase of compiler/types/TestMeetIncompatibleInterfaceArrays.java takes more than 10 mins

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Volker Simonis 2018-03-28 11:27:35 +02:00
parent 3bb4de100a
commit fe3badf59a
1 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015 SAP SE. All rights reserved. * Copyright (c) 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -27,7 +27,7 @@
* @summary C2 can not handle returns with inccompatible interface arrays * @summary C2 can not handle returns with inccompatible interface arrays
* @modules java.base/jdk.internal.org.objectweb.asm * @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc * java.base/jdk.internal.misc
* @library /test/lib * @library /test/lib /
* *
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
@ -37,7 +37,6 @@
* -XX:+UnlockDiagnosticVMOptions * -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI * -XX:+WhiteBoxAPI
* -Xbatch * -Xbatch
* -XX:CompileThreshold=1
* -XX:-TieredCompilation * -XX:-TieredCompilation
* -XX:CICompilerCount=1 * -XX:CICompilerCount=1
* -XX:+PrintCompilation * -XX:+PrintCompilation
@ -51,7 +50,6 @@
* -XX:+UnlockDiagnosticVMOptions * -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI * -XX:+WhiteBoxAPI
* -Xbatch * -Xbatch
* -XX:CompileThreshold=1
* -XX:-TieredCompilation * -XX:-TieredCompilation
* -XX:CICompilerCount=1 * -XX:CICompilerCount=1
* -XX:+PrintCompilation * -XX:+PrintCompilation
@ -65,11 +63,6 @@
* -XX:+UnlockDiagnosticVMOptions * -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI * -XX:+WhiteBoxAPI
* -Xbatch * -Xbatch
* -XX:CompileThreshold=1
* -XX:Tier0InvokeNotifyFreqLog=0 -XX:Tier2InvokeNotifyFreqLog=0 -XX:Tier3InvokeNotifyFreqLog=0 -XX:Tier23InlineeNotifyFreqLog=0
* -XX:Tier3InvocationThreshold=2 -XX:Tier3MinInvocationThreshold=2 -XX:Tier3CompileThreshold=2
* -XX:Tier4InvocationThreshold=1 -XX:Tier4MinInvocationThreshold=1 -XX:Tier4CompileThreshold=1
* -XX:+TieredCompilation
* -XX:CICompilerCount=2 * -XX:CICompilerCount=2
* -XX:+PrintCompilation * -XX:+PrintCompilation
* -XX:+PrintInlining * -XX:+PrintInlining
@ -84,6 +77,7 @@
package compiler.types; package compiler.types;
import compiler.whitebox.CompilerWhiteBoxTest;
import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor; import jdk.internal.org.objectweb.asm.MethodVisitor;
import sun.hotspot.WhiteBox; import sun.hotspot.WhiteBox;
@ -190,8 +184,8 @@ public class TestMeetIncompatibleInterfaceArrays extends ClassLoader {
* return Helper.createI2Array3(); // returns I1[][][] which gives a verifier error because return expects I1[][][][] * return Helper.createI2Array3(); // returns I1[][][] which gives a verifier error because return expects I1[][][][]
* } * }
* public static void test() { * public static void test() {
* I1[][][][][] i1 = run(); * I1[][][][] i1 = run();
* System.out.println(i1[0][0][0][0][0].getName()); * System.out.println(i1[0][0][0][0].getName());
* } * }
* ... * ...
* public class MeetIncompatibleInterfaceArrays5ASM { * public class MeetIncompatibleInterfaceArrays5ASM {
@ -306,9 +300,25 @@ public class TestMeetIncompatibleInterfaceArrays extends ClassLoader {
} }
public static String[][] tier = { { "interpreted", "C2 (tier 4) without inlining", "C2 (tier4) without inlining" }, public static String[][] tier = { { "interpreted (tier 0)",
{ "interpreted", "C2 (tier 4) with inlining", "C2 (tier4) with inlining" }, "C2 (tier 4) without inlining",
{ "interpreted", "C1 (tier 3) with inlining", "C2 (tier4) with inlining" } }; "C2 (tier 4) without inlining" },
{ "interpreted (tier 0)",
"C2 (tier 4) with inlining",
"C2 (tier 4) with inlining" },
{ "interpreted (tier 0)",
"C1 (tier 3) with inlining",
"C2 (tier 4) with inlining" } };
public static int[][] level = { { CompilerWhiteBoxTest.COMP_LEVEL_NONE,
CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION,
CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION },
{ CompilerWhiteBoxTest.COMP_LEVEL_NONE,
CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION,
CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION },
{ CompilerWhiteBoxTest.COMP_LEVEL_NONE,
CompilerWhiteBoxTest.COMP_LEVEL_FULL_PROFILE,
CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION } };
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
final int pass = Integer.parseInt(args.length > 0 ? args[0] : "0"); final int pass = Integer.parseInt(args.length > 0 ? args[0] : "0");
@ -344,8 +354,11 @@ public class TestMeetIncompatibleInterfaceArrays extends ClassLoader {
Method m = c.getMethod("test"); Method m = c.getMethod("test");
Method r = c.getMethod("run"); Method r = c.getMethod("run");
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
System.out.println((j + 1) + ". invokation of " + baseClassName + i + "ASM.test() [should be " System.out.println((j + 1) + ". invokation of " + baseClassName + i + "ASM.test() [::" +
+ tier[pass][j] + "]"); r.getName() + "() should be '" + tier[pass][j] + "' compiled]");
WB.enqueueMethodForCompilation(r, level[pass][j]);
try { try {
m.invoke(null); m.invoke(null);
} catch (InvocationTargetException ite) { } catch (InvocationTargetException ite) {
@ -360,10 +373,16 @@ public class TestMeetIncompatibleInterfaceArrays extends ClassLoader {
} }
} }
} }
}
System.out.println("Method " + r + (WB.isMethodCompiled(r) ? " has" : " has not") + " been compiled."); int r_comp_level = WB.getMethodCompilationLevel(r);
if (!WB.isMethodCompiled(r)) { System.out.println(" invokation of " + baseClassName + i + "ASM.test() [::" +
throw new Exception("Method " + r + " must be compiled!"); r.getName() + "() was compiled at tier " + r_comp_level + "]");
if (r_comp_level != level[pass][j]) {
throw new Exception("Method " + r + " must be compiled at tier " + r_comp_level + " !");
}
WB.deoptimizeMethod(r);
} }
} }
} }