Commit 30a19567 authored by John Zhang's avatar John Zhang

merge documentation into master

parents 3f689593 3d2455d0
Pipeline #2077 canceled with stage
...@@ -44,7 +44,8 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench ...@@ -44,7 +44,8 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench
**NOTE** **NOTE**
1. A number of benchmarks including trade and tomcat do not reliably _build_ under Java 6 (all run under Java 6). Therefore you must explicitly use a Java 5 VM at build time (see below). 1. PMD 6.1.0 requires JDK 9 for building; but it can run with JDK 7+
2. JDK 7 is required by Geronimo 3.0.0 to run DayTrader
**IMPORTANT:** before trying to build the suite: **IMPORTANT:** before trying to build the suite:
...@@ -53,7 +54,7 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench ...@@ -53,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 `java14.lib` to point to a Java 1.4 installation and `java14.compile.classpath` to correctly capture the libraries for that installation(otherwise derby will not build correctly) * Specifically, you must set `jdk9home` to point to a Java 9 installation.
For more information, run `ant -p` in the benchmarks directory. For more information, run `ant -p` in the benchmarks directory.
......
...@@ -72,8 +72,24 @@ current state of deployed Java applications. ...@@ -72,8 +72,24 @@ current state of deployed Java applications.
3. Changes 3. Changes
---------- ----------
3.0. Changes introduced by 9.13
3.0. Changes introduced by 9.12-MR1 (since 9.12) Benchmark updates:
- avrora: 20091224 -> 20131011
- batik: 1.7 -> 1.9
- eclipse: 3.5.1 -> 4.7.2
- fop: 0.95 -> 2.2
- h2: 1.5 -> 1.8
- jython: 2.5.2 -> 2.7.1
- pmd: 4.2.5 -> 6.1.0
- tomcat: 6.0.2 -> 9.0.2
- daytrader: 2.4.1 -> 3.0-SNAPSHOT
- Apache Geronimo: 2.4.1 -> 3.0.1
- xalan: 2.7.1 -> 2.7.2
Shipped tooling update:
- Maven: 2.1.0 -> 3.5.2
3.1. Changes introduced by 9.12-MR1 (since 9.12)
lusearch-fix is introduced as a new benchmark. The lusearch-fix lusearch-fix is introduced as a new benchmark. The lusearch-fix
and lusearch benchmarks differ by a single line of code. This and lusearch benchmarks differ by a single line of code. This
...@@ -91,7 +107,7 @@ current state of deployed Java applications. ...@@ -91,7 +107,7 @@ current state of deployed Java applications.
the suite builds with Java 8 VMs. the suite builds with Java 8 VMs.
3.1. Benchmark additions since 2006-10-MR2 3.2. Benchmark additions since 2006-10-MR2
avrora: AVRORA is a set of simulation and analysis tools in a avrora: AVRORA is a set of simulation and analysis tools in a
framework for AVR micro-controllers. The benchmark framework for AVR micro-controllers. The benchmark
...@@ -134,7 +150,7 @@ current state of deployed Java applications. ...@@ -134,7 +150,7 @@ current state of deployed Java applications.
two systems. two systems.
3.2. Benchmark deletions 3.3. Benchmark deletions
antlr: Antlr is single threaded and highly repetitive. The antlr: Antlr is single threaded and highly repetitive. The
most recent version of jython uses antlr; so antlr most recent version of jython uses antlr; so antlr
...@@ -162,13 +178,13 @@ current state of deployed Java applications. ...@@ -162,13 +178,13 @@ current state of deployed Java applications.
performing database engine. performing database engine.
3.3. Benchmark updates 3.4. Benchmark updates
All other benchmarks have been updated to reflect the latest release All other benchmarks have been updated to reflect the latest release
of the underlying application. of the underlying application.
3.4. Other Notable Changes 3.5. Other Notable Changes
The packaging of the DaCapo suite has been completely re-worked and The packaging of the DaCapo suite has been completely re-worked and
the source code is entirely re-organized. the source code is entirely re-organized.
......
...@@ -2,39 +2,34 @@ RELEASE PROCEDURES ...@@ -2,39 +2,34 @@ RELEASE PROCEDURES
0. Update and commit the release notes. 0. Update and commit the release notes.
1. Determine a version number and optionally a nickname 1. Determine a version number and optionally a nickname, specify that in dacapo.properties file
export DACAPO_VERSION=9.12 dacapo.version=9.13
export DACAPO_NICKNAME=bach dacapo.nickname=uncalibrated
2. Make fresh svn checkout. 2. Make fresh git clone
mkdir svn git clone https://github.com/dacapobench/dacapobench.git
cd svn
svn co https://dacapobench.svn.sourceforge.net/svnroot/dacapobench/benchmarks/trunk dacapobench
3. Produced a source build and rename it: 3. Produced a source build and rename it:
cd dacapobench/benchmarks cd dacapobench/benchmarks
ant -Dbuild.version=$DACAPO_VERSION -Dbuild.nickname=$DACAPO_NICKNAME source ant -Dbuild.is-official=true source
mv dacapo-src.zip ../../../dacapo-$DACAPO_VERSION-$DACAPO_NICKNAME-src.zip mv dacapo-${dacapo.version}-${dacapo.nickname}-src.zip ..
cd ../../.. cd ..
4. Create a new directory and unzip the new source 4. Create a new directory and unzip the new source
mkdir release mkdir release
cd release cd release
unzip ../dacapo-$DACAPO_VERSION-$DACAPO_NICKNAME-src.zip unzip ../dacapo-${dacapo.version}-${dacapo.nickname}-src.zip
5. Build the new source (using a proxy if necessary) 5. Build the new source (using a proxy if necessary)
export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
export ANT_OPTS="-Xmx512M -Dhttp.proxyHost=150.203.163.152 -Dhttp.proxyPort=3128" export ANT_OPTS="-Xmx512M -Dhttp.proxyHost=150.203.163.152 -Dhttp.proxyPort=3128"
export MAVEN_OPTS="-Xmx512M" export MAVEN_OPTS="-Xmx512M"
cd benchmarks cd benchmarks
ant -Dbuild.version=$DACAPO_VERSION -Dbuild.nickname=$DACAPO_NICKNAME ant -Dbuild.is-official=true
6. Rename the jar 6. Test the resulting jar
mv dacapo-<xxx>.jar ../../dacapo-$DACAPO_VERSION-$DACAPO_NICKNAME.jar
7. Test the resulting jar 7. Upload files
8. Upload files
- Log into the sourceforge site as a developer - Log into the sourceforge site as a developer
- Go to Develop tab - Go to Develop tab
- Go to Project Admin -> File Manager tab - Go to Project Admin -> File Manager tab
...@@ -45,6 +40,6 @@ or ...@@ -45,6 +40,6 @@ or
scp <filename> <sf-username>,dacapobench@frs.sourceforge.net:/home/frs/project/d/da/dacapobench/<release dir> scp <filename> <sf-username>,dacapobench@frs.sourceforge.net:/home/frs/project/d/da/dacapobench/<release dir>
- set file properties via the file manager to identify release notes (left-click file names to set properties) - set file properties via the file manager to identify release notes (left-click file names to set properties)
9. Ensure default download is correct (use left click on file to make it default for a given platform / platforms) 8. Ensure default download is correct (use left click on file to make it default for a given platform / platforms)
- https://sourceforge.net/projects/dacapobench/ (see default download here) - https://sourceforge.net/projects/dacapobench/ (see default download here)
- https://sourceforge.net/projects/dacapobench/files/ - https://sourceforge.net/projects/dacapobench/files/
...@@ -51,6 +51,6 @@ description ...@@ -51,6 +51,6 @@ description
author "Ben L. Titzer", author "Ben L. Titzer",
license "UCLA", license "UCLA",
url "http://compilers.cs.ucla.edu/avrora/", url "http://compilers.cs.ucla.edu/avrora/",
version "cvs-20090612", version "cvs-20131011",
threads "Externally single-threaded. Internally multi-threaded. Threads represent each simulated entity, so much fine-grained parallelism internally.", threads "Externally single-threaded. Internally multi-threaded. Threads represent each simulated entity, so much fine-grained parallelism internally.",
repeats "Each execution simulates a range of microcontroller functions."; repeats "Each execution simulates a range of microcontroller functions.";
...@@ -40,6 +40,6 @@ description ...@@ -40,6 +40,6 @@ description
copyright "Copyright (C) 2000 The Apache Software Foundation", copyright "Copyright (C) 2000 The Apache Software Foundation",
license "Apache License, Version 2.0", license "Apache License, Version 2.0",
url "http://xml.apache.org/batik/", url "http://xml.apache.org/batik/",
version "1.7", version "1.9",
threads "Externally single-threaded. Internally multi-threaded."; threads "Externally single-threaded. Internally multi-threaded.";
...@@ -22,6 +22,6 @@ description ...@@ -22,6 +22,6 @@ description
author "Apache Software Foundation", author "Apache Software Foundation",
license "Apache Public License", license "Apache Public License",
url "http://xmlgraphics.apache.org/fop/", url "http://xmlgraphics.apache.org/fop/",
version "0.95", version "2.2",
repeats "Single iteration, renders a single XSL-FO file", repeats "Single iteration, renders a single XSL-FO file",
threads "Single threaded"; threads "Single threaded";
...@@ -47,6 +47,6 @@ description ...@@ -47,6 +47,6 @@ description
author "TPC-C like workload authored by The Apache Software Foundation, and Database authored by H2", author "TPC-C like workload authored by The Apache Software Foundation, and Database authored by H2",
license "Apache License, Version 2.0 covering TPC-C like workload, and Eclipse Public License Version 1.0 covering H2", license "Apache License, Version 2.0 covering TPC-C like workload, and Eclipse Public License Version 1.0 covering H2",
url "http://db.apache.org/derby/ and http://www.h2database.com", url "http://db.apache.org/derby/ and http://www.h2database.com",
version "10.5.3.0 and 1.2.121", version "1.8",
repeats "<totalTransactions> evenly divided among the hardware threads.", repeats "<totalTransactions> evenly divided among the hardware threads.",
threads "One client thread per hardware thread, the queries processes exhibit some contention between threads."; threads "One client thread per hardware thread, the queries processes exhibit some contention between threads.";
...@@ -36,6 +36,6 @@ description ...@@ -36,6 +36,6 @@ description
author "Apache Software Foundation", author "Apache Software Foundation",
license "Apache License, Version 2.0", license "Apache License, Version 2.0",
url "http://tomcat.apache.org", url "http://tomcat.apache.org",
version "6.0.20", version "9.0.2",
threads "Expliclitly multi-threaded workload, scaled to available processors.", threads "Expliclitly multi-threaded workload, scaled to available processors.",
repeats "Each iteration starts the tomcat server, creates the client threads and waits for them to perform their tasks."; repeats "Each iteration starts the tomcat server, creates the client threads and waits for them to perform their tasks.";
...@@ -31,6 +31,6 @@ description ...@@ -31,6 +31,6 @@ description
author "Apache Software Foundation", author "Apache Software Foundation",
license "Apache License, Version 2.0", license "Apache License, Version 2.0",
url "http://xml.apache.org/xalan-j/", url "http://xml.apache.org/xalan-j/",
version "2.7.1", version "2.7.2",
threads "Explicitly multi-threaded, scaled to available processors.", threads "Explicitly multi-threaded, scaled to available processors.",
repeats "100 iterations, each transforms one copy of each of the input files"; repeats "100 iterations, each transforms one copy of each of the input files";
...@@ -23,8 +23,8 @@ DEPENDENCIES: ...@@ -23,8 +23,8 @@ DEPENDENCIES:
- ant1.9 (http://ant.apache.org) # note that builds will fail if ant 1.10 or later are used - ant1.9 (http://ant.apache.org) # note that builds will fail if ant 1.10 or later are used
- csv (http:/www.nongnu.org/cvs/) - csv (http:/www.nongnu.org/cvs/)
- svn (http://subversion.apache.org) - svn (http://subversion.apache.org)
For convinience, both are included in the tools directory: For convinience, javacc and maven are included in the tools directory:
${toolsdir} ${toolsdir}
...@@ -47,32 +47,16 @@ BUILDING: ...@@ -47,32 +47,16 @@ BUILDING:
or or
export ANT_OPTS="-Dhttp.proxyHost=xxx.xxx.xxx.xxx -Dhttp.proxyPort=3128" export ANT_OPTS="-Dhttp.proxyHost=xxx.xxx.xxx.xxx -Dhttp.proxyPort=3128"
When the Java6 runtime is invoked to build Tomcat, it may have incorrect/broken
cacerts, which stop files from being downloaded by ant. This can be addressed
by pointing to cacerts in your 1.8 JVM:
export ANT_OPTS="-Djavax.net.ssl.trustStore=${JAVA-8-HOME}/jre/lib/security/cacerts"
3. Copy default.properties to local.properties and edit local.properties 3. Copy default.properties to local.properties and edit local.properties
for your environment. for your environment.
4. You may need to modify your local maven settings in order to get the trade benchmarks 4. Run ant:
to build. In particular, you may need to edit the file:
~/.m2/repository/org/apache/geronimo/geronimo/2.1.4/geronimo-2.1.4.pom
and change the version numbers near line 2423:
from:
[1.5,1.6)
to:
[1.5,)
5. Run ant:
ant [builds all benchmarks] ant [builds all benchmarks]
ant dist [builds all benchmarks, this is the default] ant dist [builds all benchmarks, this is the default]
ant source [builds a source distribution including benchmarks and tools] ant source [builds a source distribution including benchmarks and tools]
ant bm [builds a specific benchmark, bm] ant bm [builds a specific benchmark, bm]
6. A log of each directory is created under this benchmark directory 5. A log of each directory is created under this benchmark directory
for benchmark build status and build success or failure files for benchmark build status and build success or failure files
to be stored. The directory log directory is normally of the to be stored. The directory log directory is normally of the
form form
......
# DaCapo version # DaCapo version
dacapo.version=9.12-MR1 dacapo.version=9.13
dacapo.nickname=uncalibrated dacapo.nickname=uncalibrated
# #
......
...@@ -18,5 +18,6 @@ build.failonerror=true ...@@ -18,5 +18,6 @@ build.failonerror=true
# building PMD 6.1.0 requires JDK 9 # building PMD 6.1.0 requires JDK 9
jdk9home=/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home jdk9home=/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home
# tradebeans & tradesoap: deploying Geronimo for DayTrader requires JDK 7 # building tradebeans & tradesoap requires JDK 7
# (Geronimo deployment requirement)
jdk7home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home jdk7home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home
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