infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-04 07:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8254805: compiler/debug/TestStressCM.java is still failing

Browse Source 
Use the code motion trace produced by TraceOptoPipelining (excluding traces of
stubs) to assert that two compilations with the same seed cause StressLCM and
StressGCM to take the same randomized decisions. Previously, the entire output
produced by PrintOptoStatistics was used instead, which has shown to be too
fragile. Also, disable inlining in both TestStressCM.java and the similar
TestStressIGVN.java to prevent flaky behavior, and run both tests for ten
different seeds to improve coverage.

Reviewed-by: kvn, thartmann
This commit is contained in:
Roberto Castañeda Lozano 2020-10-20 06:08:25 +00:00 committed by Tobias Hartmann
parent 355f44dd11
commit 98ec4a6792
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/hotspot/jtreg/compiler/debug/TestStressCM.java
View File

@ -32,10 +32,7 @@ import jdk.test.lib.Asserts;
* @bug 8253765
* @requires vm.debug == true & vm.compiler2.enabled
* @summary Tests that, when compiling with StressLCM or StressGCM, using the
* same seed results in the same compilation. The output of
* PrintOptoStatistics is used to compare among compilations, instead
* of the more intuitive TraceOptoPipelining which prints
* non-deterministic memory addresses.
* same seed yields the same code motion trace.
* @library /test/lib /
* @run driver compiler.debug.TestStressCM StressLCM
* @run driver compiler.debug.TestStressCM StressGCM
@ -43,16 +40,33 @@ import jdk.test.lib.Asserts;
public class TestStressCM {
static String optoStats(String stressOpt, int stressSeed) throws Exception {
static String cmTrace(String stressOpt, int stressSeed) throws Exception {
String className = TestStressCM.class.getName();
String[] procArgs = {
"-Xcomp", "-XX:-TieredCompilation",
"-Xcomp", "-XX:-TieredCompilation", "-XX:-Inline",
"-XX:CompileOnly=" + className + "::sum",
"-XX:+PrintOptoStatistics", "-XX:+" + stressOpt,
"-XX:+TraceOptoPipelining", "-XX:+" + stressOpt,
"-XX:StressSeed=" + stressSeed, className, "10"};
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(procArgs);
OutputAnalyzer out = new OutputAnalyzer(pb.start());
return out.getStdout();
// Extract the trace of our method (the last one after those of all
// mandatory stubs such as _new_instance_Java, etc.).
String [] traces = out.getStdout().split("\\R");
int start = -1;
for (int i = traces.length - 1; i >= 0; i--) {
if (traces[i].contains("Start GlobalCodeMotion")) {
start = i;
break;
}
}
// We should have found the start of the trace.
Asserts.assertTrue(start >= 0,
"could not find the code motion trace");
String trace = "";
for (int i = start; i < traces.length; i++) {
trace += traces[i] + "\n";
}
return trace;
}
static void sum(int n) {
@ -64,8 +78,10 @@ public class TestStressCM {
public static void main(String[] args) throws Exception {
if (args[0].startsWith("Stress")) {
String stressOpt = args[0];
Asserts.assertEQ(optoStats(stressOpt, 10), optoStats(stressOpt, 10),
"got different optimization stats for the same seed");
for (int s = 0; s < 10; s++) {
Asserts.assertEQ(cmTrace(stressOpt, s), cmTrace(stressOpt, s),
"got different code motion traces for the same seed " + s);
}
} else if (args.length > 0) {
sum(Integer.parseInt(args[0]));
}

8
test/hotspot/jtreg/compiler/debug/TestStressIGVN.java
View File

@ -42,7 +42,7 @@ public class TestStressIGVN {
static String igvnTrace(int stressSeed) throws Exception {
String className = TestStressIGVN.class.getName();
String[] procArgs = {
"-Xcomp", "-XX:-TieredCompilation",
"-Xcomp", "-XX:-TieredCompilation", "-XX:-Inline",
"-XX:CompileOnly=" + className + "::sum", "-XX:+TraceIterativeGVN",
"-XX:+StressIGVN", "-XX:StressSeed=" + stressSeed,
className, "10"};
@ -59,8 +59,10 @@ public class TestStressIGVN {
public static void main(String[] args) throws Exception {
if (args.length == 0) {
Asserts.assertEQ(igvnTrace(10), igvnTrace(10),
"got different IGVN traces for the same seed");
for (int s = 0; s < 10; s++) {
Asserts.assertEQ(igvnTrace(s), igvnTrace(s),
"got different IGVN traces for the same seed");
}
} else if (args.length > 0) {
sum(Integer.parseInt(args[0]));
}