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

8275104: IR framework does not handle client VM builds correctly

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Christian Hagedorn 2021-10-25 07:25:19 +00:00
parent 5dab76b939
commit 1da5e6b0e2
8 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/hotspot/jtreg/compiler/lib/ir_framework/flag/FlagVM.java
View File

@ -27,6 +27,7 @@ import compiler.lib.ir_framework.CompLevel;
import compiler.lib.ir_framework.TestFramework;
import compiler.lib.ir_framework.shared.TestFrameworkException;
import compiler.lib.ir_framework.shared.TestRunException;
import jdk.test.lib.Platform;
import jdk.test.lib.process.ProcessTools;
import sun.hotspot.WhiteBox;
@ -72,7 +73,7 @@ public class FlagVM {
private static final boolean EXCLUDE_RANDOM = Boolean.getBoolean("ExcludeRandom");
private static final boolean FLIP_C1_C2 = Boolean.getBoolean("FlipC1C2");
private static final boolean REQUESTED_VERIFY_IR = Boolean.parseBoolean(System.getProperty("VerifyIR", "true"));
private static final boolean VERIFY_IR = REQUESTED_VERIFY_IR && USE_COMPILER && !EXCLUDE_RANDOM && !FLIP_C1_C2 && !TEST_C1;
private static final boolean VERIFY_IR = REQUESTED_VERIFY_IR && USE_COMPILER && !EXCLUDE_RANDOM && !FLIP_C1_C2 && !TEST_C1 && Platform.isServer();
private static String[] getPrintFlags() {
return new String[] {"-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions"};

21
test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
View File

@ -74,8 +74,18 @@ public class TestVM {
public static final int WARMUP_ITERATIONS = Integer.parseInt(System.getProperty("Warmup", "2000"));
private static final boolean TIERED_COMPILATION = (Boolean)WHITE_BOX.getVMFlag("TieredCompilation");
private static final CompLevel TIERED_COMPILATION_STOP_AT_LEVEL = CompLevel.forValue(((Long)WHITE_BOX.getVMFlag("TieredStopAtLevel")).intValue());
public static final boolean TEST_C1 = TIERED_COMPILATION && TIERED_COMPILATION_STOP_AT_LEVEL.getValue() < CompLevel.C2.getValue();
private static final CompLevel TIERED_COMPILATION_STOP_AT_LEVEL;
private static final boolean CLIENT_VM = Platform.isClient();
static {
CompLevel level = CompLevel.forValue(((Long)WHITE_BOX.getVMFlag("TieredStopAtLevel")).intValue());
if (CLIENT_VM && level == CompLevel.C2) {
// No C2 available, use C1 level without profiling.
level = CompLevel.C1_SIMPLE;
}
TIERED_COMPILATION_STOP_AT_LEVEL = level;
}
public static final boolean TEST_C1 = (TIERED_COMPILATION && TIERED_COMPILATION_STOP_AT_LEVEL.getValue() < CompLevel.C2.getValue()) || CLIENT_VM;
static final boolean XCOMP = Platform.isComp();
static final boolean VERBOSE = Boolean.getBoolean("Verbose");
@ -562,10 +572,13 @@ public class TestVM {
// Use highest available compilation level by default (usually C2).
compLevel = TIERED_COMPILATION_STOP_AT_LEVEL;
}
if (!TIERED_COMPILATION && compLevel.getValue() < CompLevel.C2.getValue()) {
if (TEST_C1 && compLevel == CompLevel.C2) {
return CompLevel.SKIP;
}
if (TIERED_COMPILATION && compLevel.getValue() > TIERED_COMPILATION_STOP_AT_LEVEL.getValue()) {
if ((!TIERED_COMPILATION && !CLIENT_VM) && compLevel.getValue() < CompLevel.C2.getValue()) {
return CompLevel.SKIP;
}
if ((TIERED_COMPILATION || CLIENT_VM) && compLevel.getValue() > TIERED_COMPILATION_STOP_AT_LEVEL.getValue()) {
return CompLevel.SKIP;
}
return compLevel;

4
test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/IRExample.java
View File

@ -95,8 +95,8 @@ public class IRExample {
// Only apply this rule if the VM flag UseZGC is true
@IR(applyIf = {"UseZGC", "true"}, failOn = IRNode.LOAD)
// We can also use comparators (<, <=, >, >=, !=, =) to restrict the rules.
// This rule is only applied if the loop unroll limit is 10 or greater.
@IR(applyIf = {"LoopUnrollLimit", ">= 10"}, failOn = IRNode.LOAD)
// This rule is only applied if TypeProfileLevel is 100 or greater.
@IR(applyIf = {"TypeProfileLevel", ">= 100"}, failOn = IRNode.LOAD)
public void goodFailOn() {
iFld = 42; // No load, no loop, no store to iFld2, no store to class Foo
}

15
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompLevels.java
View File

@ -25,6 +25,7 @@ package ir_framework.tests;
import compiler.lib.ir_framework.*;
import compiler.lib.ir_framework.test.TestVM;
import jdk.test.lib.Platform;
import java.lang.reflect.Method;
@ -57,10 +58,12 @@ public class TestCompLevels {
}
}
TestFramework framework = new TestFramework(TestNoTiered.class);
framework.setDefaultWarmup(10).addFlags("-XX:-TieredCompilation").start();
framework = new TestFramework(TestNoTiered.class);
framework.setDefaultWarmup(10).addScenarios(new Scenario(0, "-XX:-TieredCompilation")).start();
framework = new TestFramework(TestStopAtLevel1.class);
if (!Platform.isClient()) {
framework.setDefaultWarmup(10).addFlags("-XX:-TieredCompilation").start();
framework = new TestFramework(TestNoTiered.class);
framework.setDefaultWarmup(10).addScenarios(new Scenario(0, "-XX:-TieredCompilation")).start();
framework = new TestFramework(TestStopAtLevel1.class);
}
framework.setDefaultWarmup(10).addFlags("-XX:TieredStopAtLevel=1").start();
framework = new TestFramework(TestStopAtLevel1.class);
framework.setDefaultWarmup(10).addScenarios(new Scenario(0, "-XX:TieredStopAtLevel=1")).start();
@ -119,7 +122,9 @@ class TestNoTiered {
@Check(test = "level1")
public void check1(TestInfo info) {
TestFramework.assertNotCompiled(info.getTest()); // Never compiled without C1
if (!Platform.isClient()) {
TestFramework.assertNotCompiled(info.getTest()); // Never compiled without C1
}
}
@Test(compLevel = CompLevel.C1_LIMITED_PROFILE)

57
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestDIgnoreCompilerControls.java
View File

@ -24,6 +24,7 @@
package ir_framework.tests;
import compiler.lib.ir_framework.*;
import compiler.lib.ir_framework.driver.TestVMException;
import jdk.test.lib.Asserts;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;
@ -39,51 +40,43 @@ import sun.hotspot.WhiteBox;
*/
public class TestDIgnoreCompilerControls {
public static void main(String[] args) throws Exception {
if (args.length != 0) {
TestFramework.run();
} else {
OutputAnalyzer oa = run("true");
oa.shouldHaveExitValue(0);
oa = run("false");
oa.shouldNotHaveExitValue(0);
Asserts.assertTrue(oa.getOutput().contains("fail run"), "did not find run: " + oa.getOutput());
Asserts.assertTrue(oa.getOutput().contains("fail check"), "did not find check" + oa.getOutput());
public static void main(String[] args) {
// Ignore Compiler Control
TestFramework.runWithFlags("-XX:CompileCommand=option,ir_framework.tests.TestDIgnoreCompilerControls::test2,bool,PrintInlining,true",
"-DIgnoreCompilerControls=true");
Asserts.assertFalse(TestFramework.getLastTestVMOutput().contains("don't inline by annotation"), "should have inlined: "
+ TestFramework.getLastTestVMOutput());
// Don't ignore compiler control, sanity check
try {
TestFramework.runWithFlags("-XX:CompileCommand=option,ir_framework.tests.TestDIgnoreCompilerControls::test2,bool,PrintInlining,true",
"-DIgnoreCompilerControls=false");
throw new RuntimeException("should throw exception");
} catch (TestVMException e) {
Asserts.assertTrue(e.getExceptionInfo().contains("fail run"), "did not find exception with msg \"fail run\"");
Asserts.assertTrue(TestFramework.getLastTestVMOutput().contains("don't inline by annotation"), "should not have inlined: " + TestFramework.getLastTestVMOutput());
}
}
private static OutputAnalyzer run(String flagValue) throws Exception {
OutputAnalyzer oa;
ProcessBuilder process = ProcessTools.createJavaProcessBuilder(
"-Dtest.class.path=" + Utils.TEST_CLASS_PATH, "-Dtest.jdk=" + Utils.TEST_JDK,
"-Dtest.vm.opts=-DIgnoreCompilerControls=" + flagValue,
"ir_framework.tests.TestDIgnoreCompilerControls", flagValue);
oa = ProcessTools.executeProcess(process);
return oa;
}
@Test
public void test() { }
public void test() {}
@ForceCompile
public void ignoredForceCompile() {}
@Run(test = "test")
@Warmup(10000)
public void run(RunInfo info) throws NoSuchMethodException {
if (!info.isWarmUp()) {
// Should be compiled with -DIgnoreCompilerControls=true
Asserts.assertTrue(WhiteBox.getWhiteBox().isMethodCompiled(getClass().getDeclaredMethod("run", RunInfo.class)), "fail run");
Asserts.assertFalse(WhiteBox.getWhiteBox().isMethodCompiled(getClass().getDeclaredMethod("ignoredForceCompile")), "fail run");
}
}
@DontInline
public void ignoreDontInline() {}
@Test
@Warmup(10000)
public void test2() {}
@Check(test = "test2")
public void check(TestInfo info) throws NoSuchMethodException {
if (!info.isWarmUp()) {
// Should be compiled with -DIgnoreCompilerControls=true
Asserts.assertTrue(WhiteBox.getWhiteBox().isMethodCompiled(getClass().getDeclaredMethod("check", TestInfo.class)), "fail check");
}
public void test2() {
ignoreDontInline(); // Is inlined and therefore not compiled separately.
}
}

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

@ -37,7 +37,7 @@ import java.util.regex.Pattern;
/*
* @test
* @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler2.enabled & vm.flagless
* @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler1.enabled & vm.compiler2.enabled & vm.flagless
* @summary Test IR matcher with different default IR node regexes. Use -DPrintIREncoding.
* Normally, the framework should be called with driver.
* @library /test/lib /testlibrary_tests /

6
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSanity.java
View File

@ -67,12 +67,12 @@ public class TestSanity {
testFramework = new TestFramework();
testFramework.addScenarios(sDefault).addScenarios(s1, s2).start();
testFramework = new TestFramework();
testFramework.addHelperClasses(HelperA.class).addScenarios(sDefault).addFlags("-XX:+UseSuperWord").start();
testFramework.addHelperClasses(HelperA.class).addScenarios(sDefault).addFlags("-XX:+UseTLAB").start();
testFramework = new TestFramework();
testFramework.addHelperClasses(HelperA.class).addFlags("-XX:+UseSuperWord", "-XX:+UseCompiler").addScenarios(sDefault)
testFramework.addHelperClasses(HelperA.class).addFlags("-XX:+UseTLAB", "-XX:+UseCompiler").addScenarios(sDefault)
.addHelperClasses(HelperB.class, HelperC.class).addScenarios(s1, s2).addFlags("-XX:+TieredCompilation").start();
testFramework = new TestFramework();
testFramework.addHelperClasses(HelperA.class).addFlags("-XX:+UseSuperWord", "-XX:+UseCompiler").addScenarios(sDefault)
testFramework.addHelperClasses(HelperA.class).addFlags("-XX:+UseTLAB", "-XX:+UseCompiler").addScenarios(sDefault)
.addHelperClasses(HelperB.class, HelperC.class).addScenarios(s1, s2).setDefaultWarmup(200)
.addFlags("-XX:+TieredCompilation").start();
}

2
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestWithHelperClasses.java
View File

@ -30,7 +30,7 @@ import jdk.test.lib.Asserts;
/*
* @test
* @requires vm.flagless
* @requires vm.flagless & vm.compiler1.enabled & vm.compiler2.enabled
* @summary Test the framework with helper classes.
* @library /test/lib /
* @run driver ir_framework.tests.TestWithHelperClasses