Skip to content

Commit

Permalink
Add Lambda Benchmarks From BumbleBench
Browse files Browse the repository at this point in the history 
• Added parameters for changing BumbleBench repo and branch
• Added new benchmarks: DispatchBench, FibBench, GroupingBench & SieveBench
• Enabled new and existing tests for Java 11 along with Java 8

Issue: #1379

Signed-off-by: Piyush Gupta <piyush286@gmail.com>
  • Loading branch information
@piyush286
piyush286 committed Oct 11, 2019
1 parent 360f604 commit 1a3c65c
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 10 deletions.
8 changes: 8 additions & 0 deletions buildenv/jenkins/JenkinsfileBase
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,14 @@ def setup() {
env.STF_BRANCH = params.STF_BRANCH
}

if (params.BUMBLEBENCH_REPO) {
env.BUMBLEBENCH_REPO = params.BUMBLEBENCH_REPO
}

if (params.BUMBLEBENCH_BRANCH) {
env.BUMBLEBENCH_BRANCH = params.BUMBLEBENCH_BRANCH
}

// vendor test
// expect VENDOR_TEST_* to be comma separated string parameters
VENDOR_TEST_REPOS = (params.VENDOR_TEST_REPOS) ? "--vendor_repos \"${params.VENDOR_TEST_REPOS}\"" : ""
Expand Down
18 changes: 17 additions & 1 deletion perf/bumbleBench/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,32 @@
<description>BumbleBench Suite</description>

<!-- Set global properties for this build -->
<property environment="env" />
<property name="DEST" value="${BUILD_ROOT}/perf/bumbleBench" />
<property name="SRC" location="." />

<condition property="isZOS" value="true">
<equals arg1="${os.name}" arg2="z/OS"/>
</condition>

<condition property="git-prefix" value="git" else="https">
<isset property="isZOS"/>
</condition>

<condition property="bumblebench_repo" value="${env.BUMBLEBENCH_REPO}" else="${git-prefix}://github.com/AdoptOpenJDK/bumblebench.git">
<isset property="env.BUMBLEBENCH_REPO"/>
</condition>
<condition property="bumblebench_branch" value="${env.BUMBLEBENCH_BRANCH}" else="master">
<isset property="env.BUMBLEBENCH_BRANCH"/>
</condition>

<target name="init">
<mkdir dir="${DEST}" />
</target>

<target name="getBumbleBench" depends="init" description="Clone the distribution">
<echo message="Cloning BumbleBench"/>
<var name="git_command" value="clone --depth 1 https://github.com/AdoptOpenJDK/bumblebench.git"/>
<var name="git_command" value="clone --depth 1 -b ${bumblebench_branch} ${bumblebench_repo}"/>
<echo message="git ${git_command}" />
<exec executable="git" failonerror="false" dir=".">
<arg line="${git_command}" />
Expand Down
184 changes: 175 additions & 9 deletions perf/bumbleBench/playlist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,210 @@
-->
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../TestConfig/playlist.xsd">
<!-- Math Tests -->
<!-- Lambda Benchmarks -->
<test>
<testCaseName>bumbleBench-SIMDDoubleMaxMinBench</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar SIMDDoubleMaxMinBench; \
<testCaseName>bumbleBench-DispatchBench-InnerClasses</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar DispatchBench.InnerClasses; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-FibBench-Vanilla</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar FibBench.Vanilla; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-FibBench-InnerClass</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar FibBench.InnerClass; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-FibBench-Lambda</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar FibBench.Lambda; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-FibBench-LocalLambda</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar FibBench.LocalLambda; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-FibBench-DynamicLambda</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar FibBench.DynamicLambda; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
</subsets>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-FibBench-LocalMethodReferences</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar FibBench.LocalMethodReferences; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-GroupingBench-Serial</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar GroupingBench.Serial; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-GroupingBench-Parallel</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar GroupingBench.Parallel; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-SieveBench</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar SieveBench; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<!-- Math Benchmarks -->
<test>
<testCaseName>bumbleBench-ExactBench</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar ExactBench; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
</subsets>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<test>
<testCaseName>bumbleBench-SIMDDoubleMaxMinBench</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar SIMDDoubleMaxMinBench; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
<groups>
<group>perf</group>
</groups>
</test>
<!-- String Tests -->
<!-- String Benchmarks -->
<test>
<testCaseName>bumbleBench-StringConversionBench</testCaseName>
<command>$(JAVA_COMMAND) -jar $(TEST_RESROOT)/bumblebench/BumbleBench.jar StringConversionBench; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
</subsets>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
Expand All @@ -68,7 +232,8 @@
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
</subsets>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
Expand All @@ -83,7 +248,8 @@
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
</subsets>
<subset>11</subset>
</subsets>
<levels>
<level>special</level>
</levels>
Expand Down

0 comments on commit 1a3c65c

Please sign in to comment.