Skip to content

Commit

Permalink
Convert iteration based STF based load tests to time-based tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Mesbah_Alam@ca.ibm.com <Mesbah_Alam@ca.ibm.com>
  • Loading branch information
@Mesbah-Alam
Mesbah-Alam committed Jan 25, 2021
1 parent 3b1f8b8 commit 31a253b
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 118 deletions.
48 changes: 24 additions & 24 deletions system/daaLoadTest/playlist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
</test>
<!-- The following tests are specific to openj9 only -->
<test>
<testCaseName>DaaLoadTest_daa1</testCaseName>
<testCaseName>DaaLoadTest_daa1_5m</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -38,12 +38,12 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_daa2</testCaseName>
<testCaseName>DaaLoadTest_daa2_5m</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -57,12 +57,12 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_daa3</testCaseName>
<testCaseName>DaaLoadTest_daa3_5m</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -76,12 +76,12 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_all</testCaseName>
<testCaseName>DaaLoadTest_all_5m</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest -test-args=$(Q)workload=daaAll,timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>extended</level>
Expand All @@ -95,11 +95,11 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_daa1_ConcurrentScavenge</testCaseName>
<testCaseName>DaaLoadTest_daa1_CS_5m</testCaseName>
<variations>
<variation>-Xgcpolicy:gencon -Xgc:concurrentScavenge</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -114,11 +114,11 @@
<platformRequirements>bits.64,^arch.arm</platformRequirements>
</test>
<test>
<testCaseName>DaaLoadTest_daa2_ConcurrentScavenge</testCaseName>
<testCaseName>DaaLoadTest_daa2_CS_5m</testCaseName>
<variations>
<variation>-Xgcpolicy:gencon -Xgc:concurrentScavenge</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -133,11 +133,11 @@
<platformRequirements>bits.64,^arch.arm</platformRequirements>
</test>
<test>
<testCaseName>DaaLoadTest_daa3_ConcurrentScavenge</testCaseName>
<testCaseName>DaaLoadTest_daa3_CS_5m</testCaseName>
<variations>
<variation>-Xgcpolicy:gencon -Xgc:concurrentScavenge</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -152,11 +152,11 @@
<platformRequirements>bits.64,^arch.arm</platformRequirements>
</test>
<test>
<testCaseName>DaaLoadTest_all_ConcurrentScavenge</testCaseName>
<testCaseName>DaaLoadTest_all_CS_5m</testCaseName>
<variations>
<variation>-Xgcpolicy:gencon -Xgc:concurrentScavenge</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest -test-args=$(Q)workload=daaAll,timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>extended</level>
Expand All @@ -171,7 +171,7 @@
<platformRequirements>bits.64,^arch.arm</platformRequirements>
</test>
<test>
<testCaseName>DaaLoadTest_daa1_special</testCaseName>
<testCaseName>DaaLoadTest_daa1_special_5m</testCaseName>
<variations>
<variation>Mode101</variation>
<variation>Mode103</variation>
Expand Down Expand Up @@ -205,7 +205,7 @@
<variation>-Xgcpolicy:gencon -Xgc:dynamicBreadthFirstScanOrdering</variation>
<!--Note: -Xint modes Mode108, Mode109, Mode109-CS, Mode159, Mode159-CS, Mode550 should be run manually -->
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa1,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>special</level>
Expand All @@ -219,7 +219,7 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_daa2_special</testCaseName>
<testCaseName>DaaLoadTest_daa2_special_5m</testCaseName>
<variations>
<variation>Mode101</variation>
<variation>Mode103</variation>
Expand Down Expand Up @@ -253,7 +253,7 @@
<variation>-Xgcpolicy:gencon -Xgc:dynamicBreadthFirstScanOrdering</variation>
<!--Note: -Xint modes Mode108, Mode109, Mode109-CS, Mode159, Mode159-CS, Mode550 should be run manually -->
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa2,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>special</level>
Expand All @@ -267,7 +267,7 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_daa3_special</testCaseName>
<testCaseName>DaaLoadTest_daa3_special_5m</testCaseName>
<variations>
<variation>Mode101</variation>
<variation>Mode103</variation>
Expand Down Expand Up @@ -301,7 +301,7 @@
<variation>-Xgcpolicy:gencon -Xgc:dynamicBreadthFirstScanOrdering</variation>
<!--Note: -Xint modes Mode108, Mode109, Mode109-CS, Mode159, Mode159-CS, Mode550 should be run manually -->
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3$(Q) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test-args=$(Q)workload=daa3,timeLimit=5m$(Q) -test=DaaLoadTest; \
$(TEST_STATUS)</command>
<levels>
<level>special</level>
Expand All @@ -315,7 +315,7 @@
</impls>
</test>
<test>
<testCaseName>DaaLoadTest_all_special</testCaseName>
<testCaseName>DaaLoadTest_all_special_5m</testCaseName>
<variations>
<variation>Mode101</variation>
<variation>Mode103</variation>
Expand Down Expand Up @@ -349,7 +349,7 @@
<variation>-Xgcpolicy:gencon -Xgc:dynamicBreadthFirstScanOrdering</variation>
<!--Note: -Xint modes Mode108, Mode109, Mode109-CS, Mode159, Mode159-CS, Mode550 should be run manually -->
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=DaaLoadTest -test-args=$(Q)workload=daaAll,timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>special</level>
Expand Down
24 changes: 12 additions & 12 deletions system/lambdaLoadTest/playlist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<!-- Exclude LambdaLoad test on Linux x64 non-compressedrefs sdks for OpenJ9 builds only,
Reason: https://github.com/eclipse/openj9/issues/2209)-->
<test>
<testCaseName>LambdaLoadTest_Hotspot</testCaseName>
<testCaseName>LambdaLoadTest_HS_5m</testCaseName>
<variations>
<variation>Mode150</variation>
<variation>Mode650</variation>
<variation>Mode1000</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest -test-args=$(Q)timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -39,12 +39,12 @@
</impls>
</test>
<test>
<testCaseName>LambdaLoadTest_OpenJ9_NonLinux</testCaseName>
<testCaseName>LambdaLoadTest_J9_NonLinux_5m</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest -test-args=$(Q)timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -59,12 +59,12 @@
<platformRequirements>^os.linux</platformRequirements>
</test>
<test>
<testCaseName>LambdaLoadTest_OpenJ9_Linux_CompressedRefs</testCaseName>
<testCaseName>LambdaLoadTest_J9_Linux_CompRef_5m</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest -test-args=$(Q)timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand Down Expand Up @@ -99,11 +99,11 @@
</test>
<!-- Temporarily excluding this test from linux ppc64le xl and linux x64 xl, ref: https://github.com/eclipse/openj9/issues/6475 -->
<test>
<testCaseName>LambdaLoadTest_ConcurrentScavenge</testCaseName>
<testCaseName>LambdaLoadTest_CS_5m</testCaseName>
<variations>
<variation>-Xgcpolicy:gencon -Xgc:concurrentScavenge</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest -test-args=$(Q)timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -118,7 +118,7 @@
<platformRequirements>bits.64,^arch.arm,^spec.linux_ppc-64_le,^spec.linux_x86-64</platformRequirements>
</test>
<test>
<testCaseName>LambdaLoadTest_OpenJ9_NonLinux_special</testCaseName>
<testCaseName>LambdaLoadTest_special_J9_NonLinux_5m</testCaseName>
<variations>
<variation>Mode101</variation>
<variation>Mode103</variation>
Expand Down Expand Up @@ -152,7 +152,7 @@
<variation>-Xgcpolicy:gencon -Xgc:dynamicBreadthFirstScanOrdering</variation>
<!--Note: -Xint modes Mode108, Mode109, Mode109-CS, Mode159, Mode159-CS, Mode550 should be run manually -->
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest -test-args=$(Q)timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>special</level>
Expand All @@ -167,7 +167,7 @@
<platformRequirements>^os.linux</platformRequirements>
</test>
<test>
<testCaseName>LambdaLoadTest_OpenJ9_Linux_CompressedRefs_special</testCaseName>
<testCaseName>LambdaLoadTest_J9_special_Linux_CompRef_5m</testCaseName>
<variations>
<variation>Mode101</variation>
<variation>Mode103</variation>
Expand Down Expand Up @@ -201,7 +201,7 @@
<variation>-Xgcpolicy:gencon -Xgc:dynamicBreadthFirstScanOrdering</variation>
<!--Note: -Xint modes Mode108, Mode109, Mode109-CS, Mode159, Mode159-CS, Mode550 should be run manually -->
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest; \
<command>$(SYSTEMTEST_CMD_TEMPLATE) -test=LambdaLoadTest -test-args=$(Q)timeLimit=5m$(Q); \
$(TEST_STATUS)</command>
<levels>
<level>special</level>
Expand Down
Loading

0 comments on commit 31a253b

Please sign in to comment.