Merge pull request #125 from johnjiabinzhang/release-uncalibrated-9.13

Version bump for all 9.12 benchmarks, validated on OpenJDK 8
dacapobench · May 10, 2018 · 2baec49 · 2baec49
2 parents 509d553 + 6139b5a
commit 2baec49
Show file tree

Hide file tree

Showing 364 changed files with 18,063 additions and 5,833 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,81 @@
+before_script:
+  - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+  - java -version
+  - ant -version
+  - cd benchmarks
+  - touch local.properties
+  - echo "make=/usr/bin/make" >> local.properties
+  - echo "build.failonerror=true" >> local.properties
+  - echo "jdk7home=/usr/lib/jvm/java-7-openjdk-amd64" >> local.properties
+  - echo "jdk9home=/usr/lib/jvm/java-9-openjdk-amd64" >> local.properties
+  - cat local.properties
+
+avrora:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar avrora
+    - java -jar dacapo.jar avrora
+
+batik:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar batik
+    - java -jar dacapo.jar batik
+
+eclipse:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar eclipse
+    - java -jar dacapo.jar eclipse
+
+fop:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar fop
+    - java -jar dacapo.jar fop
+
+h2:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar h2
+    - java -jar dacapo.jar h2
+
+jython:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar jython
+    - java -jar dacapo.jar jython
+
+luindex:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar luindex
+    - java -jar dacapo.jar luindex
+
+lusearch:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar lusearch
+    - java -jar dacapo.jar lusearch
+
+pmd:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar pmd
+    - java -jar dacapo.jar pmd
+
+sunflow:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar sunflow
+    - java -jar dacapo.jar sunflow
+
+tomcat:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar tomcat
+    - java -jar dacapo.jar tomcat
+
+tradebeans:
+  script:
+    - script -q -c "ant -Dbuild.target-jar=dacapo.jar tradebeans" script.out
+    - sleep 120 | script -q -c "java -jar dacapo.jar tradebeans" script.out
+
+tradesoap:
+  script:
+    - script -q -c "ant -Dbuild.target-jar=dacapo.jar tradesoap" script.out
+    - sleep 120 | script -q -c "java -jar dacapo.jar tradesoap" script.out
+
+xalan:
+  script:
+    - ant -Dbuild.target-jar=dacapo.jar xalan
+    - java -jar dacapo.jar xalan
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # 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.
 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
 
 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.
 
@@ -41,8 +41,23 @@ The suite is built using ant 1.9 (1.10 and later will fail for many of the bench
 
 * *[svn](http://subversion.apache.org)*
 
+* *[hg](https://www.mercurial-scm.org)*
 
-** Run `ant -p` in the benchmarks directory for more information on building **.
+**NOTE**
+
+  1.JDK 8 is needed to build the whole suite.
+  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:
+
+1. Set your `JAVA_HOME` environment variable appropriately (it must be set and be consistent with the VM that will be used to build the suite).
+
+2. Copy `default.properties` to `local.properties` and edit it for your environment.
+
+  * Specifically, you must set `jdk7home` to point to a Java 7 installation.
+
+
+For more information, run `ant -p` in the benchmarks directory.
 
 
 

diff --git a/benchmarks/CHANGES.txt b/benchmarks/CHANGES.txt
@@ -1,3 +1,16 @@
+- 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
     antlr - from 2.4.2 to 2.4.7
@@ -36,4 +49,4 @@ Release 2006-10-MR2
  - Added "-ignoreValidation" command line switch.
 
  - 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).
diff --git a/benchmarks/RELEASE_NOTES.txt b/benchmarks/RELEASE_NOTES.txt
@@ -72,8 +72,25 @@ current state of deployed Java applications.
 
 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
+        - lucene:    2.4.1    -> 7.1
+
+    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
               and lusearch benchmarks differ by a single line of code.   This
@@ -91,7 +108,7 @@ current state of deployed Java applications.
               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
               framework for AVR micro-controllers. The benchmark
@@ -134,7 +151,7 @@ current state of deployed Java applications.
               two systems.
 
 
-3.2. Benchmark deletions
+3.3. Benchmark deletions
 
        antlr: Antlr is single threaded and highly repetitive. The
               most recent version of jython uses antlr; so antlr
@@ -162,13 +179,13 @@ current state of deployed Java applications.
               performing database engine.
 
 
-3.3. Benchmark updates
+3.4. Benchmark updates
 
 All other benchmarks have been updated to reflect the latest release
 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 source code is entirely re-organized.

diff --git a/benchmarks/RELEASE_PROCEDURE.txt b/benchmarks/RELEASE_PROCEDURE.txt
@@ -2,39 +2,34 @@ RELEASE PROCEDURES
 
 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=3.27
-	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:
         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
 	mkdir 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)
-	export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
+	export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home
 	export ANT_OPTS="-Xmx512M -Dhttp.proxyHost=150.203.163.152 -Dhttp.proxyPort=3128"
 	export MAVEN_OPTS="-Xmx512M"
         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
 	- Go to Develop tab
 	- Go to Project Admin -> File Manager tab
@@ -45,6 +40,6 @@ or
 	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)
 
-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/files/
diff --git a/benchmarks/bms/avrora/avrora.cnf b/benchmarks/bms/avrora/avrora.cnf
@@ -1,7 +1,7 @@
 benchmark avrora
   class org.dacapo.harness.Avrora
   thread-model single
-  jars "avrora-cvs-20091224.jar";
+  jars "avrora-cvs-20131011.jar";
 
 size small args "-seconds=30",
 	"-platform=mica2",
@@ -51,6 +51,6 @@ description
   author	"Ben L. Titzer",
   license	"UCLA",
   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.",
   repeats	"Each execution simulates a range of microcontroller functions.";
diff --git a/benchmarks/bms/avrora/build.xml b/benchmarks/bms/avrora/build.xml
@@ -11,9 +11,12 @@
     <property file="dacapo.properties" />
 
     <property name="bm-name" value="avrora" />
+    <!--property name="bm-version" value="1.7.117" />
+    <property name="bm-url" value="https://nchc.dl.sourceforge.net/project/${bm-name}" />
+    <property name="bm-src" value="avrora-beta-${bm-version}.jar" />-->
 
     <property name="bm-cvs-root" value=":pserver:anonymous@avrora.cvs.sourceforge.net:/cvsroot/avrora" />
-    <property name="bm-cvs-date" value="20091224" />
+    <property name="bm-cvs-date" value="20131011" />
     <property name="bm-cvs-package" value="${bm-name}" />
     <property name="bm-version" value="cvs-${bm-cvs-date}" />
     <property name="bm-src" value="${bm-name}-${bm-version}-src.tar.gz" />

diff --git a/benchmarks/bms/avrora/downloads/avrora-cvs-20091224-src.tar.gz.MD5 b/benchmarks/bms/avrora/downloads/avrora-cvs-20091224-src.tar.gz.MD5
diff --git a/benchmarks/bms/avrora/downloads/avrora-cvs-20131011-src.tar.gz.MD5 b/benchmarks/bms/avrora/downloads/avrora-cvs-20131011-src.tar.gz.MD5
@@ -0,0 +1 @@
+fb52a894f54c08277a13444126ab8a7b
diff --git a/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java b/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java
@@ -15,8 +15,8 @@
 import org.dacapo.parser.Config;
 
 /**
- * @date $Date: 2009-12-24 11:19:36 +1100 (Thu, 24 Dec 2009) $
+ * date:  $Date: 2009-12-24 11:19:36 +1100 (Thu, 24 Dec 2009) $
- * @id $Id: Avrora.java 738 2009-12-24 00:19:36Z steveb-oss $
+ * id: $Id: Avrora.java 738 2009-12-24 00:19:36Z steveb-oss $
  */
 public class Avrora extends Benchmark {
 

diff --git a/benchmarks/bms/batik/batik.cnf b/benchmarks/bms/batik/batik.cnf
@@ -1,7 +1,7 @@
 benchmark batik
   class org.dacapo.harness.Batik
   thread-model single
-  jars "batik-all.jar", "xml-apis-ext.jar","xml-apis.jar", "crimson-1.1.3.jar", "xerces_2_5_0.jar", "xalan-2.6.0.jar";
+  jars "batik-all-1.9.jar", "xml-apis-ext-1.3.04.jar","xml-apis-1.3.04.jar", "crimson-1.1.3.jar", "xercesImpl-2.9.1.jar", "xalan-2.7.2.jar", "serializer-2.7.2.jar", "xmlgraphics-commons-2.2.jar";
 
 /*
  * Validation currently limited to checking existence of output file
@@ -40,6 +40,6 @@ description
   copyright  "Copyright (C) 2000 The Apache Software Foundation",
   license    "Apache License, Version 2.0",
   url        "http://xml.apache.org/batik/",
-  version    "1.7",
+  version    "1.9",
   threads    "Externally single-threaded.  Internally multi-threaded.";
 
diff --git a/benchmarks/bms/batik/batik.patch b/benchmarks/bms/batik/batik.patch
@@ -0,0 +1,32 @@
+--- batik-1.9/batik-dom/src/main/java/org/apache/batik/dom/util/SAXDocumentFactory.java	2017-03-17 15:55:00.000000000 +1100
++++ ../SAXDocumentFactory.java	2017-12-01 12:13:20.811378286 +1100
+@@ -399,7 +399,7 @@
+     static SAXParserFactory saxFactory;
+     static {
+         saxFactory = SAXParserFactory.newInstance();
+-        try {
++        /*try {
+             saxFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+             saxFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+             saxFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+@@ -409,7 +409,7 @@
+             e.printStackTrace();
+         } catch (ParserConfigurationException e) {
+             e.printStackTrace();
+-        }
++        }*/
+     }
+
+     /**
+@@ -445,9 +445,9 @@
+                               true);
+             parser.setFeature("http://xml.org/sax/features/validation",
+                               isValidating);
+-            parser.setFeature("http://xml.org/sax/features/external-general-entities", false);
++            /*parser.setFeature("http://xml.org/sax/features/external-general-entities", false);
+             parser.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+-            parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
++            parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);*/
+             parser.setProperty("http://xml.org/sax/properties/lexical-handler",
+                                this);
+             parser.parse(is);