Skip to content
Permalink
Browse files

8235907: Fix tests referencing UseParallelOldGC

Remove tests using the obsolete UseParallelOldGC flag.

Reviewed-by: lkorinth, dlong
  • Loading branch information
Thomas Schatzl
Thomas Schatzl committed Dec 16, 2019
1 parent 89e0d29 commit bc97279caf9a838f7daa5cb7fd8dcc2a3c599d14
Showing with 27 additions and 328 deletions.
  1. +0 −1 test/hotspot/jtreg/gc/TestSystemGC.java
  2. +2 −4 test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java
  3. +1 −3 test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java
  4. +0 −1 test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java
  5. +2 −2 test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java
  6. +2 −2 test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java
  7. +4 −4 test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java
  8. +2 −2 test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java
  9. +2 −2 test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java
  10. +0 −1 test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
  11. +0 −1 test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithParallel.java
  12. +0 −1 test/hotspot/jtreg/runtime/CompressedOops/UseCompressedOops.java
  13. +0 −49 test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java
  14. +1 −1 test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
  15. +0 −42 test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java
  16. +1 −1 test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java
  17. +1 −1 test/jdk/jdk/jfr/event/gc/collection/TestGCWithFasttime.java
  18. +1 −1 test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java
  19. +1 −1 test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.java
  20. +1 −1 test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.java
  21. +1 −1 test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.java
  22. +1 −1 test/jdk/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java
  23. +1 −1 test/jdk/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java
  24. +1 −1 test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java
  25. +0 −41 test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java
  26. +0 −41 test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java
  27. +1 −1 test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java
  28. +0 −41 test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java
  29. +1 −1 test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java
  30. +0 −78 test/jdk/jdk/jfr/event/oldobject/TestParallelOld.java
@@ -37,7 +37,6 @@
* @requires vm.gc.Parallel
* @summary Runs System.gc() with different flags.
* @run main/othervm -XX:+UseParallelGC gc.TestSystemGC
* @run main/othervm -XX:+UseParallelGC -XX:-UseParallelOldGC gc.TestSystemGC
*/

/*
@@ -38,10 +38,8 @@
* @summary All parallel GC variants may use large pages without the requirement that the heap alignment is large page aligned. Other collectors also need to start up with odd sized heaps.
* @bug 8024396
* @requires vm.gc.Parallel
* @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
* @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages
* @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
* @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages
* @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
* @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages
*/

/**
@@ -44,9 +44,7 @@
public class TestParallelHeapSizeFlags {

public static void main(String args[]) throws Exception {
// just pick one of the parallel generational collectors. Sizing logic is the
// same.
final String gcName = "-XX:+UseParallelOldGC";
final String gcName = "-XX:+UseParallelGC";

TestMaxHeapSizeTools.checkMinInitialMaxHeapFlags(gcName);

@@ -53,7 +53,6 @@
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm gc.arguments.TestUseCompressedOopsErgo -XX:+UseParallelGC
* @run main/othervm gc.arguments.TestUseCompressedOopsErgo -XX:+UseParallelGC -XX:-UseParallelOldGC
*/

/*
@@ -61,8 +61,8 @@
* java.compiler
* java.management/sun.management
* jdk.internal.jvmstat/sun.jvmstat.monitor
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC -XX:+UseParallelOldGC gc.metaspace.TestMetaspacePerfCounters
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC -XX:+UseParallelOldGC gc.metaspace.TestMetaspacePerfCounters
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC gc.metaspace.TestMetaspacePerfCounters
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC gc.metaspace.TestMetaspacePerfCounters
*/

/* @test TestMetaspacePerfCountersG1
@@ -58,8 +58,8 @@ public static void main(String args[]) throws Exception {
"-version"});

runTest("-XX:+UseG1GC");
runTest("-XX:+UseParallelOldGC -XX:-UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelOldGC -XX:+UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelGC -XX:-UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelGC -XX:+UseAdaptiveGCBoundary");
}

private static void runTest(String... extraFlags) throws Exception {
@@ -82,13 +82,13 @@ private static void testG1() throws Exception {
}

private static void testParallelOld() throws Exception {
System.out.println("Testing ParallelOld GC with UseAdaptiveGCBoundary disabled");
OutputAnalyzer output = runTest("-XX:+UseParallelOldGC -XX:-UseAdaptiveGCBoundary");
System.out.println("Testing Parallel GC with UseAdaptiveGCBoundary disabled");
OutputAnalyzer output = runTest("-XX:+UseParallelGC -XX:-UseAdaptiveGCBoundary");
output.shouldContain("Error occurred during initialization of VM");
output.shouldNotHaveExitValue(0);

System.out.println("Testing ParallelOld GC with UseAdaptiveGCBoundary enabled");
output = runTest("-XX:+UseParallelOldGC -XX:+UseAdaptiveGCBoundary");
System.out.println("Testing Parallel GC with UseAdaptiveGCBoundary enabled");
output = runTest("-XX:+UseParallelGC -XX:+UseAdaptiveGCBoundary");
output.shouldContain("Error occurred during initialization of VM");
output.shouldNotHaveExitValue(0);
}
@@ -75,8 +75,8 @@ public static void main(String args[]) throws Exception {
// Test with G1 GC
runTest("-XX:+UseG1GC");
// Test with ParallelOld GC
runTest("-XX:+UseParallelOldGC -XX:-UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelOldGC -XX:+UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelGC -XX:-UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelGC -XX:+UseAdaptiveGCBoundary");
}

private static void runTest(String... extraFlags) throws Exception {
@@ -76,8 +76,8 @@ public static void main(String args[]) throws Exception {
// Test with G1 GC
runTest("-XX:+UseG1GC");
// Test with ParallelOld GC
runTest("-XX:+UseParallelOldGC -XX:-UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelOldGC -XX:+UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelGC -XX:-UseAdaptiveGCBoundary");
runTest("-XX:+UseParallelGC -XX:+UseAdaptiveGCBoundary");
}

private static void runTest(String... extraFlags) throws Exception {
@@ -34,7 +34,6 @@
* @run main/othervm gc.stress.TestReclaimStringsLeaksMemory
* @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseSerialGC
* @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseParallelGC
* @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseParallelGC -XX:-UseParallelOldGC
* @run main/othervm gc.stress.TestReclaimStringsLeaksMemory -XX:+UseG1GC
*/

@@ -31,7 +31,6 @@
* @requires vm.gc.Parallel
* @summary Stress the Parallel GC by trying to make old objects more likely to be garbage than young objects.
* @run main/othervm -Xmx384M -XX:+UseParallelGC gc.stress.gcold.TestGCOld 50 1 20 10 10000
* @run main/othervm -Xmx384M -XX:+UseParallelGC -XX:-UseParallelOldGC gc.stress.gcold.TestGCOld 50 1 20 10 10000
*/
public class TestGCOldWithParallel {
public static void main(String[] args) {
@@ -60,7 +60,6 @@ public static void testCompressedOopsModesGCs(String... flags) throws Exception
testCompressedOopsModes(args, "-XX:+UseG1GC");
testCompressedOopsModes(args, "-XX:+UseSerialGC");
testCompressedOopsModes(args, "-XX:+UseParallelGC");
testCompressedOopsModes(args, "-XX:+UseParallelOldGC");
if (GC.Shenandoah.isSupported()) {
testCompressedOopsModes(args, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseShenandoahGC");
}

This file was deleted.

@@ -39,7 +39,7 @@
public class TestGCCauseWithParallelOld {
public static void main(String[] args) throws Exception {
String testID = "ParallelOld";
String[] vmFlags = {"-XX:+UseParallelGC", "-XX:+UseParallelOldGC"};
String[] vmFlags = {"-XX:+UseParallelGC"};
String[] gcNames = {GCHelper.gcParallelScavenge, GCHelper.gcParallelOld};
String[] gcCauses = {"Allocation Failure", "Ergonomics", "System.gc()"};
GCGarbageCollectionUtil.test(testID, vmFlags, gcNames, gcCauses);

This file was deleted.

@@ -32,7 +32,7 @@
*
* @requires vm.gc == "Parallel" | vm.gc == null
* @library /test/lib /test/jdk
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.collection.TestGCEventMixedWithParallelOld
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseParallelGC jdk.jfr.event.gc.collection.TestGCEventMixedWithParallelOld
* good debug flags: -Xlog:gc*=debug
*/
public class TestGCEventMixedWithParallelOld {
@@ -39,7 +39,7 @@
* @requires vm.hasJFR
* @requires vm.gc == "Parallel" | vm.gc == null
* @library /test/lib /test/jdk
* @run main/othervm -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.collection.TestGCWithFasttime
* @run main/othervm -XX:+UseParallelGC jdk.jfr.event.gc.collection.TestGCWithFasttime
*/
public class TestGCWithFasttime {
private static final String EVENT_NAME = GCHelper.event_garbage_collection;
@@ -42,7 +42,7 @@
* @requires (vm.gc == "Parallel" | vm.gc == null)
* & vm.opt.ExplicitGCInvokesConcurrent != true
* @library /test/lib /test/jdk
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:ParallelGCThreads=3 -XX:ConcGCThreads=2 -XX:+UseDynamicNumberOfGCThreads -XX:-ExplicitGCInvokesConcurrent -XX:-DisableExplicitGC -XX:MaxGCPauseMillis=800 -XX:GCTimeRatio=19 jdk.jfr.event.gc.configuration.TestGCConfigurationEvent
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:ParallelGCThreads=3 -XX:ConcGCThreads=2 -XX:+UseDynamicNumberOfGCThreads -XX:-ExplicitGCInvokesConcurrent -XX:-DisableExplicitGC -XX:MaxGCPauseMillis=800 -XX:GCTimeRatio=19 jdk.jfr.event.gc.configuration.TestGCConfigurationEvent
*/
public class TestGCConfigurationEvent {
public static void main(String[] args) throws Exception {
@@ -40,7 +40,7 @@
* @library /test/lib /test/jdk
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseCompressedOops -Xmx100m -Xms100m -XX:InitialHeapSize=100m -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWith32BitOops
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseCompressedOops -Xmx100m -Xms100m -XX:InitialHeapSize=100m -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWith32BitOops
*/


@@ -38,7 +38,7 @@
* @library /test/lib /test/jdk
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseCompressedOops -Xmx31g jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithHeapBasedOops
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseCompressedOops -Xmx31g jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithHeapBasedOops
*/

/* See the shell script wrapper for the flags used when invoking the JVM */
@@ -36,7 +36,7 @@
* @requires os.family == "linux" | os.family == "windows"
* @requires sun.arch.data.model == "64"
* @library /test/lib /test/jdk
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseCompressedOops -Xmx4g jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithZeroBasedOops
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseCompressedOops -Xmx4g jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithZeroBasedOops
*/

/* See the shell script wrapper for the flags used when invoking the JVM */
@@ -41,7 +41,7 @@
* @requires vm.hasJFR
* @requires vm.gc == "Parallel" | vm.gc == null
* @library /test/lib /test/jdk
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MaxTenuringThreshold=13 -XX:InitialTenuringThreshold=9 jdk.jfr.event.gc.configuration.TestGCSurvivorConfigurationEvent
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:MaxTenuringThreshold=13 -XX:InitialTenuringThreshold=9 jdk.jfr.event.gc.configuration.TestGCSurvivorConfigurationEvent
*/
public class TestGCSurvivorConfigurationEvent {
public static void main(String[] args) throws Exception {
@@ -41,7 +41,7 @@
* @requires vm.hasJFR
* @requires vm.gc == "Parallel" | vm.gc == null
* @library /test/lib /test/jdk
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseTLAB -XX:MinTLABSize=3k -XX:TLABRefillWasteFraction=96 jdk.jfr.event.gc.configuration.TestGCTLABConfigurationEvent
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseTLAB -XX:MinTLABSize=3k -XX:TLABRefillWasteFraction=96 jdk.jfr.event.gc.configuration.TestGCTLABConfigurationEvent
*/
public class TestGCTLABConfigurationEvent {
public static void main(String[] args) throws Exception {
@@ -32,7 +32,7 @@
*
* @requires vm.gc == "Parallel" | vm.gc == null
* @library /test/lib /test/jdk
* @run main/othervm -Xmx32m -Xms32m -Xmn12m -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MaxTenuringThreshold=5 -XX:InitialTenuringThreshold=5 jdk.jfr.event.gc.detailed.TestPromotionEventWithParallelScavenge
* @run main/othervm -Xmx32m -Xms32m -Xmn12m -XX:+UseParallelGC -XX:MaxTenuringThreshold=5 -XX:InitialTenuringThreshold=5 jdk.jfr.event.gc.detailed.TestPromotionEventWithParallelScavenge
*/
public class TestPromotionEventWithParallelScavenge {

This file was deleted.

0 comments on commit bc97279

Please sign in to comment.
You can’t perform that action at this time.