[vmkit-commits] [vmkit] r180390 - Updating Dacapo testing framework.
Peter Senna Tschudin
peter.senna at gmail.com
Thu Apr 25 10:07:22 PDT 2013
Author: peter.senna
Date: Thu Apr 25 12:04:41 2013
New Revision: 180390
URL: http://llvm.org/viewvc/llvm-project?rev=180390&view=rev
Log:
Updating Dacapo testing framework.
(cherry picked from commit f78456bd1a88f8c01a6859ee63e54a8bcc6e2479)
Added:
vmkit/trunk/incinerator/tests/benchmarks/run-dacapo.sh
vmkit/trunk/tests/dacapo/run-all.sh
Modified:
vmkit/trunk/incinerator/tests/benchmarks/monitor_process.sh
vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile
vmkit/trunk/tests/dacapo/Makefile.inc
vmkit/trunk/tests/dacapo/collect-log-data.sh
vmkit/trunk/tests/dacapo/run-bench.sh
Modified: vmkit/trunk/incinerator/tests/benchmarks/monitor_process.sh
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/benchmarks/monitor_process.sh?rev=180390&r1=180389&r2=180390&view=diff
==============================================================================
--- vmkit/trunk/incinerator/tests/benchmarks/monitor_process.sh (original)
+++ vmkit/trunk/incinerator/tests/benchmarks/monitor_process.sh Thu Apr 25 12:04:41 2013
@@ -170,12 +170,3 @@ do
fi;
fi;
done
-
-# gnuplot
-# set datafile separator ","
-# set xdata time
-# set timefmt "%Y-%m-%d %H:%M:%S"
-# set format x "%M:%S"
-# plot "jasmin_player.csv" using 1:3 title "Memory Usage" with lines
-# plot "jasmin_player.csv" using 1:4 title "CPU Usage" with lines
-
Added: vmkit/trunk/incinerator/tests/benchmarks/run-dacapo.sh
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/benchmarks/run-dacapo.sh?rev=180390&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/benchmarks/run-dacapo.sh (added)
+++ vmkit/trunk/incinerator/tests/benchmarks/run-dacapo.sh Thu Apr 25 12:04:41 2013
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+dacapo_dir=/home/koutheir/PhD/VMKit/vmkit2/tests/dacapo/2006-10-MR2
+
+cd $dacapo_dir
+make ENABLE_IJVM=0
Modified: vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile?rev=180390&r1=180389&r2=180390&view=diff
==============================================================================
--- vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile (original)
+++ vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile Thu Apr 25 12:04:41 2013
@@ -1,6 +1,7 @@
LEVEL := ..
DACAPO_VERSION := 2006-10-MR2
DACAPO_ARGS := -s default
-DECAPO_BENCHMARKS := antlr bloat chart eclipse fop hsqldb jython luindex lusearch pmd xalan batik ps
+DECAPO_BENCHMARKS := antlr bloat chart eclipse fop hsqldb jython luindex lusearch pmd xalan
+#DECAPO_BENCHMARKS := antlr bloat chart eclipse fop hsqldb jython luindex lusearch pmd xalan batik ps
include ../Makefile.inc
Modified: vmkit/trunk/tests/dacapo/Makefile.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/Makefile.inc?rev=180390&r1=180389&r2=180390&view=diff
==============================================================================
--- vmkit/trunk/tests/dacapo/Makefile.inc (original)
+++ vmkit/trunk/tests/dacapo/Makefile.inc Thu Apr 25 12:04:41 2013
@@ -9,7 +9,7 @@ RUN_BENCH := $(PWD)/$(LEVEL)/run-bench
DACAPO := $(PWD)/$(LEVEL)/jars/dacapo-$(DACAPO_VERSION).jar
TMP_DIR := $(LEVEL)/tmp
LOG_DIR := $(LEVEL)/logs
-J3_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/vmkit/$(BUILD_MODE)/bin/j3
+J3_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/vmkit2/$(BUILD_MODE)/bin/j3
IJVM_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/ijvm/$(BUILD_MODE)/bin/j3
ifndef ENABLE_J3
@@ -20,11 +20,17 @@ ifndef ENABLE_IJVM
ENABLE_IJVM := 1
endif
-all: $(VM) $(DECAPO_BENCHMARKS)
+J3_DEFINED := [ "$(ENABLE_J3)" -ne 0 ]
+IJVM_DEFINED := [ "$(ENABLE_IJVM)" -ne 0 ]
+
+all: $(VM) $(TMP_DIR) $(LOG_DIR) $(DECAPO_BENCHMARKS)
+
+$(TMP_DIR) $(LOG_DIR):
+ @mkdir -p $@ 2>/dev/null
$(DECAPO_BENCHMARKS): $(DACAPO)
- @-$(RUN_BENCH) "$(ENABLE_J3)" "j3" "$(DACAPO_VERSION)" "$(J3_PATH)" "$(DACAPO)" "$(DACAPO_ARGS)" "$@"
- @-$(RUN_BENCH) "$(ENABLE_IJVM)" "ijvm" "$(DACAPO_VERSION)" "$(IJVM_PATH)" "$(DACAPO)" "$(DACAPO_ARGS)" "$@"
+ @$(RUN_BENCH) "$(ENABLE_J3)" "j3" "$(DACAPO_VERSION)" "$(J3_PATH)" "$(DACAPO)" "$(DACAPO_ARGS)" "$@"
+ @$(RUN_BENCH) "$(ENABLE_IJVM)" "ijvm" "$(DACAPO_VERSION)" "$(IJVM_PATH)" "$(DACAPO)" "$(DACAPO_ARGS)" "$@"
clean:
@-rm -rf "$(TMP_DIR)" "$(LOG_DIR)" 2>/dev/null
Modified: vmkit/trunk/tests/dacapo/collect-log-data.sh
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/collect-log-data.sh?rev=180390&r1=180389&r2=180390&view=diff
==============================================================================
--- vmkit/trunk/tests/dacapo/collect-log-data.sh (original)
+++ vmkit/trunk/tests/dacapo/collect-log-data.sh Thu Apr 25 12:04:41 2013
@@ -1,6 +1,6 @@
#!/bin/bash
-dacapo_dir=/home/koutheir/PhD/VMKit/vmkit/tests/dacapo
+dacapo_dir=/home/koutheir/PhD/VMKit/vmkit2/tests/dacapo
log_collect_file=$dacapo_dir/logs/collected_passed.log
log_synth_file=$dacapo_dir/logs/synth.log
Added: vmkit/trunk/tests/dacapo/run-all.sh
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/run-all.sh?rev=180390&view=auto
==============================================================================
--- vmkit/trunk/tests/dacapo/run-all.sh (added)
+++ vmkit/trunk/tests/dacapo/run-all.sh Thu Apr 25 12:04:41 2013
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# ./run-all.sh 40 12 2006-10-MR2 'sleep $(($RANDOM / 7276))s ; echo Hello'
+
+times=$1
+jn=$2
+dir=$3
+cmd=$4
+
+cd "$dir"
+seq $times | parallel -n0 -j "$jn" $cmd
Modified: vmkit/trunk/tests/dacapo/run-bench.sh
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/run-bench.sh?rev=180390&r1=180389&r2=180390&view=diff
==============================================================================
--- vmkit/trunk/tests/dacapo/run-bench.sh (original)
+++ vmkit/trunk/tests/dacapo/run-bench.sh Thu Apr 25 12:04:41 2013
@@ -11,11 +11,10 @@ jar=$5
vmargs=$6
bench_name=$7
-dacapo_dir=/home/koutheir/PhD/VMKit/vmkit/tests/dacapo
+dacapo_dir=/home/koutheir/PhD/VMKit/vmkit2/tests/dacapo
suffix=_${bench_version}_${bench_name}_${vm_name}
-mkdir -p "$dacapo_dir/tmp" "$dacapo_dir/logs" 2>/dev/null
scratch_dir=$(mktemp -d --suffix=$suffix --tmpdir=$dacapo_dir/tmp)
log_file=$(mktemp --suffix=${suffix}.log --tmpdir=$dacapo_dir/logs)
More information about the vmkit-commits
mailing list