Commit 1133e02f authored by John Zhang's avatar John Zhang

Merge latest changes from GitLab master, should be ready to release.

parents 2f42b422 b5d5625c
# The DaCapo Benchmark Suite # The DaCapo Benchmark Suite
Last updated 2018-01-13 Last updated 2018-04-06
This benchmark suite is intend as a tool for the research community. This benchmark suite is intend as a tool for the research community.
It consists of a set of open source, real world applications with It consists of a set of open source, real world applications with
...@@ -29,9 +29,9 @@ The easiest way to obtain the benchmark suite is to download the pre-built jar f ...@@ -29,9 +29,9 @@ The easiest way to obtain the benchmark suite is to download the pre-built jar f
If, however, you want to build from source read on... If, however, you want to build from source read on...
The suite is built using ant 1.9 (1.10 and later will fail for many of the benchmarks). You will need the following tools: The suite is built using ant 1.10. You will need the following tools:
* *[ant 1.9](http://ant.apache.org)* You need to install this yourself if you don't already have it. * *[ant 1.10](http://ant.apache.org)* You need to install this yourself if you don't already have it.
* *[javacc](http://javacc.dev.java.net/)* Included in our tools directory. * *[javacc](http://javacc.dev.java.net/)* Included in our tools directory.
...@@ -41,12 +41,12 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench ...@@ -41,12 +41,12 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench
* *[svn](http://subversion.apache.org)* * *[svn](http://subversion.apache.org)*
* *[hg](https://www.mercurial-scm.org)*
**NOTE** **NOTE**
1. PMD 6.1.0 requires JDK 9 for building; but it can run with JDK 7+ 1.JDK 8 is needed to build the whole suite.
2. JDK 7 is required by Geronimo 3.0.0 to run DayTrader 2.Building DayTrader and PMD using JDK 8 also requires JDK 7 to be installed, and jdk7home properly set. (see 2 below)
**IMPORTANT:** before trying to build the suite: **IMPORTANT:** before trying to build the suite:
...@@ -54,7 +54,7 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench ...@@ -54,7 +54,7 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench
2. Copy `default.properties` to `local.properties` and edit it for your environment. 2. Copy `default.properties` to `local.properties` and edit it for your environment.
* Specifically, you must set `jdk9home` to point to a Java 9 installation. * Specifically, you must set `jdk7home` to point to a Java 7 installation.
For more information, run `ant -p` in the benchmarks directory. For more information, run `ant -p` in the benchmarks directory.
......
- Update benchmark versions
avrora - from 20091224 to 20131011
batik - from 1.7 to 1.9
eclipse - from 3.5.1 to 4.7.2
fop - from 0.95 to 2.2
h2 - from 1.2.123 to 1.4.196
jython - from 2.5.1 to 2.7.1
luindex - from 2.4 to 7.1
lusearch - from 2.4 to 7.1
pmd - from 4.2.5 to 5.7.0*
tomcat - from 6 to 9
daytrader - from 2.1.7 to 3.0.0
xalan - from 2.7.1 to 2.7.2
- Update benchmark versions - Update benchmark versions
antlr - from 2.4.2 to 2.4.7 antlr - from 2.4.2 to 2.4.7
...@@ -36,4 +49,4 @@ Release 2006-10-MR2 ...@@ -36,4 +49,4 @@ Release 2006-10-MR2
- Added "-ignoreValidation" command line switch. - Added "-ignoreValidation" command line switch.
- Changed jikesrvm stubs so that MMTk callback works with recent - Changed jikesrvm stubs so that MMTk callback works with recent
JikesRVM releases (and hopefuly now with future JVMs that use MMTk). JikesRVM releases (and hopefuly now with future JVMs that use MMTk).
\ No newline at end of file
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<arg value="-B"/> <arg value="-B"/>
<arg line="--global-toolchains ${mvn-toolchains-xml}"/> <arg line="--global-toolchains ${mvn-toolchains-xml}"/>
<arg value="-Dmaven.test.skip=true"/> <arg value="-Dmaven.test.skip=true"/>
<arg line="-pl pmd-core,pmd-java,pmd-dist"/> <!-- <arg line="-pl pmd-core,pmd-java,pmd-dist"/> -->
<arg line="clean package"/> <arg line="clean package"/>
</exec> </exec>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
<target name="bm-build" depends="xerces"> <target name="bm-build" depends="xerces">
<exec dir="${xalan-top}" executable="ant"> <exec dir="${xalan-top}" executable="ant">
<env key="CLASSPATH" value=".:${xerces-jars}/${xerces-impl-jar-name}:${xerces-jars}/${xerces-api-jar-name}"/> <env key="CLASSPATH" value=".:${xerces-jars}/${xerces-impl-jar-name}:${xerces-jars}/${xerces-api-jar-name}"/>
<env key="ANT_HOME" value="${ant.install}"/>
</exec> </exec>
<mkdir dir="${bm-build-dir}/benchmark"/> <mkdir dir="${bm-build-dir}/benchmark"/>
<javac srcdir="${bm-src-dir}" source="1.5" classpath="${xalan-top}/build/xalan.jar" <javac srcdir="${bm-src-dir}" source="1.5" classpath="${xalan-top}/build/xalan.jar"
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
The DaCapo Benchmark Suite The DaCapo Benchmark Suite
DEPENDENCIES: DEPENDENCIES:
- javacc(included) (http://javacc.dev.java.net/)
- javacc (http://javacc.dev.java.net/) - maven(included) (http://maven.apache.org/)
- maven (http://maven.apache.org/)
- ant (http://ant.apache.org) - ant (http://ant.apache.org)
- csv (http:/www.nongnu.org/cvs/) - cvs (http:/www.nongnu.org/cvs/)
- svn (http://subversion.apache.org) - svn (http://subversion.apache.org)
- hg (https://www.mercurial-scm.org)
For convinience, javacc and maven are included in the tools directory: For convinience, javacc and maven are included in the tools directory:
${toolsdir} ${toolsdir}
...@@ -123,11 +123,11 @@ BUILDING: ...@@ -123,11 +123,11 @@ BUILDING:
<!-- overwritable with -Dbuild.is-official=true on commandline--> <!-- overwritable with -Dbuild.is-official=true on commandline-->
<condition property="build.version" <condition property="build.version"
value="${dacapo.version}" value="${dacapo.version}"
else="${dacapo.version}+${git.hash}"> else="${dacapo.version}-git+${git.hash}">
<isset property="build.is-official"/> <isset property="build.is-official"/>
</condition> </condition>
<!-- set target jar name --> <!-- set target jar name -->
<property name="build.target-jar" value="dacapo-${build.version}.jar"/> <property name="build.target-jar" value="dacapo.jar"/>
</target> </target>
<target name="init" depends="set-build-version-info"> <target name="init" depends="set-build-version-info">
...@@ -239,7 +239,7 @@ BUILDING: ...@@ -239,7 +239,7 @@ BUILDING:
target: dist target: dist
================================= --> ================================= -->
<target name="dist" depends="harness,compile"> <target name="dist" depends="harness,compile">
<move file="${build.target-jar}" tofile="dacapo-${DSTAMP}.jar"/> <move file="${build.target-jar}" tofile="dacapo-${build.version}.jar"/>
</target> </target>
<target name="doc" depends="init,bootstrap,harness" description="make the top level documentation"> <target name="doc" depends="init,bootstrap,harness" description="make the top level documentation">
......
# DaCapo version # DaCapo version
dacapo.version=3.27 dacapo.version=9.12-MR1
dacapo.nickname=uncalibrated dacapo.nickname=uncalibrated
# #
...@@ -12,7 +12,7 @@ mvn.version=3.5.2 ...@@ -12,7 +12,7 @@ mvn.version=3.5.2
# URLs # URLs
# #
sourceforge.dl.url=https://jaist.dl.sourceforge.net sourceforge.dl.url=https://jaist.dl.sourceforge.net
sfdata.url=https://dacapobench.sourceforge.net/source-data sfdata.url=http://dacapobench.sourceforge.net/source-data
apache.dl.url=https://archive.apache.org/dist apache.dl.url=https://archive.apache.org/dist
apache.mirror=https://www-us.apache.org/dist apache.mirror=https://www-us.apache.org/dist
github.url=https://github.com github.url=https://github.com
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<exec executable="${mvn}" dir="${dt-build}"> <exec executable="${mvn}" dir="${dt-build}">
<env key="PATH" path="${env.PATH}:${toolsdir}/apache-maven-${mvn.version}/bin:${JAVA_HOME}/bin"/> <env key="PATH" path="${env.PATH}:${toolsdir}/apache-maven-${mvn.version}/bin:${JAVA_HOME}/bin"/>
<env key="GERONIMO_HOME" value="${ger-home}"/> <env key="GERONIMO_HOME" value="${ger-home}"/>
<env key="MAVEN_OPTS" value="-Xms256m -Xmx512m"/> <env key="MAVEN_OPTS" value="-Xms256m -Xmx512m -XX:MaxPermSize=128m"/>
<arg value="clean"/> <arg value="clean"/>
<arg value="install"/> <arg value="install"/>
</exec> </exec>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
<sleep seconds="5"/> <sleep seconds="5"/>
</target> </target>
<target name="deploy"> <target name="deploy">
<exec executable="${ger-home}/bin/${deploy-exe}"> <exec executable="${ger-home}/bin/${deploy-exe}" failonerror="yes">
<env key="GERONIMO_HOME" path="${ger-home}"/> <env key="GERONIMO_HOME" path="${ger-home}"/>
<env key="JAVA_HOME" path="${jdk7home}"/> <env key="JAVA_HOME" path="${jdk7home}"/>
<arg value="-u"/> <arg value="-u"/>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
</exec> </exec>
</target> </target>
<target name="undeploy"> <target name="undeploy">
<exec executable="${ger-home}/bin/${deploy-exe}"> <exec executable="${ger-home}/bin/${deploy-exe}" failonerror="yes">
<env key="GERONIMO_HOME" path="${ger-home}"/> <env key="GERONIMO_HOME" path="${ger-home}"/>
<arg value="-u"/> <arg value="-u"/>
<arg value="system"/> <arg value="system"/>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<property name="lib-name" value="h2"/> <property name="lib-name" value="h2"/>
<property name="lib-version" value="1.4.196"/> <property name="lib-version" value="1.4.196"/>
<property name="lib-url" value="https://repo2.maven.org/maven2/com/h2database/${lib-name}/${lib-version}"/> <property name="lib-url" value="http://repo2.maven.org/maven2/com/h2database/${lib-name}/${lib-version}"/>
<property name="lib-src" value="h2-${lib-version}.jar"/> <property name="lib-src" value="h2-${lib-version}.jar"/>
<import file="../common.xml"/> <import file="../common.xml"/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment