WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 23a2ef3e authored by Andreas Sewe's avatar Andreas Sewe
Browse files

Moved DaCapo-specific benchmark classes to consistently named dacapo-$BENCHMARK.jar.

In particular, removed DaCapo-specific tomcat classes from main dacapo.jar.
parent 0936c00b
......@@ -24,7 +24,7 @@
<pathelement location="${junit-jar}"/>
</classpath>
</javac>
<jar destfile="${bm-jars}/tpcc.jar">
<jar destfile="${bm-jars}/dacapo-${bm-name}.jar">
<fileset dir="${bm-build-dir}">
<include name="org/dacapo/h2/**"/>
</fileset>
......
benchmark h2
class org.dacapo.harness.H2
thread-model per_cpu
jars "derbyTesting.jar","junit-3.8.1.jar","h2-1.2.121.jar","tpcc.jar";
jars "dacapo-h2.jar","derbyTesting.jar","junit-3.8.1.jar","h2-1.2.121.jar";
size small args
"--total-transactions", "400",
......
......@@ -39,7 +39,7 @@
</target>
<target name="jar">
<jar destfile="${bm-jars}/luindex.jar" basedir="${bm-build-dir}"/>
<jar destfile="${bm-jars}/dacapo-${bm-name}.jar" basedir="${bm-build-dir}"/>
</target>
......
benchmark luindex
class org.dacapo.harness.Luindex
thread-model single
jars "luindex.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar";
jars "dacapo-luindex.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar";
size small args "${SCRATCH}/luindex/william/poetry"
output stdout digest 0xebb11b9e1c56c6ef5620b890cca24ec773301388,
......
......@@ -23,7 +23,7 @@
</target>
<target name="jar">
<jar destfile="${bm-jars}/lusearch.jar" basedir="${bm-build-dir}"/>
<jar destfile="${bm-jars}/dacapo-${bm-name}.jar" basedir="${bm-build-dir}"/>
</target>
<target name="bm-data">
......
benchmark lusearch
class org.dacapo.harness.Lusearch
thread-model per_cpu
jars "lusearch.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar";
jars "dacapo-lusearch.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar";
size small args "-index","${SCRATCH}/lusearch/index-default",
"-queries","${SCRATCH}/lusearch/query",
......
......@@ -35,12 +35,12 @@
<property name="base.path" value="${bm-downloads}"/>
<target name="dist-static"/>
</ant>
<javac srcdir="${bm-src-dir}" destdir="${bm-output-dir}"
<mkdir dir="${bm-build-dir}/benchmark"/>
<javac srcdir="${bm-src-dir}" destdir="${bm-build-dir}/benchmark"
source="1.5" target="1.5"
includes="org/dacapo/tomcat/*"
debug="true" debuglevel="lines,vars,source">
<classpath>
<pathelement path="${harness-classpath}"/>
<pathelement path="${commons-httpclient-jar}"/>
<pathelement path="${dacapo-digest-jar}"/>
<fileset dir="${bm-build-top}/output/dist/lib">
......@@ -75,7 +75,7 @@
</copy>
<jar destfile="${bm-jars}/dacapo-tomcat.jar">
<fileset dir="${bm-output-dir}" includes="**/*.class"/>
<fileset dir="${bm-build-dir}/benchmark" includes="**/*.class"/>
</jar>
</target>
......
......@@ -33,7 +33,7 @@
destdir="${bm-build-dir}/benchmark/"
includes="org/dacapo/xalan/*"
debug="true" debuglevel="lines,vars,source"/>
<jar destfile="${bm-jars}/xalan-benchmark.jar" basedir="${bm-build-dir}/benchmark"/>
<jar destfile="${bm-jars}/dacapo-${bm-name}.jar" basedir="${bm-build-dir}/benchmark"/>
</target>
<target name="jar">
......
benchmark xalan
class org.dacapo.harness.Xalan
thread-model per_cpu
jars "xalan-benchmark.jar", "xalan.jar", "xercesImpl.jar", "xml-apis.jar", "serializer.jar";
jars "dacapo-xalan.jar", "xalan.jar", "xercesImpl.jar", "xml-apis.jar", "serializer.jar";
size small args "10"
threads 1
......
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