diff -r f0312c7d5b37 -r ba6c248cae19 test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java --- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Wed Nov 13 11:21:15 2019 +0100 +++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Wed Nov 13 11:37:29 2019 +0100 @@ -79,9 +79,6 @@ for (GarbageCollectorMXBean gcMxBean : gcMxBeans) { switch (gcMxBean.getName()) { - case "ConcurrentMarkSweep": - GCType = "-XX:+UseConcMarkSweepGC"; - break; case "MarkSweepCompact": GCType = "-XX:+UseSerialGC"; break; @@ -186,10 +183,6 @@ option.addPrepend("-XX:+UseG1GC"); } - if (name.startsWith("CMS")) { - option.addPrepend("-XX:+UseConcMarkSweepGC"); - } - if (name.startsWith("NUMA")) { option.addPrepend("-XX:+UseNUMA"); } @@ -207,18 +200,6 @@ case "MaxMetaspaceFreeRatio": option.addPrepend("-XX:MinMetaspaceFreeRatio=0"); break; - case "CMSOldPLABMin": - option.addPrepend("-XX:CMSOldPLABMax=" + option.getMax()); - break; - case "CMSOldPLABMax": - option.addPrepend("-XX:CMSOldPLABMin=" + option.getMin()); - break; - case "CMSPrecleanNumerator": - option.addPrepend("-XX:CMSPrecleanDenominator=" + option.getMax()); - break; - case "CMSPrecleanDenominator": - option.addPrepend("-XX:CMSPrecleanNumerator=" + ((new Integer(option.getMin())) - 1)); - break; case "G1RefProcDrainInterval": option.addPrepend("-XX:+ExplicitGCInvokesConcurrent"); break; @@ -228,9 +209,6 @@ case "NUMAInterleaveGranularity": option.addPrepend("-XX:+UseNUMAInterleaving"); break; - case "CPUForCMSThread": - option.addPrepend("-XX:+BindCMSThreadToCPU"); - break; case "VerifyGCStartAt": option.addPrepend("-XX:+VerifyBeforeGC"); option.addPrepend("-XX:+VerifyAfterGC");