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

8247751: Shenandoah: options tests should run with smaller heaps

Browse Source 
Reviewed-by: zgu, rkennke
This commit is contained in:
Aleksey Shipilev 2020-06-17 17:21:47 +02:00
parent aeeaffa888
commit d2c1027edc
12 changed files with 59 additions and 17 deletions

28
test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java

@ -46,7 +46,9 @@ public class TestArgumentRanges {
private static void testHeuristics() throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahGCHeuristics=aggressive",
@ -55,7 +57,9 @@ public class TestArgumentRanges {
output.shouldHaveExitValue(0);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahGCHeuristics=static",
@ -64,7 +68,9 @@ public class TestArgumentRanges {
output.shouldHaveExitValue(0);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahGCHeuristics=fluff",
@ -77,7 +83,9 @@ public class TestArgumentRanges {
private static void testRange(String option, int min, int max) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + (max + 1),
@ -86,7 +94,9 @@ public class TestArgumentRanges {
output.shouldHaveExitValue(1);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + max,
@ -95,7 +105,9 @@ public class TestArgumentRanges {
output.shouldHaveExitValue(0);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + (min - 1),
@ -104,7 +116,9 @@ public class TestArgumentRanges {
output.shouldHaveExitValue(1);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + min,

7
test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java

@ -39,9 +39,10 @@ import jdk.test.lib.process.OutputAnalyzer;
public class TestClassUnloadingArguments {
public static void testWith(String msg, boolean cu, boolean cuConc, String... args) throws Exception {
String[] cmds = Arrays.copyOf(args, args.length + 2);
cmds[args.length] = "-XX:+PrintFlagsFinal";
cmds[args.length + 1] = "-version";
String[] cmds = Arrays.copyOf(args, args.length + 3);
cmds[args.length] = "-Xmx128m";
cmds[args.length + 1] = "-XX:+PrintFlagsFinal";
cmds[args.length + 2] = "-version";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(cmds);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);

5
test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java

@ -61,6 +61,7 @@ public class TestExplicitGC {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@ -77,6 +78,7 @@ public class TestExplicitGC {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@ -94,6 +96,7 @@ public class TestExplicitGC {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@ -111,6 +114,7 @@ public class TestExplicitGC {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@ -128,6 +132,7 @@ public class TestExplicitGC {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",

1
test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java

@ -61,6 +61,7 @@ public class TestExplicitGCNoConcurrent {
for (String opt : opts) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",

3
test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java

@ -53,6 +53,7 @@ public class TestHeuristicsUnlock {
private static void testWith(String h, Mode mode) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -73,6 +74,7 @@ public class TestHeuristicsUnlock {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -93,6 +95,7 @@ public class TestHeuristicsUnlock {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",

12
test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java

@ -38,7 +38,9 @@ import jdk.test.lib.process.OutputAnalyzer;
public class TestHumongousThresholdArgs {
public static void main(String[] args) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
@ -49,7 +51,9 @@ public class TestHumongousThresholdArgs {
int[] invalid = new int[] {-100, -1, 0, 101, 1000};
for (int v : valid) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahHumongousThreshold=" + v,
"-version");
@ -58,7 +62,9 @@ public class TestHumongousThresholdArgs {
}
for (int v : invalid) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahHumongousThreshold=" + v,
"-version");

7
test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java

@ -40,9 +40,10 @@ import jdk.test.lib.process.OutputAnalyzer;
public class TestLoopMiningArguments {
public static void testWith(String msg, boolean cls, int iters, String... args) throws Exception {
String[] cmds = Arrays.copyOf(args, args.length + 2);
cmds[args.length] = "-XX:+PrintFlagsFinal";
cmds[args.length + 1] = "-version";
String[] cmds = Arrays.copyOf(args, args.length + 3);
cmds[args.length] = "-Xmx128m";
cmds[args.length + 1] = "-XX:+PrintFlagsFinal";
cmds[args.length + 2] = "-version";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(cmds);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);

3
test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java

@ -52,6 +52,7 @@ public class TestModeUnlock {
private static void testWith(String h, Mode mode) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -72,6 +73,7 @@ public class TestModeUnlock {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -92,6 +94,7 @@ public class TestModeUnlock {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",

4
test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java

@ -45,7 +45,9 @@ public class TestThreadCounts {
}
private static void testWith(int conc, int par) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ConcGCThreads=" + conc,

2
test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java

@ -39,6 +39,7 @@ public class TestThreadCountsOverride {
public static void main(String[] args) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -53,6 +54,7 @@ public class TestThreadCountsOverride {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",

2
test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java

@ -62,6 +62,7 @@ public class TestWrongBarrierDisable {
private static void shouldFailAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -79,6 +80,7 @@ public class TestWrongBarrierDisable {
private static void shouldPassAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",

2
test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java

@ -56,6 +56,7 @@ public class TestWrongBarrierEnable {
private static void shouldFailAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@ -73,6 +74,7 @@ public class TestWrongBarrierEnable {
private static void shouldPassAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",