To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 5ca92917 authored by Steve Blackburn's avatar Steve Blackburn
Browse files

Merge PR from Rui

parents 5d4c7e45 468b8687
......@@ -29,14 +29,19 @@ 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. You will need the following tools:
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:
* *[ant](http://ant.apache.org)* You need to install this yourself if you don't already have it.
* *[ant 1.9](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.
* *[maven](http://maven.apache.org)* Included in our tools directory.
* *[cvs](http:/www.nongnu.org/cvs)
* *[svn](http://subversion.apache.org)
**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).
......
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
dacapo-9.12-bach RELEASE NOTES 2009-12-23
dacapo-9.12-bach-MR1 RELEASE NOTES 2018-01-13
This is the second major release of the DaCapo benchmark suite.
This is a maintenance release of the second major release of the
DaCapo benchmark suite.
These notes are structured as follows:
......@@ -31,12 +32,6 @@ consistent with the original goals of the DaCapo project, which
include the desire for the suite to remain relevant and reflect the
current state of deployed Java applications.
Each of these benchmarks is tested for both performance and
correctness nightly. Results are available here:
o performance: http://dacapo.anu.edu.au/regression/perf/head.html
o sanity: http://dacapo.anu.edu.au/regression/sanity/latest/
2. Usage
--------
......@@ -46,13 +41,18 @@ correctness nightly. Results are available here:
o Download the binary jar and/or source zip from:
https://sourceforge.net/projects/dacapobench/files/
o Access the source from subversion via
svn co https://dacapobench.svn.sourceforge.net/svnroot/dacapobench/benchmarks/trunk dacapobench
Note that as of 9.12-MR1, there are two binary releases; the
default, and one for Java 6 JVMs. The default is built on Java 8
and runs on Java 8 (with the exception of tomcat, see note
below). The Java 6 jar is built on Java 6 for Java 6.
o Access the source from git via
https://github.com/dacapobench/dacapobench
2.2 Running
o It is essential that you read and observe the usage guidelines
that appear in README.txt
that appear in README.md
o Run a benchmark:
java -jar <dacapo-jar-name>.jar <benchmark>
......@@ -73,6 +73,24 @@ correctness nightly. Results are available here:
3. Changes
----------
3.0. 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
is a bug fix to lucene, which dramatically changes the performance of
lusearch, reducing the amount of allocation greatly.
https://issues.apache.org/jira/browse/LUCENE-1800
https://dl.acm.org/citation.cfm?id=2048092
We encourage you to use lusearch-fix in place of lusearch. We
retain the unpatched lusearch in this release for historical consistency.
URLs used by the build system have been systematically updated
so that the source distribution works correctly.
Other issues in the source distribution have been fixed to ensure that
the suite builds with Java 8 VMs.
3.1. Benchmark additions since 2006-10-MR2
avrora: AVRORA is a set of simulation and analysis tools in a
......@@ -196,7 +214,7 @@ message.
---------------
Please consult the bug tracker for a complete and up-to-date list of
known issues (http://sourceforge.net/tracker/?group_id=172498&atid=861957).
known issues (https://github.com/dacapobench/dacapobench/issues).
DaCapo is an open source community project. We welcome all assistance
in addressing bugs and shortcomings in the suite.
......@@ -225,6 +243,11 @@ Tomcat remains less interesting than we would have liked. Performance
results show that tomcat currently has a remarkably flat warm-up curve
when compared to other benchmarks.
Furthermore, the version of tomcat (6.0.20) used by dacapo 9.12 does
not work with OpenJDK since 8u77.
https://bugs.openjdk.java.net/browse/JDK-8155588
4.3 Validation
......@@ -255,7 +278,8 @@ DaCapo benchmark suite.
-------------------------------------
The generous financial support of Intel was crucial to the successful
completion of this release.
completion of the 9.12 release, and the generous financial support
of Oracle led to the 9.12 MR1 release.
The production of the 9.12 release was jointly led by:
......@@ -269,9 +293,15 @@ The 9.12 release of the DaCapo suite was developed primarily by:
Robin Garner, Australian National University
John Zigman, Australian National University
The 9.12 MR1 release was developed primarily by:
Rui Chen, Australian National University
John Zhang, Australian National University
We receieved considerable assistance from a number of people,
including:
Jon Bell
Eric Bodden, Technische Universität Darmstadt
Sam Guyer, Tufts
Chris Kulla
......
......@@ -23,9 +23,11 @@
<target name="unpack" depends="unzip"/>
<target name="bm-build">
<ant antfile="build.xml" dir="${batik-top}" target="all-jar" inheritall="false">
<property name="debug" value="on"/>
</ant>
<exec executable="${ant.home}/bin/ant" dir="${batik-top}" failonerror="yes">
<arg line="all-jar"/>
<arg line="-Ddebug=on"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
</target>
<target name="jar" depends="deps">
......
......@@ -62,7 +62,7 @@
<include name="**/${workspace-full}.zip"/>
</fileset>
</unzip>
<!-- Create two complimentary zips for default and large workspaces -->
<!--Create two complimentary zips for default and large workspaces-->
<zip destfile="${bm-build-dir}/${workspace-default}.zip" basedir="${bm-build-dir}/eclipse-testing/workspace">
<patternset includesfile="${bm-files}/bundles-default.lst"/>
</zip>
......@@ -83,12 +83,16 @@
<!-- build the eclipse plugin, which is necessary to fire up eclipse from within our harness -->
<target name="plugin" depends="unpack">
<ant antfile="build.xml" dir="${bm-files}/plugin" inheritall="false">
<property name="plugin.destination" location="${bm-build-dir}/eclipse/plugins/"/>
<target name="clean"/>
<target name="build.update.jar"/>
</ant>
<!-- add our bundle to the configurator metadata -->
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="clean"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="build.update.jar"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<patch patchfile="${bm-files}/eclipse.patch" dir="${bm-build-dir}" strip="1"/>
</target>
......@@ -104,6 +108,7 @@
<fileset dir="${bm-build-dir}" includesfile="${bm-files}/bundles-stub-required.lst"/>
</touch>
-->
<unzip dest="${bm-build-dir}/" src="${bm-data}/dummyjre.zip"/>
<!-- Install the test data -->
<zip destfile="${bm-dat}/${bm-name}.zip" basedir="${bm-build-dir}" excludes="eclipse/plugins/**">
......@@ -113,4 +118,5 @@
<fileset dir="${bm-build-dir}" includesfile="${bm-files}/bundles-stub-required.lst"/>
</zip>
</target>
</project>
......@@ -95,6 +95,8 @@ public class Eclipse extends Benchmark {
System.setProperty("osgi.install.area", "file:" + fileInScratch("eclipse/"));
System.setProperty("osgi.noShutdown", "true");
System.setProperty("osgi.framework", "file:" + fileInScratch(OSGI_BOOTSTRAP_JAR));
String current_working_dir = System.getProperty("user.dir");
System.setProperty("dacapo.local.jre", current_working_dir + "/" + fileInScratch("jre/lib/rt.jar"));
setJavaHomeIfRequired();
String[] args = new String[4];
......
......@@ -347,23 +347,29 @@ public abstract class FullSourceWorkspaceTests {
}
}
// Create lib entries for the JDKs
String jreLibPath = JavaCore.getClasspathVariable("JRE_LIB").toOSString();
String tempPath = System.getProperty("dacapo.local.jre");
String[] jdkLibs = Util.getJavaClassLibs();
int jdkLibsLength = jdkLibs.length;
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength + 1];
int jdkEntriesCount = 0;
for (int i = 0; i < jdkLibsLength; i++) {
if (!jdkLibs[i].equals(jreLibPath)) { // do not include JRE_LIB in
// additional JDK entries
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
}
}
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(tempPath), null, null);
// Set classpaths (workaround bug 73253 Project references not set on
// project open)
ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
int projectsLength = ALL_PROJECTS.length;
for (int i = 0; i < projectsLength; i++) {
String projectName = ALL_PROJECTS[i].getElementName();
if (BIG_PROJECT_NAME.equals(projectName))
......@@ -384,6 +390,7 @@ public abstract class FullSourceWorkspaceTests {
} catch (CoreException jme) {
// skip name collision as it means that JRE lib were already set on the
// classpath
System.out.println("errors in here");
if (jme.getStatus().getCode() != IJavaModelStatusConstants.NAME_COLLISION) {
throw jme;
}
......
......@@ -14,7 +14,10 @@ import java.io.Writer;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
import java.util.logging.Logger;
import javax.sql.DataSource;
......@@ -82,6 +85,10 @@ public class TPCCDataSource implements DataSource {
return null;
}
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new UnsupportedOperationException();
}
private class NullWriter extends Writer {
public void close() throws IOException {
......
......@@ -44,7 +44,9 @@
<copy todir="${bm-build-dir}/src/java">
<fileset file="${bm-build-dir}/build.*"/>
</copy>
<ant antfile="build.xml" dir="${bm-build-dir}" inheritall="false"/>
<exec executable="${ant.home}/bin/ant" dir="${bm-build-dir}" failonerror="yes">
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
</target>
<target name="jar">
......
<!--
* Copyright (c) 2017 The Australian National University.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Apache License v2.0.
* You may obtain the license at
*
* http://www.opensource.org/licenses/apache2.0.php
-->
<project name="lusearch-fix" default="all" basedir="../..">
<description>DaCapo lusearch-fix benchmark</description>
<property file="dacapo.properties"/>
<property name="bm-name" value="lusearch-fix"/>
<import file="../common.xml"/>
<target name="fix-operation">
<move file="libs/lucene/build.xml" tofile="libs/lucene/build-tmp.xml"/>
<copy file="libs/lucene/build-tmp.xml" tofile="libs/lucene/build.xml"/>
<touch file="libs/lucene/lucene.patch"/>
<patch patchfile="${bm-files}/lusearch-fix.patch" dir="${basedir}" strip="0" ignorewhitespace="yes"/>
</target>
<target name="bm-build" depends="fix-operation, lucene">
<mkdir dir="${bm-build-dir}"/>
<javac srcdir="${bm-src-dir}" source="1.5"
classpath="${harness-classpath}:${lucene-jars}/${lucene-core-jar-name}:${lucene-jars}/${lucene-demos-jar-name}"
destdir="${bm-build-dir}"
includes="org/dacapo/lusearchFix/*" debug="true" debuglevel="lines,vars,source"/>
<delete file="libs/lucene/build.xml"/>
<delete file="libs/lucene/lucene.patch"/>
<move file="libs/lucene/build-tmp.xml" tofile="libs/lucene/build.xml"/>
</target>
<target name="jar">
<jar destfile="${bm-jars}/dacapo-${bm-name}.jar" basedir="${bm-build-dir}"/>
</target>
<target name="copy-data">
<mkdir dir="${bm-data}/lusearchFix"/>
<copy todir="${bm-data}/lusearchFix">
<fileset dir="bms/lusearch/data/lusearch">
<include name="**"/>
</fileset>
</copy>
</target>
<target name="data" depends="copy-data">
<zip basedir="${bm-data}" includes="**" destfile="${bm-dat}/${bm-name}.zip"/>
<delete dir="${bm-data}"/>
</target>
</project>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java lusearch">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>lusearch</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for lusearch harness.</A>
</BODY>
</HTML>
/*
* Copyright (c) 2005, 2009 The Australian National University.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Apache License v2.0.
* You may obtain the license at
*
* http://www.opensource.org/licenses/apache2.0.php
*/
package org.dacapo.harness;
import java.io.File;
import java.lang.reflect.Constructor;
import org.dacapo.parser.Config;
/**
* @date $Date: 2009-12-24 11:19:36 +1100 (Thu, 24 Dec 2009) $
* @id $Id: LusearchFix.java 738 2009-12-24 00:19:36Z steveb-oss $
*/
public class LusearchFix extends org.dacapo.harness.Benchmark {
private final Object benchmark;
public LusearchFix(Config config, File scratch) throws Exception {
super(config, scratch, false);
Class<?> clazz = Class.forName("org.dacapo.lusearchFix.Search", true, loader);
this.method = clazz.getMethod("main", String[].class);
Constructor<?> cons = clazz.getConstructor();
useBenchmarkClassLoader();
try {
benchmark = cons.newInstance();
} finally {
revertClassLoader();
}
}
@Override
public void iterate(String size) throws Exception {
method.invoke(benchmark, (Object) (config.preprocessArgs(size, scratch)));
}
}
benchmark lusearch-fix
class org.dacapo.harness.LusearchFix
thread-model per_cpu
jars "dacapo-lusearch-fix.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar";
size small args "-index","${SCRATCH}/lusearchFix/index-default",
"-queries","${SCRATCH}/lusearchFix/query",
"-output", "${SCRATCH}/lusearchFix.out",
"-totalqueries", "8",
"-threads", "${THREADS}"
thread-limit 8
thread-limit 8
output
stdout digest 0xfd64477d925558b71aaed2d12ce5cc54fcb5b771,