stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8274911: testlibrary_tests/ir_framework/tests/TestIRMatching.java fails with "java.lang.RuntimeException: Should have thrown exception"

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Christian Hagedorn 2021-10-12 13:21:35 +00:00
parent e393c5ea9d
commit f623460668
4 changed files with 90 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/compiler/lib/ir_framework/driver/IRMatcher.java
View File

@ -495,7 +495,7 @@ public class IRMatcher {
// Do not throw an exception in this case (i.e. bailout). // Do not throw an exception in this case (i.e. bailout).
String compilations = compilationsBuilder.toString(); String compilations = compilationsBuilder.toString();
if (!compilations.contains(SAFEPOINT_WHILE_PRINTING_MESSAGE)) { if (!compilations.contains(SAFEPOINT_WHILE_PRINTING_MESSAGE)) {
throw new IRViolationException(failuresBuilder.toString(), compilationsBuilder.toString()); throw new IRViolationException(failuresBuilder.toString(), compilations);
} else { } else {
System.out.println("Found " + SAFEPOINT_WHILE_PRINTING_MESSAGE + ", bail out of IR matching"); System.out.println("Found " + SAFEPOINT_WHILE_PRINTING_MESSAGE + ", bail out of IR matching");
} }

146
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
View File

@ -31,9 +31,7 @@ import sun.hotspot.WhiteBox;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -51,22 +49,32 @@ import java.util.regex.Pattern;
public class TestIRMatching { public class TestIRMatching {
private static final List<Exception> exceptions = new ArrayList<>(); private static final Map<Exception, String> exceptions = new LinkedHashMap<>();
private static final ByteArrayOutputStream baos = new ByteArrayOutputStream();
private static final ByteArrayOutputStream baosErr = new ByteArrayOutputStream();
private static final PrintStream ps = new PrintStream(baos);
private static final PrintStream psErr = new PrintStream(baosErr);
private static final PrintStream oldOut = System.out;
private static final PrintStream oldErr = System.err;
private static void addException(Exception e) { private static void addException(Exception e) {
System.out.println(TestFramework.getLastTestVMOutput()); System.out.flush();
exceptions.add(e); System.err.flush();
exceptions.put(e, baos.toString() + System.lineSeparator() + baosErr.toString());
} }
public static void main(String[] args) { public static void main(String[] args) {
runFailOnTestsArgs(BadFailOnConstraint.create(AndOr1.class, "test1(int)", 1, "CallStaticJava"), "-XX:TLABRefillWasteFraction=50", "-XX:+UsePerfData", "-XX:+UseTLAB"); // Redirect System.out and System.err to reduce noise.
runFailOnTestsArgs(BadFailOnConstraint.create(AndOr1.class, "test2()", 1, "CallStaticJava"), "-XX:TLABRefillWasteFraction=50", "-XX:-UsePerfData", "-XX:+UseTLAB"); System.setOut(ps);
System.setErr(psErr);
runWithArguments(AndOr1.class, "-XX:TLABRefillWasteFraction=52", "-XX:+UsePerfData", "-XX:+UseTLAB"); runWithArguments(AndOr1.class, "-XX:TLABRefillWasteFraction=52", "-XX:+UsePerfData", "-XX:+UseTLAB");
runWithArguments(CountComparisons.class, "-XX:TLABRefillWasteFraction=50"); runWithArguments(CountComparisons.class, "-XX:TLABRefillWasteFraction=50");
runWithArguments(GoodCount.class, "-XX:TLABRefillWasteFraction=50"); runWithArguments(GoodCount.class, "-XX:TLABRefillWasteFraction=50");
runWithArguments(MultipleFailOnGood.class, "-XX:TLABRefillWasteFraction=50"); runWithArguments(MultipleFailOnGood.class, "-XX:TLABRefillWasteFraction=50");
runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:+UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test1(int)", 1, "CallStaticJava"));
runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:-UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test2()", 1, "CallStaticJava"));
String[] allocMatches = { "MyClass", "wrapper for: _new_instance_Java" }; String[] allocMatches = { "MyClass", "wrapper for: _new_instance_Java" };
runCheck(BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1, 1, "Store"), runCheck(BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1, 1, "Store"),
BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1, 3, "Store"), BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1, 3, "Store"),
@ -223,18 +231,12 @@ public class TestIRMatching {
: BadFailOnConstraint.create(CheckCastArray.class, "arrayCopy(java.lang.Object[],java.lang.Class)", 1, "checkcast_arraycopy") : BadFailOnConstraint.create(CheckCastArray.class, "arrayCopy(java.lang.Object[],java.lang.Class)", 1, "checkcast_arraycopy")
); );
// Redirect stdout to stream and then check if we find required IR encoding read from socket.
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos);
PrintStream old = System.out;
System.setOut(ps);
try { try {
runWithArgumentsFail(CompilationOutputOfFails.class); runWithArgumentsFail(CompilationOutputOfFails.class);
Utils.shouldHaveThrownException(); Utils.shouldHaveThrownException(baos.toString());
} catch (IRViolationException e) { } catch (IRViolationException e) {
try { try {
boolean failed = false; StringBuilder failures = new StringBuilder();
System.out.flush(); System.out.flush();
String output = baos.toString(); String output = baos.toString();
baos.reset(); baos.reset();
@ -242,36 +244,36 @@ public class TestIRMatching {
Matcher matcher = pattern.matcher(output); Matcher matcher = pattern.matcher(output);
long bothCount = matcher.results().count(); long bothCount = matcher.results().count();
if (bothCount != 7L) { if (bothCount != 7L) {
exceptions.add(new RuntimeException("Could not find all both() methods, expected 7 but found " + bothCount)); failures.append("- Could not find all both() methods, expected 7 but found ").append(bothCount).append(System.lineSeparator());
failed = true;
} }
pattern = Pattern.compile(">>> Compilation.*ideal\\d.*\\RPrintIdeal:(?:(?!>>> Compilation)[\\S\\s])+"); pattern = Pattern.compile(">>> Compilation.*ideal\\d.*\\RPrintIdeal:(?:(?!>>> Compilation)[\\S\\s])+");
matcher = pattern.matcher(output); matcher = pattern.matcher(output);
int count = 0; int count = 0;
while (matcher.find()) { while (matcher.find()) {
String match = matcher.group(); String match = matcher.group();
Asserts.assertFalse(match.contains("PrintOptoAssembly"), "Cannot contain opto assembly: " + output); if (match.contains("PrintOptoAssembly")) {
failures.append("Cannot contain opto assembly: ").append(System.lineSeparator()).append(match);
}
count++; count++;
} }
if (count != 7) { if (count != 7) {
exceptions.add(new RuntimeException("Could not find all ideal() methods, expected 7 but found " + count)); failures.append("- Could not find all ideal() methods, expected 7 but found ").append(count).append(System.lineSeparator());
failed = true;
} }
pattern = Pattern.compile(">>> Compilation.*opto\\d.*\\RPrintOptoAssembly:(?:(?!>>> Compilation)[\\S\\s])+"); pattern = Pattern.compile(">>> Compilation.*opto\\d.*\\RPrintOptoAssembly:(?:(?!>>> Compilation)[\\S\\s])+");
matcher = pattern.matcher(output); matcher = pattern.matcher(output);
count = 0; count = 0;
while (matcher.find()) { while (matcher.find()) {
String match = matcher.group(); String match = matcher.group();
Asserts.assertFalse(match.contains("PrintIdeal"), "Cannot contain opto assembly: " + output); if (match.contains("PrintIdeal")) {
failures.append("Cannot contain print assembly: ").append(System.lineSeparator()).append(match);
}
count++; count++;
} }
if (count != 7) { if (count != 7) {
exceptions.add(new RuntimeException("Could not find all opto() methods, expected 7 but found " + count)); failures.append("- Could not find all opto() methods, expected 7 but found ").append(count).append(System.lineSeparator());
failed = true;
} }
if (failed) { if (!failures.isEmpty()) {
System.err.println(TestFramework.getLastTestVMOutput()); addException(new RuntimeException(failures.toString()));
System.err.println(output);
} }
} catch (Exception e1) { } catch (Exception e1) {
addException(e1); addException(e1);
@ -283,52 +285,80 @@ public class TestIRMatching {
runWithArguments(FlagComparisons.class, "-XX:TLABRefillWasteFraction=50"); runWithArguments(FlagComparisons.class, "-XX:TLABRefillWasteFraction=50");
System.out.flush(); System.out.flush();
String output = baos.toString(); String output = baos.toString();
baos.reset();
findIrIds(output, "testMatchAllIf50", 0, 21); findIrIds(output, "testMatchAllIf50", 0, 21);
findIrIds(output, "testMatchNoneIf50", -1, -1); findIrIds(output, "testMatchNoneIf50", -1, -1);
runWithArguments(FlagComparisons.class, "-XX:TLABRefillWasteFraction=49"); runWithArguments(FlagComparisons.class, "-XX:TLABRefillWasteFraction=49");
System.out.flush(); System.out.flush();
output = baos.toString(); output = baos.toString();
baos.reset();
findIrIds(output, "testMatchAllIf50", 4, 6, 13, 18); findIrIds(output, "testMatchAllIf50", 4, 6, 13, 18);
findIrIds(output, "testMatchNoneIf50", 0, 3, 8, 10, 17, 22); findIrIds(output, "testMatchNoneIf50", 0, 3, 8, 10, 17, 22);
runWithArguments(FlagComparisons.class, "-XX:TLABRefillWasteFraction=51"); runWithArguments(FlagComparisons.class, "-XX:TLABRefillWasteFraction=51");
System.out.flush(); System.out.flush();
output = baos.toString(); output = baos.toString();
baos.reset();
findIrIds(output, "testMatchAllIf50", 7, 12, 19, 21); findIrIds(output, "testMatchAllIf50", 7, 12, 19, 21);
findIrIds(output, "testMatchNoneIf50", 4, 7, 11, 16, 20, 22); findIrIds(output, "testMatchNoneIf50", 4, 7, 11, 16, 20, 22);
System.setOut(old); System.setOut(oldOut);
System.setErr(oldErr);
if (!exceptions.isEmpty()) { if (!exceptions.isEmpty()) {
System.err.println("TestIRMatching failed with one or more exceptions:"); System.err.println("TestIRMatching failed with " + exceptions.size() + " exception(s):");
for (Exception e : exceptions) { int i = 1;
System.err.println(e.getMessage()); System.err.println("************************");
for (Map.Entry<Exception, String> entry : exceptions.entrySet()) {
System.err.println("***** Exception " + String.format("%02d", i++) +" *****");
System.err.println("************************");
Exception e = entry.getKey();
e.printStackTrace(System.err); e.printStackTrace(System.err);
System.err.println("---------"); System.err.println();
System.err.println("===== OUTPUT ======");
System.err.println(entry.getValue());
System.err.println("MESSAGE: " + e.getMessage());
System.err.println("************************");
} }
throw new RuntimeException("TestIRMatching failed with one or more exceptions - check stderr and stdout"); i = 1;
System.err.println("====================================");
System.err.println("********************");
System.err.println("***** OVERVIEW *****");
System.err.println("********************");
for (Map.Entry<Exception, String> entry : exceptions.entrySet()) {
Exception e = entry.getKey();
System.err.print((i++) + ") ");
entry.getKey().printStackTrace(System.err);
System.err.println("********************");
}
throw new RuntimeException("TestIRMatching failed with " + exceptions.size() + " exception(s) - check stderr and stdout");
} }
} }
private static void runFramework(TestFramework framework) {
baos.reset();
baosErr.reset();
framework.start();
}
private static void runWithArguments(Class<?> clazz, String... args) { private static void runWithArguments(Class<?> clazz, String... args) {
try { try {
new TestFramework(clazz).addFlags(args).start(); runFramework(new TestFramework(clazz).addFlags(args));
} catch (Exception e) { } catch (Exception e) {
addException(e); addException(e);
} }
} }
private static void runWithArgumentsFail(Class<?> clazz, String... args) { private static void runWithArgumentsFail(Class<?> clazz, String... args) {
new TestFramework(clazz).addFlags(args).start(); runFramework(new TestFramework(clazz).addFlags(args));
} }
private static void runCheck(String[] args , Constraint... constraints) { private static void runCheck(String[] args , Constraint... constraints) {
try { try {
new TestFramework(constraints[0].getKlass()).addFlags(args).start(); // All constraints have the same class. TestFramework framework = new TestFramework(constraints[0].getKlass()); // All constraints have the same class.
Utils.shouldHaveThrownException(); if (args != null) {
framework.addFlags(args);
}
runFramework(framework);
Utils.shouldHaveThrownException(baos.toString());
} catch (IRViolationException e) { } catch (IRViolationException e) {
checkConstraints(e, constraints); checkConstraints(e, constraints);
} catch (Exception e) { } catch (Exception e) {
@ -337,14 +367,7 @@ public class TestIRMatching {
} }
private static void runCheck(Constraint... constraints) { private static void runCheck(Constraint... constraints) {
try { runCheck(null, constraints);
TestFramework.run(constraints[0].getKlass()); // All constraints have the same class.
Utils.shouldHaveThrownException();
} catch (IRViolationException e) {
checkConstraints(e, constraints);
} catch (Exception e) {
addException(e);
}
} }
private static void checkConstraints(IRViolationException e, Constraint[] constraints) { private static void checkConstraints(IRViolationException e, Constraint[] constraints) {
@ -354,25 +377,9 @@ public class TestIRMatching {
constraint.checkConstraint(e); constraint.checkConstraint(e);
} }
} catch (Exception e1) { } catch (Exception e1) {
System.out.println(TestFramework.getLastTestVMOutput()); System.out.println(e.getCompilations());
System.out.println(message); System.out.println(message);
exceptions.add(e1); addException(e1);
}
}
// Single constraint
private static void runFailOnTestsArgs(Constraint constraint, String... args) {
try {
new TestFramework(constraint.getKlass()).addFlags(args).start(); // All constraints have the same class.
Utils.shouldHaveThrownException();
} catch (IRViolationException e) {
try {
constraint.checkConstraint(e);
} catch (Exception e1) {
addException(e);
}
} catch (Exception e) {
addException(e);
} }
} }
@ -387,8 +394,9 @@ public class TestIRMatching {
builder.append(j); builder.append(j);
} }
} }
Asserts.assertTrue(output.contains(builder.toString()), "Could not find encoding: \"" + builder.toString() if (!output.contains(builder.toString())) {
+ System.lineSeparator()); addException(new RuntimeException("Could not find encoding: \"" + builder.toString() + System.lineSeparator()));
}
} }
} }

11
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
View File

@ -28,6 +28,8 @@ import compiler.lib.ir_framework.driver.IRViolationException;
import compiler.lib.ir_framework.shared.TestRunException; import compiler.lib.ir_framework.shared.TestRunException;
import jdk.test.lib.Asserts; import jdk.test.lib.Asserts;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.Arrays; import java.util.Arrays;
/* /*
@ -41,15 +43,22 @@ import java.util.Arrays;
public class TestRunTests { public class TestRunTests {
public static void main(String[] args) { public static void main(String[] args) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos);
PrintStream oldOut = System.out;
System.setOut(ps);
TestFramework.run(); TestFramework.run();
try { try {
TestFramework.run(BadStandalone.class); TestFramework.run(BadStandalone.class);
Utils.shouldHaveThrownException(); Utils.shouldHaveThrownException(baos.toString());
} catch (IRViolationException e) { } catch (IRViolationException e) {
System.setOut(oldOut);
String[] matches = { "test(int)", "test2(int)", "Failed IR Rules (2)"}; String[] matches = { "test(int)", "test2(int)", "Failed IR Rules (2)"};
Arrays.stream(matches).forEach(m -> Asserts.assertTrue(e.getExceptionInfo().contains(m))); Arrays.stream(matches).forEach(m -> Asserts.assertTrue(e.getExceptionInfo().contains(m)));
Asserts.assertEQ(e.getExceptionInfo().split("STANDALONE mode", -1).length - 1, 2); Asserts.assertEQ(e.getExceptionInfo().split("STANDALONE mode", -1).length - 1, 2);
} }
System.setOut(oldOut);
new TestFramework(SkipCompilation.class).addFlags("-XX:-UseCompiler").start(); new TestFramework(SkipCompilation.class).addFlags("-XX:-UseCompiler").start();
new TestFramework(SkipCompilation.class).addFlags("-Xint").start(); new TestFramework(SkipCompilation.class).addFlags("-Xint").start();
new TestFramework(SkipC2Compilation.class).addFlags("-XX:TieredStopAtLevel=1").start(); new TestFramework(SkipC2Compilation.class).addFlags("-XX:TieredStopAtLevel=1").start();

4
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/Utils.java
View File

@ -31,10 +31,10 @@ import jdk.test.lib.Asserts;
import java.util.Arrays; import java.util.Arrays;
public class Utils { public class Utils {
public static void shouldHaveThrownException() { public static void shouldHaveThrownException(String s) {
// Do not throw an exception if we hit a safepoint while printing which could possibly let the IR matching fail. // Do not throw an exception if we hit a safepoint while printing which could possibly let the IR matching fail.
// This happens very rarely. If there is a problem with the test, then we will catch that on the next test invocation. // This happens very rarely. If there is a problem with the test, then we will catch that on the next test invocation.
if (!TestVMProcess.getLastTestVMOutput().contains(IRMatcher.SAFEPOINT_WHILE_PRINTING_MESSAGE)) { if (!s.contains(IRMatcher.SAFEPOINT_WHILE_PRINTING_MESSAGE)) {
Asserts.fail("Should have thrown exception"); Asserts.fail("Should have thrown exception");
} }
} }