Skip to content

Commit f6c2891

Browse files
shipilevshipilev
committedMay 18, 2021
8267229: Split runtime/Metaspace/elastic test configurations for better scalability
Reviewed-by: stuefe
·
jdk-21+2121-genzgc+1-8
1 parent b60975d commit f6c2891

File tree

2 files changed

+192
-18
lines changed

2 files changed

+192
-18
lines changed
 

‎test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT1.java

+96-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242

4343
/*
44-
* @test id=debug
44+
* @test id=debug-default
4545
* @library /test/lib
4646
* @modules java.base/jdk.internal.misc
4747
* java.management
@@ -51,15 +51,101 @@
5151
*
5252
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
5353
*
54-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 TestMetaspaceAllocationMT1
55-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 -XX:MetaspaceReclaimPolicy=none TestMetaspaceAllocationMT1
56-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 -XX:MetaspaceReclaimPolicy=aggressive TestMetaspaceAllocationMT1
57-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 -XX:+MetaspaceGuardAllocations TestMetaspaceAllocationMT1
54+
* @run main/othervm/timeout=400
55+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
56+
* -XX:VerifyMetaspaceInterval=10
57+
* TestMetaspaceAllocationMT1
58+
*/
59+
60+
/*
61+
* @test id=debug-none
62+
* @library /test/lib
63+
* @modules java.base/jdk.internal.misc
64+
* java.management
65+
* @build sun.hotspot.WhiteBox
66+
* @key randomness
67+
* @requires (vm.debug == true)
68+
*
69+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
70+
*
71+
* @run main/othervm/timeout=400
72+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
73+
* -XX:VerifyMetaspaceInterval=10
74+
* -XX:MetaspaceReclaimPolicy=none
75+
* TestMetaspaceAllocationMT1
76+
*/
77+
78+
/*
79+
* @test id=debug-aggressive
80+
* @library /test/lib
81+
* @modules java.base/jdk.internal.misc
82+
* java.management
83+
* @build sun.hotspot.WhiteBox
84+
* @key randomness
85+
* @requires (vm.debug == true)
86+
*
87+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
88+
*
89+
* @run main/othervm/timeout=400
90+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
91+
* -XX:VerifyMetaspaceInterval=10
92+
* -XX:MetaspaceReclaimPolicy=aggressive
93+
* TestMetaspaceAllocationMT1
94+
*/
95+
96+
/*
97+
* @test id=debug-guard
98+
* @library /test/lib
99+
* @modules java.base/jdk.internal.misc
100+
* java.management
101+
* @build sun.hotspot.WhiteBox
102+
* @key randomness
103+
* @requires (vm.debug == true)
104+
*
105+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
106+
*
107+
* @run main/othervm/timeout=400
108+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
109+
* -XX:VerifyMetaspaceInterval=10
110+
* -XX:+MetaspaceGuardAllocations
111+
* TestMetaspaceAllocationMT1
112+
*/
113+
114+
/*
115+
* @test id=ndebug-default
116+
* @library /test/lib
117+
* @modules java.base/jdk.internal.misc
118+
* java.management
119+
* @build sun.hotspot.WhiteBox
120+
* @key randomness
121+
* @requires (vm.debug == false)
122+
*
123+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
124+
*
125+
* @run main/othervm/timeout=400
126+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
127+
* TestMetaspaceAllocationMT1
128+
*/
129+
130+
/*
131+
* @test id=ndebug-none
132+
* @library /test/lib
133+
* @modules java.base/jdk.internal.misc
134+
* java.management
135+
* @build sun.hotspot.WhiteBox
136+
* @key randomness
137+
* @requires (vm.debug == false)
138+
*
139+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
58140
*
141+
* @run main/othervm/timeout=400
142+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
143+
* -XX:MetaspaceReclaimPolicy=none
144+
* TestMetaspaceAllocationMT1
59145
*/
60146

61147
/*
62-
* @test id=ndebug
148+
* @test id=ndebug-aggressive
63149
* @library /test/lib
64150
* @modules java.base/jdk.internal.misc
65151
* java.management
@@ -69,9 +155,10 @@
69155
*
70156
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
71157
*
72-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestMetaspaceAllocationMT1
73-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:MetaspaceReclaimPolicy=none TestMetaspaceAllocationMT1
74-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:MetaspaceReclaimPolicy=aggressive TestMetaspaceAllocationMT1
158+
* @run main/othervm/timeout=400
159+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
160+
* -XX:MetaspaceReclaimPolicy=aggressive
161+
* TestMetaspaceAllocationMT1
75162
*/
76163

77164
public class TestMetaspaceAllocationMT1 {

‎test/hotspot/jtreg/runtime/Metaspace/elastic/TestMetaspaceAllocationMT2.java

+96-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242

4343
/*
44-
* @test id=debug
44+
* @test id=debug-default
4545
* @library /test/lib
4646
* @modules java.base/jdk.internal.misc
4747
* java.management
@@ -51,15 +51,101 @@
5151
*
5252
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
5353
*
54-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 TestMetaspaceAllocationMT2
55-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 -XX:MetaspaceReclaimPolicy=none TestMetaspaceAllocationMT2
56-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 -XX:MetaspaceReclaimPolicy=aggressive TestMetaspaceAllocationMT2
57-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:VerifyMetaspaceInterval=10 -XX:+MetaspaceGuardAllocations TestMetaspaceAllocationMT2
54+
* @run main/othervm/timeout=400
55+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
56+
* -XX:VerifyMetaspaceInterval=10
57+
* TestMetaspaceAllocationMT2
58+
*/
59+
60+
/*
61+
* @test id=debug-none
62+
* @library /test/lib
63+
* @modules java.base/jdk.internal.misc
64+
* java.management
65+
* @build sun.hotspot.WhiteBox
66+
* @key randomness
67+
* @requires (vm.debug == true)
68+
*
69+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
70+
*
71+
* @run main/othervm/timeout=400
72+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
73+
* -XX:VerifyMetaspaceInterval=10
74+
* -XX:MetaspaceReclaimPolicy=none
75+
* TestMetaspaceAllocationMT2
76+
*/
77+
78+
/*
79+
* @test id=debug-aggressive
80+
* @library /test/lib
81+
* @modules java.base/jdk.internal.misc
82+
* java.management
83+
* @build sun.hotspot.WhiteBox
84+
* @key randomness
85+
* @requires (vm.debug == true)
86+
*
87+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
88+
*
89+
* @run main/othervm/timeout=400
90+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
91+
* -XX:VerifyMetaspaceInterval=10
92+
* -XX:MetaspaceReclaimPolicy=aggressive
93+
* TestMetaspaceAllocationMT2
94+
*/
95+
96+
/*
97+
* @test id=debug-guard
98+
* @library /test/lib
99+
* @modules java.base/jdk.internal.misc
100+
* java.management
101+
* @build sun.hotspot.WhiteBox
102+
* @key randomness
103+
* @requires (vm.debug == true)
104+
*
105+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
106+
*
107+
* @run main/othervm/timeout=400
108+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
109+
* -XX:VerifyMetaspaceInterval=10
110+
* -XX:+MetaspaceGuardAllocations
111+
* TestMetaspaceAllocationMT2
112+
*/
113+
114+
/*
115+
* @test id=ndebug-default
116+
* @library /test/lib
117+
* @modules java.base/jdk.internal.misc
118+
* java.management
119+
* @build sun.hotspot.WhiteBox
120+
* @key randomness
121+
* @requires (vm.debug == false)
122+
*
123+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
124+
*
125+
* @run main/othervm/timeout=400
126+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
127+
* TestMetaspaceAllocationMT2
128+
*/
129+
130+
/*
131+
* @test id=ndebug-none
132+
* @library /test/lib
133+
* @modules java.base/jdk.internal.misc
134+
* java.management
135+
* @build sun.hotspot.WhiteBox
136+
* @key randomness
137+
* @requires (vm.debug == false)
138+
*
139+
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
58140
*
141+
* @run main/othervm/timeout=400
142+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
143+
* -XX:MetaspaceReclaimPolicy=none
144+
* TestMetaspaceAllocationMT2
59145
*/
60146

61147
/*
62-
* @test id=ndebug
148+
* @test id=ndebug-aggressive
63149
* @library /test/lib
64150
* @modules java.base/jdk.internal.misc
65151
* java.management
@@ -69,9 +155,10 @@
69155
*
70156
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
71157
*
72-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestMetaspaceAllocationMT2
73-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:MetaspaceReclaimPolicy=none TestMetaspaceAllocationMT2
74-
* @run main/othervm/timeout=400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:MetaspaceReclaimPolicy=aggressive TestMetaspaceAllocationMT2
158+
* @run main/othervm/timeout=400
159+
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
160+
* -XX:MetaspaceReclaimPolicy=aggressive
161+
* TestMetaspaceAllocationMT2
75162
*/
76163

77164
public class TestMetaspaceAllocationMT2 {

0 commit comments

Comments
 (0)
Please sign in to comment.