Skip to content
Permalink
Browse files

8252695: Shenandoah: clean up Graal enabled/disabled filter in tests

Reviewed-by: zgu
  • Loading branch information
shipilev committed Sep 8, 2020
1 parent 704f784 commit 91a20ca7e5dfd91a206966a589afabd1f732c6a9
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
*
* @requires os.arch=="aarch64" & vm.debug == true &
* vm.flavor == "server" & !vm.graal.enabled &
* vm.flavor == "server" &
* vm.gc.Shenandoah
*
* @build compiler.c2.aarch64.TestVolatiles
@@ -82,7 +82,7 @@
* @test TestAllocHumongousFragment
* @summary Make sure Shenandoah can recover from humongous allocation fragmentation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048
@@ -99,7 +99,7 @@
* @test TestAllocHumongousFragment
* @summary Make sure Shenandoah can recover from humongous allocation fragmentation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048
@@ -111,7 +111,7 @@
* @test TestAllocHumongousFragment
* @summary Make sure Shenandoah can recover from humongous allocation fragmentation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048
@@ -151,7 +151,7 @@
* @test TestAllocHumongousFragment
* @summary Make sure Shenandoah can recover from humongous allocation fragmentation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
@@ -86,7 +86,7 @@
* @test TestAllocIntArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -103,7 +103,7 @@
* @test TestAllocIntArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -115,7 +115,7 @@
* @test TestAllocIntArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -127,7 +127,7 @@
* @test TestAllocIntArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -172,7 +172,7 @@
* @test TestAllocIntArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -86,7 +86,7 @@
* @test TestAllocObjectArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -103,7 +103,7 @@
* @test TestAllocObjectArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -115,7 +115,7 @@
* @test TestAllocObjectArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -127,7 +127,7 @@
* @test TestAllocObjectArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -172,7 +172,7 @@
* @test TestAllocObjectArrays
* @summary Acceptance tests: collector can withstand allocation
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
@@ -87,7 +87,7 @@
/*
* @test TestAllocObjects
* @summary Acceptance tests: collector can withstand allocation
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
@@ -107,7 +107,7 @@
/*
* @test TestAllocObjects
* @summary Acceptance tests: collector can withstand allocation
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
@@ -122,7 +122,7 @@
/*
* @test TestAllocObjects
* @summary Acceptance tests: collector can withstand allocation
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
@@ -167,7 +167,7 @@
/*
* @test TestAllocObjects
* @summary Acceptance tests: collector can withstand allocation
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
@@ -24,7 +24,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -42,7 +42,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -53,7 +53,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -64,7 +64,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -75,7 +75,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -86,7 +86,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -97,7 +97,7 @@

/*
* @test TestDynamicSoftMaxHeapSize
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -63,7 +63,7 @@

/*
* @test TestLotsOfCycles
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
@@ -73,7 +73,7 @@

/*
* @test TestLotsOfCycles
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
@@ -83,7 +83,7 @@

/*
* @test TestLotsOfCycles
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
@@ -115,7 +115,7 @@

/*
* @test TestLotsOfCycles
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
@@ -48,7 +48,7 @@

/*
* @test TestRegionSampling
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
@@ -57,7 +57,7 @@

/*
* @test TestRegionSampling
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
@@ -66,7 +66,7 @@

/*
* @test TestRegionSampling
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
@@ -84,7 +84,7 @@

/*
* @test TestRegionSampling
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
* -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
@@ -71,7 +71,7 @@
/*
* @test TestRetainObjects
* @summary Acceptance tests: collector can deal with retained objects
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
@@ -86,7 +86,7 @@
/*
* @test TestRetainObjects
* @summary Acceptance tests: collector can deal with retained objects
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
@@ -96,7 +96,7 @@
/*
* @test TestRetainObjects
* @summary Acceptance tests: collector can deal with retained objects
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
@@ -106,7 +106,7 @@
/*
* @test TestRetainObjects
* @summary Acceptance tests: collector can deal with retained objects
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC
@@ -137,7 +137,7 @@
/*
* @test TestRetainObjects
* @summary Acceptance tests: collector can deal with retained objects
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
@@ -76,7 +76,7 @@
* @test TestSieveObjects
* @summary Acceptance tests: collector can deal with retained objects
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -94,7 +94,7 @@
* @test TestSieveObjects
* @summary Acceptance tests: collector can deal with retained objects
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -106,7 +106,7 @@
* @test TestSieveObjects
* @summary Acceptance tests: collector can deal with retained objects
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -118,7 +118,7 @@
* @test TestSieveObjects
* @summary Acceptance tests: collector can deal with retained objects
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm/timeout=240 -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
@@ -153,7 +153,7 @@
* @test TestSieveObjects
* @summary Acceptance tests: collector can deal with retained objects
* @key randomness
* @requires vm.gc.Shenandoah & !vm.graal.enabled
* @requires vm.gc.Shenandoah
* @library /test/lib
*
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions

1 comment on commit 91a20ca

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on 91a20ca Sep 8, 2020

Review

Issues

Please sign in to comment.