[vmkit-commits] [vmkit] r180340 - Updated Dacapo tests.
Peter Senna Tschudin
peter.senna at gmail.com
Thu Apr 25 10:00:55 PDT 2013
Author: peter.senna
Date: Thu Apr 25 11:59:24 2013
New Revision: 180340
URL: http://llvm.org/viewvc/llvm-project?rev=180340&view=rev
Log:
Updated Dacapo tests.
(cherry picked from commit 468ecb3542982e1bdffa7bf8f603bc8fbf719585)
Added:
vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile
- copied, changed from r180339, vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile
vmkit/trunk/tests/dacapo/2006-10/Makefile
- copied, changed from r180339, vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile
vmkit/trunk/tests/dacapo/9.12-bach/Makefile
- copied, changed from r180339, vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile
vmkit/trunk/tests/dacapo/Makefile
- copied, changed from r180339, vmkit/trunk/incinerator/tests/dacapo/Makefile
vmkit/trunk/tests/dacapo/Makefile.inc
- copied, changed from r180339, vmkit/trunk/incinerator/tests/dacapo/Makefile.inc
vmkit/trunk/tests/dacapo/jars/download.txt
- copied, changed from r180339, vmkit/trunk/incinerator/tests/dacapo/jars/download.txt
Removed:
vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile
vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile
vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile
vmkit/trunk/incinerator/tests/dacapo/Makefile
vmkit/trunk/incinerator/tests/dacapo/Makefile.inc
vmkit/trunk/incinerator/tests/dacapo/jars/download.txt
Removed: vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile?rev=180339&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile (original)
+++ vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile (removed)
@@ -1,6 +0,0 @@
-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
-
-include ../Makefile.inc
Removed: vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile?rev=180339&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile (original)
+++ vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile (removed)
@@ -1,6 +0,0 @@
-LEVEL := ..
-DACAPO_VERSION := 2006-10
-DACAPO_ARGS := -s default
-DECAPO_BENCHMARKS := antlr bloat chart eclipse fop hsqldb jython luindex lusearch pmd xalan batik ps
-
-include ../Makefile.inc
Removed: vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile?rev=180339&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile (original)
+++ vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile (removed)
@@ -1,6 +0,0 @@
-LEVEL := ..
-DACAPO_VERSION := 9.12-bach
-DACAPO_ARGS := -s default
-DECAPO_BENCHMARKS := avrora batik eclipse fop h2 jython luindex lusearch pmd sunflow tomcat tradebeans tradesoap xalan
-
-include ../Makefile.inc
Removed: vmkit/trunk/incinerator/tests/dacapo/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/dacapo/Makefile?rev=180339&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/Makefile (original)
+++ vmkit/trunk/incinerator/tests/dacapo/Makefile (removed)
@@ -1,9 +0,0 @@
-LEVEL := .
-DIRS := 2006-10 2006-10-MR2 9.12-bach
-
-default: all
-
-$(DIRS)::
- $(MAKE) -C $@ $(MAKECMDGOALS)
-
-all clean: $(DIRS)
Removed: vmkit/trunk/incinerator/tests/dacapo/Makefile.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/dacapo/Makefile.inc?rev=180339&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/Makefile.inc (original)
+++ vmkit/trunk/incinerator/tests/dacapo/Makefile.inc (removed)
@@ -1,35 +0,0 @@
-TEMP_LEVEL := ../..
-DACAPO := $(PWD)/$(LEVEL)/jars/dacapo-$(DACAPO_VERSION).jar
-LOG_DIR := $(LEVEL)/logs
-LOG_DIR_FROM_TEMP := $(PWD)/$(LOG_DIR)
-J3_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/vmkit_stale_ref/Debug+Asserts/bin/j3
-TEMP_J3 := $(PWD)/$(LEVEL)/$(DACAPO_VERSION)/j3
-IJVM_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/ijvm/Debug+Asserts/bin/j3
-TEMP_IJVM := $(PWD)/$(LEVEL)/$(DACAPO_VERSION)/ijvm
-
-ifndef ENABLE_J3
- ENABLE_J3 := 1
-endif
-
-ifndef ENABLE_IJVM
- ENABLE_IJVM := 1
-endif
-
-J3_DEFINED := [ "$(ENABLE_J3)" -ne 0 ]
-IJVM_DEFINED := [ "$(ENABLE_IJVM)" -ne 0 ]
-
-all: $(VM) $(LOG_DIR) $(DECAPO_BENCHMARKS)
-
-$(LOG_DIR):
- @mkdir -p $@ 2>/dev/null
-
-$(DECAPO_BENCHMARKS):
- @-$(J3_DEFINED) && echo "Dacapo benchmark version " $(DACAPO_VERSION) ": j3 ==> " $@
- @-$(J3_DEFINED) && rm -rf $(TEMP_J3)/$@ && mkdir -p $(TEMP_J3)/$@
- @-$(J3_DEFINED) && cd $(TEMP_J3)/$@ && $(J3_PATH) -jar $(DACAPO) $(DACAPO_ARGS) $@ >$(LOG_DIR_FROM_TEMP)/j3-$@-$(DACAPO_VERSION).log 2>&1
- @-$(IJVM_DEFINED) && echo "Dacapo benchmark version " $(DACAPO_VERSION) ": ijvm ==> " $@
- @-$(IJVM_DEFINED) && rm -rf $(TEMP_IJVM)/$@ && mkdir -p $(TEMP_IJVM)/$@
- @-$(IJVM_DEFINED) && cd $(TEMP_IJVM)/$@ && $(IJVM_PATH) -jar $(DACAPO) $(DACAPO_ARGS) $@ >$(LOG_DIR_FROM_TEMP)/ijvm-$@-$(DACAPO_VERSION).log 2>&1
-
-clean:
- @-rm -rf $(LOG_DIR) $(TEMP_J3) $(TEMP_IJVM) 2>/dev/null
Removed: vmkit/trunk/incinerator/tests/dacapo/jars/download.txt
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/incinerator/tests/dacapo/jars/download.txt?rev=180339&view=auto
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/jars/download.txt (original)
+++ vmkit/trunk/incinerator/tests/dacapo/jars/download.txt (removed)
@@ -1,3 +0,0 @@
-http://sourceforge.net/projects/dacapobench/files/archive/2006-10/
-http://sourceforge.net/projects/dacapobench/files/archive/2006-10-MR2/
-http://sourceforge.net/projects/dacapobench/files/9.12-bach/
Copied: vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile (from r180339, vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile?p2=vmkit/trunk/tests/dacapo/2006-10-MR2/Makefile&p1=vmkit/trunk/incinerator/tests/dacapo/2006-10-MR2/Makefile&r1=180339&r2=180340&rev=180340&view=diff
==============================================================================
(empty)
Copied: vmkit/trunk/tests/dacapo/2006-10/Makefile (from r180339, vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/2006-10/Makefile?p2=vmkit/trunk/tests/dacapo/2006-10/Makefile&p1=vmkit/trunk/incinerator/tests/dacapo/2006-10/Makefile&r1=180339&r2=180340&rev=180340&view=diff
==============================================================================
(empty)
Copied: vmkit/trunk/tests/dacapo/9.12-bach/Makefile (from r180339, vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/9.12-bach/Makefile?p2=vmkit/trunk/tests/dacapo/9.12-bach/Makefile&p1=vmkit/trunk/incinerator/tests/dacapo/9.12-bach/Makefile&r1=180339&r2=180340&rev=180340&view=diff
==============================================================================
(empty)
Copied: vmkit/trunk/tests/dacapo/Makefile (from r180339, vmkit/trunk/incinerator/tests/dacapo/Makefile)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/Makefile?p2=vmkit/trunk/tests/dacapo/Makefile&p1=vmkit/trunk/incinerator/tests/dacapo/Makefile&r1=180339&r2=180340&rev=180340&view=diff
==============================================================================
(empty)
Copied: vmkit/trunk/tests/dacapo/Makefile.inc (from r180339, vmkit/trunk/incinerator/tests/dacapo/Makefile.inc)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/Makefile.inc?p2=vmkit/trunk/tests/dacapo/Makefile.inc&p1=vmkit/trunk/incinerator/tests/dacapo/Makefile.inc&r1=180339&r2=180340&rev=180340&view=diff
==============================================================================
--- vmkit/trunk/incinerator/tests/dacapo/Makefile.inc (original)
+++ vmkit/trunk/tests/dacapo/Makefile.inc Thu Apr 25 11:59:24 2013
@@ -2,7 +2,7 @@ TEMP_LEVEL := ../..
DACAPO := $(PWD)/$(LEVEL)/jars/dacapo-$(DACAPO_VERSION).jar
LOG_DIR := $(LEVEL)/logs
LOG_DIR_FROM_TEMP := $(PWD)/$(LOG_DIR)
-J3_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/vmkit_stale_ref/Debug+Asserts/bin/j3
+J3_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/vmkit2/Debug+Asserts/bin/j3
TEMP_J3 := $(PWD)/$(LEVEL)/$(DACAPO_VERSION)/j3
IJVM_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/ijvm/Debug+Asserts/bin/j3
TEMP_IJVM := $(PWD)/$(LEVEL)/$(DACAPO_VERSION)/ijvm
@@ -23,7 +23,7 @@ all: $(VM) $(LOG_DIR) $(DECAPO_BENCHMARK
$(LOG_DIR):
@mkdir -p $@ 2>/dev/null
-$(DECAPO_BENCHMARKS):
+$(DECAPO_BENCHMARKS): $(DACAPO)
@-$(J3_DEFINED) && echo "Dacapo benchmark version " $(DACAPO_VERSION) ": j3 ==> " $@
@-$(J3_DEFINED) && rm -rf $(TEMP_J3)/$@ && mkdir -p $(TEMP_J3)/$@
@-$(J3_DEFINED) && cd $(TEMP_J3)/$@ && $(J3_PATH) -jar $(DACAPO) $(DACAPO_ARGS) $@ >$(LOG_DIR_FROM_TEMP)/j3-$@-$(DACAPO_VERSION).log 2>&1
Copied: vmkit/trunk/tests/dacapo/jars/download.txt (from r180339, vmkit/trunk/incinerator/tests/dacapo/jars/download.txt)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/jars/download.txt?p2=vmkit/trunk/tests/dacapo/jars/download.txt&p1=vmkit/trunk/incinerator/tests/dacapo/jars/download.txt&r1=180339&r2=180340&rev=180340&view=diff
==============================================================================
(empty)
More information about the vmkit-commits
mailing list