Commit fc7b1a06 authored by Steve Blackburn's avatar Steve Blackburn

PR #154 Benchmark calibration and hugedata refactoring from John Zhang

parents 3867b267 ffbd9389
Pipeline #2954 passed with stage
in 23 minutes and 10 seconds

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -10,72 +10,107 @@ before_script:
- echo "jdk9home=/usr/lib/jvm/java-9-openjdk-amd64" >> local.properties
- cat local.properties
cache:
key: anu-gitlab-local
untracked: true
avrora:
script:
- ant -Dbuild.target-jar=dacapo.jar avrora
- java -jar dacapo.jar avrora
- java -jar dacapo.jar avrora -s small
after_script:
- git clean -df -e "downloads"
batik:
script:
- ant -Dbuild.target-jar=dacapo.jar batik
- java -jar dacapo.jar batik
- java -jar dacapo.jar batik -s small
after_script:
- git clean -df -e "downloads"
eclipse:
script:
- ant -Dbuild.target-jar=dacapo.jar eclipse
- java -jar dacapo.jar eclipse
- java -jar dacapo.jar eclipse -s small
after_script:
- git clean -df -e "downloads"
fop:
script:
- ant -Dbuild.target-jar=dacapo.jar fop
- java -jar dacapo.jar fop
after_script:
- git clean -df -e "downloads"
h2:
script:
- ant -Dbuild.target-jar=dacapo.jar h2
- java -jar dacapo.jar h2
- java -jar dacapo.jar h2 -s small
after_script:
- git clean -df -e "downloads"
jython:
script:
- ant -Dbuild.target-jar=dacapo.jar jython
- java -jar dacapo.jar jython
- java -jar dacapo.jar jython -s small
after_script:
- git clean -df -e "downloads"
luindex:
script:
- ant -Dbuild.target-jar=dacapo.jar luindex
- java -jar dacapo.jar luindex
- java -jar dacapo.jar luindex -s small
after_script:
- git clean -df -e "downloads" -e "enwiki.txt"
lusearch:
script:
- ant -Dbuild.target-jar=dacapo.jar lusearch
- java -jar dacapo.jar lusearch
- java -jar dacapo.jar lusearch -s small
after_script:
- git clean -df -e "downloads"
pmd:
script:
- ant -Dbuild.target-jar=dacapo.jar pmd
- java -jar dacapo.jar pmd
- java -jar dacapo.jar pmd -s small
after_script:
- git clean -df -e "downloads"
sunflow:
script:
- ant -Dbuild.target-jar=dacapo.jar sunflow
- java -jar dacapo.jar sunflow
- java -jar dacapo.jar sunflow -s small
after_script:
- git clean -df -e "downloads"
tomcat:
script:
- ant -Dbuild.target-jar=dacapo.jar tomcat
- java -jar dacapo.jar tomcat
- java -jar dacapo.jar tomcat -s small
after_script:
- git clean -df -e "downloads"
- git clean -df -e "downloads"
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
- sleep 120 | script -q -c "java -jar dacapo.jar tradebeans -s small" script.out
after_script:
- git clean -df -e "downloads"
- git clean -df -e "downloads"
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
- sleep 120 | script -q -c "java -jar dacapo.jar tradesoap -s small" script.out
after_script:
- git clean -df -e "downloads"
- git clean -df -e "downloads"
xalan:
script:
- ant -Dbuild.target-jar=dacapo.jar xalan
- java -jar dacapo.jar xalan
- java -jar dacapo.jar xalan -s small
after_script:
- git clean -df -e "downloads"
......@@ -6,6 +6,10 @@ RELEASE PROCEDURES
dacapo.version=3.27
dacapo.nickname=uncalibrated
Also determine the dacapo-dl remote git repository raw data access URL and commit:
dacapo-dl.url.raw=https://raw.githubusercontent.com/dacapobench/dacapo-dl/
dacapo-dl.commit=HEAD
2. Make fresh git clone
git clone https://github.com/dacapobench/dacapobench.git
......
......@@ -17,7 +17,7 @@ size small args "-seconds=30",
size default args "-seconds=30",
"-platform=mica2",
"-simulation=sensor-network",
"-nodecount=4,2",
"-nodecount=12,6",
"-stagger-start=1000000",
"${SCRATCH}/test/tinyos/CntToRfm.elf",
"${SCRATCH}/test/tinyos/RfmToLeds.elf"
......@@ -27,7 +27,7 @@ size default args "-seconds=30",
size large args "-seconds=30",
"-platform=mica2",
"-simulation=sensor-network",
"-nodecount=7,3,7,2",
"-nodecount=21,9,21,6",
"-stagger-start=1000000",
"${SCRATCH}/test/tinyos/CntToRfm.elf",
"${SCRATCH}/test/tinyos/RfmToLeds.elf",
......
......@@ -22,8 +22,8 @@ public class Avrora extends Benchmark {
String[] args;
public Avrora(Config config, File scratch) throws Exception {
super(config, scratch);
public Avrora(Config config, File scratch, File data) throws Exception {
super(config, scratch, data);
Class<?> clazz = Class.forName("avrora.Main", true, loader);
this.method = clazz.getMethod("main", String[].class);
}
......@@ -31,7 +31,7 @@ public class Avrora extends Benchmark {
@Override
protected void prepare(String size) throws Exception {
super.prepare(size);
args = config.preprocessArgs(size, scratch);
args = config.preprocessArgs(size, scratch, data);
}
@Override
......
......@@ -10,29 +10,68 @@ benchmark batik
*/
size small args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/mapWaadt.svg"
output stdout digest 0xa8f2208c90a7e2223ff376e873fd7ddb0ece3db7,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */;
output stdout digest 0xa8f2208c90a7e2223ff376e873fd7ddb0ece3db7,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"mapWaadt.png" digest 0x80b60361977b9732c2df8e0d4313037b372e0cb5;
size default args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/mapWaadt.svg","${SCRATCH}/batik/mapSpain.svg","${SCRATCH}/batik/sydney.svg"
output stdout digest 0xc0ab3d5a06a755bdf7f758f1c656acbbc5aafc74,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */,
"mapSpain.png" /* digest 0x74fb77a00cf405ad334528cb15266da8d8660257 */,
"sydney.png" /* digest 0x3deba206f9a89a6798bf39af029e22c3f13efe00 */;
size large args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/mapWaadt.svg","${SCRATCH}/batik/mapSpain.svg","${SCRATCH}/batik/sydney.svg",
"${SCRATCH}/batik/asf-logo.svg","${SCRATCH}/batik/moonPhases.svg","${SCRATCH}/batik/batik3D.svg",
"${SCRATCH}/batik/strokeFont.svg"
output stdout digest 0x7b9a5d41084750e997c9899ef6ad3fa7a9c6d267,
/* The following few test-* sizes are candidates for the default size */
size default args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/simplex.svg"
output stdout digest 0x71ba0906238b17c6c544be91b55b4ea4f93adbcd,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"simplex.png" digest 0x5b47353992e6eefcb5d48792cc26f943d841b095;
size large args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/simplex.svg","${SCRATCH}/batik/mapVASR.svg","${SCRATCH}/batik/bavaria.svg"
output stdout digest 0x0b050f6a8339a871eafab0015048cd897dfcb8de,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"simplex.png" digest 0x5b47353992e6eefcb5d48792cc26f943d841b095,
"mapVASR.png" digest 0x3086b028662d865e0913602823c0b339dc599b0b,
"bavaria.png" digest 0xf9e58383e2418b8a065e895cbef8132d9099a599;
size huge args "-d","${SCRATCH}","-scriptSecurityOff","${DATA}/batik/usMetro.svg", "${DATA}/batik/mapVASR.svg",