Skip to content

Commit ecad7bd

Browse files
llxiallxia
authored
Merge pull request #22770 from annaibm/enablebal2
Enable Balanced GC modes 501 and 551 to functional test
2 parents c296530 + 5751e16 commit ecad7bd

File tree

8 files changed

+46
-0
lines changed

8 files changed

+46
-0
lines changed

‎test/functional/JIT_Test/playlist.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
640640
<testCaseName>jit_hwWarm</testCaseName>
641641
<variations>
642642
<variation>Mode110 -Xdump:java -Xjit:optlevel=warm,count=0</variation>
643+
<variation>Mode501 -Xdump:java -Xjit:optlevel=warm,count=0</variation>
643644
</variations>
644645
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
645646
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)jitt.jar$(Q) \
@@ -775,6 +776,9 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
775776
<variation>Mode610</variation>
776777
<variation>Mode610 -Xshareclasses:none -Xjit:optLevel=hot</variation>
777778
<variation>Mode610 -Xshareclasses:name=test_jitscc -XX:+JITServerUseAOTCache</variation>
779+
<variation>Mode551</variation>
780+
<variation>Mode551 -Xshareclasses:none -Xjit:optLevel=hot</variation>
781+
<variation>Mode551 -Xshareclasses:name=test_jitscc -XX:+JITServerUseAOTCache</variation>
778782
</variations>
779783
<disables>
780784
<disable>

‎test/functional/Java8andUp/playlist.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,6 +2269,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
22692269
<variations>
22702270
<variation>Mode110</variation>
22712271
<variation>Mode610</variation>
2272+
<variation>Mode501</variation>
2273+
<variation>Mode551</variation>
22722274
</variations>
22732275
<!-- OpenJ9 issue 1421, failed on zos:
22742276
z/OS documentation indicates the destructor supplied
@@ -2705,6 +2707,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
27052707
<variations>
27062708
<variation>Mode110</variation>
27072709
<variation>Mode610</variation>
2710+
<variation>Mode501</variation>
2711+
<variation>Mode551</variation>
27082712
</variations>
27092713
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
27102714
$(JAVA_COMMAND) $(JVM_OPTIONS) \
@@ -2754,6 +2758,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
27542758
<variation>NoOptions</variation>
27552759
<variation>Mode110</variation>
27562760
<variation>Mode150</variation>
2761+
<variation>Mode501</variation>
2762+
<variation>Mode551</variation>
27572763
</variations>
27582764
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
27592765
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(Q) \

‎test/functional/NativeTest/playlist.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
152152
<variations>
153153
<variation>Mode110</variation>
154154
<variation>Mode610</variation>
155+
<variation>Mode501</variation>
156+
<variation>Mode551</variation>
155157
</variations>
156158
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
157159
$(SQ)$(JAVA_SHARED_LIBRARIES_DIR)$(D)jsigjnitest$(SQ) \
@@ -223,6 +225,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
223225
<variations>
224226
<variation>Mode110</variation>
225227
<variation>Mode610</variation>
228+
<variation>Mode501</variation>
229+
<variation>Mode551</variation>
226230
</variations>
227231
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all ; \
228232
$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
@@ -255,6 +259,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
255259
<variations>
256260
<variation>Mode110</variation>
257261
<variation>Mode610</variation>
262+
<variation>Mode501</variation>
263+
<variation>Mode551</variation>
258264
</variations>
259265
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all zos ; \
260266
$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
@@ -287,6 +293,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
287293
<variations>
288294
<variation>Mode110</variation>
289295
<variation>Mode610</variation>
296+
<variation>Mode501</variation>
297+
<variation>Mode551</variation>
290298
</variations>
291299
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all aix ; \
292300
$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
@@ -319,6 +327,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
319327
<variations>
320328
<variation>Mode110</variation>
321329
<variation>Mode610</variation>
330+
<variation>Mode501</variation>
331+
<variation>Mode551</variation>
322332
</variations>
323333
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
324334
$(SQ)$(JAVA_SHARED_LIBRARIES_DIR)$(D)shrtest$(SQ) $(JVM_OPTIONS) -Djava.home=$(SQ)$(TEST_JDK_HOME)$(D)$(SQ) $(SQ)-Xbootclasspath/a:$(Q)dummy1$(P)dummy2$(P)dummy3$(Q)$(SQ) ; \
@@ -350,6 +360,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
350360
<variations>
351361
<variation>Mode110</variation>
352362
<variation>Mode610</variation>
363+
<variation>Mode501</variation>
364+
<variation>Mode551</variation>
353365
</variations>
354366
<disables>
355367
<disable>
@@ -388,6 +400,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
388400
<variations>
389401
<variation>Mode110</variation>
390402
<variation>Mode610</variation>
403+
<variation>Mode501</variation>
404+
<variation>Mode551</variation>
391405
</variations>
392406
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all zos ; \
393407
$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
@@ -426,6 +440,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
426440
<variations>
427441
<variation>Mode110</variation>
428442
<variation>Mode610</variation>
443+
<variation>Mode501</variation>
444+
<variation>Mode551</variation>
429445
</variations>
430446
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all aix ; \
431447
$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
@@ -458,6 +474,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
458474
<variations>
459475
<variation>Mode110</variation>
460476
<variation>Mode610</variation>
477+
<variation>Mode501</variation>
478+
<variation>Mode551</variation>
461479
</variations>
462480
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
463481
$(SQ)$(JAVA_SHARED_LIBRARIES_DIR)$(D)shrtest$(SQ) $(JVM_OPTIONS) -Djava.home=$(SQ)$(TEST_JDK_HOME)$(D)jre$(D)$(SQ) ; \
@@ -489,6 +507,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
489507
<variations>
490508
<variation>Mode110</variation>
491509
<variation>Mode610</variation>
510+
<variation>Mode501</variation>
511+
<variation>Mode551</variation>
492512
</variations>
493513
<disables>
494514
<disable>

‎test/functional/SharedCPEntryInvokerTests/playlist.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<variation>Mode110</variation>
2828
<variation>Mode610</variation>
2929
<variation>Mode604</variation>
30+
<variation>Mode501</variation>
31+
<variation>Mode551</variation>
3032
</variations>
3133
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) $(JAVA_COMMAND) $(JVM_OPTIONS) \
3234
-agentlib:jvmtitest=test:rc001 \

‎test/functional/VM_Test/playlist.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
8585
<variation>Mode301</variation>
8686
<variation>Mode351</variation>
8787
<variation>Mode610</variation>
88+
<variation>Mode501</variation>
89+
<variation>Mode551</variation>
8890
</variations>
8991
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
9092
-cp $(Q)$(TEST_RESROOT)$(D)VM_Test.jar$(P)$(LIB_DIR)$(D)junit4.jar$(Q) \
@@ -205,6 +207,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
205207
<variations>
206208
<variation>Mode110</variation>
207209
<variation>Mode610</variation>
210+
<variation>Mode501</variation>
211+
<variation>Mode551</variation>
208212
</variations>
209213
<command>$(JAVA_COMMAND) -Dplatform=$(PLATFORM) -cp $(Q)$(TEST_RESROOT)$(D)VM_Test.jar$(Q) \
210214
j9vm.runner.Menu -test=$(Q)j9vm.test.xlp$(Q) -exe=$(Q)$(JAVA_COMMAND) $(JVM_OPTIONS) -Xdump$(Q) \

‎test/functional/cmdLineTests/gcsuballoctests/playlist.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<testCaseName>cmdLineTester_gcsuballoctests</testCaseName>
2727
<variations>
2828
<variation>Mode610</variation>
29+
<variation>Mode551</variation>
2930
</variations>
3031
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
3132
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -DJVM_TEST_ROOT=$(Q)$(JVM_TEST_ROOT)$(Q) -DRESJAR=$(CMDLINETESTER_RESJAR) \

‎test/functional/cmdLineTests/jvmtitests/playlist.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,8 @@
264264
<variation>Mode608</variation>
265265
<variation>Mode107-OSR</variation>
266266
<variation>Mode607-OSR</variation>
267+
<variation>Mode500 -Xdebug</variation>
268+
<variation>Mode550 -Xdebug</variation>
267269
</variations>
268270
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
269271
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) \
@@ -553,6 +555,8 @@
553555
<variation>Mode607-OSRG</variation>
554556
<variation>Mode610-OSRG</variation>
555557
<variation>Mode612-OSRG</variation>
558+
<variation>Mode501 -Xjit:enableOSR,enableOSROnGuardFailure,count=1,disableAsyncCompilation</variation>
559+
<variation>Mode551 -Xjit:enableOSR,enableOSROnGuardFailure,count=1,disableAsyncCompilation</variation>
556560
</variations>
557561
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
558562
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) \
@@ -589,6 +593,8 @@
589593
<variation>Mode607-OSRG</variation>
590594
<variation>Mode610-OSRG</variation>
591595
<variation>Mode612-OSRG</variation>
596+
<variation>Mode501 -Xjit:enableOSR,enableOSROnGuardFailure,count=1,disableAsyncCompilation</variation>
597+
<variation>Mode551 -Xjit:enableOSR,enableOSROnGuardFailure,count=1,disableAsyncCompilation</variation>
592598
</variations>
593599
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
594600
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) \
@@ -694,6 +700,8 @@
694700
<variation>Mode301</variation>
695701
<variation>Mode351</variation>
696702
<variation>Mode610</variation>
703+
<variation>Mode501</variation>
704+
<variation>Mode551</variation>
697705
</variations>
698706
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
699707
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) \

‎test/functional/cmdLineTests/libpathTest/playlist.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
3333
</disables>
3434
<variations>
3535
<variation>Mode610</variation>
36+
<variation>Mode551</variation>
3637
</variations>
3738
<command>$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -DJAVA_EXE=$(JAVA_COMMAND) -DJAVA_HOME=$(Q)$(JAVA_HOME)$(Q) -DJAVATEST_ROOT=$(JAVATEST_ROOT) -DJVM_TEST_ROOT=$(JVM_TEST_ROOT) \
3839
-DTESTSJARPATH=$(Q)$(TEST_RESROOT)$(D)libpathTest.jar$(Q) \

0 commit comments

Comments
 (0)