[vmkit-commits] [vmkit] r180342 - Updated Dacapo tests to run using the Release+Asserts build of J3.
Peter Senna Tschudin
peter.senna at gmail.com
Thu Apr 25 10:01:06 PDT 2013
Author: peter.senna
Date: Thu Apr 25 11:59:36 2013
New Revision: 180342
URL: http://llvm.org/viewvc/llvm-project?rev=180342&view=rev
Log:
Updated Dacapo tests to run using the Release+Asserts build of J3.
(cherry picked from commit f78f7f6d260ec1b5b51e53f07dea4d9e133e86bf)
Modified:
vmkit/trunk/.autotools
vmkit/trunk/.cproject
vmkit/trunk/tests/dacapo/Makefile.inc
Modified: vmkit/trunk/.autotools
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/.autotools?rev=180342&r1=180341&r2=180342&view=diff
==============================================================================
--- vmkit/trunk/.autotools (original)
+++ vmkit/trunk/.autotools Thu Apr 25 11:59:36 2013
@@ -39,4 +39,43 @@
<option id="autogen" value="autogen.sh"/>
<option id="autogenOpts" value=""/>
</configuration>
+<configuration id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1218053986.1497685454">
+<option id="configure" value="configure"/>
+<option id="configdir" value=""/>
+<option id="cache-file" value=""/>
+<option id="help" value="false"/>
+<option id="no-create" value="false"/>
+<option id="quiet" value="false"/>
+<option id="version" value="false"/>
+<option id="host" value=""/>
+<option id="build" value=""/>
+<option id="target" value=""/>
+<option id="prefix" value=""/>
+<option id="exec-prefix" value=""/>
+<option id="libdir" value=""/>
+<option id="bindir" value=""/>
+<option id="sbindir" value=""/>
+<option id="includedir" value=""/>
+<option id="datadir" value=""/>
+<option id="sysconfdir" value=""/>
+<option id="infodir" value=""/>
+<option id="mandir" value=""/>
+<option id="srcdir" value=""/>
+<option id="localstatedir" value=""/>
+<option id="sharedstatedir" value=""/>
+<option id="libexecdir" value=""/>
+<option id="oldincludedir" value=""/>
+<option id="program-prefix" value=""/>
+<option id="program-suffix" value=""/>
+<option id="program-transform-name" value=""/>
+<option id="enable-maintainer-mode" value="false"/>
+<flag id="CFLAGS">
+<flagvalue id="cflags-debug" value="false"/>
+<flagvalue id="cflags-gprof" value="false"/>
+<flagvalue id="cflags-gcov" value="false"/>
+</flag>
+<option id="user" value="--with-llvmsrc=/home/koutheir/PhD/VMKit/llvm --with-llvmobj=/home/koutheir/PhD/VMKit/llvm --with-gnu-classpath-libs=/home/koutheir/PhD/VMKit/classpath/lib --with-gnu-classpath-glibj=/usr/local/classpath/share/classpath/glibj.zip"/>
+<option id="autogen" value="autogen.sh"/>
+<option id="autogenOpts" value=""/>
+</configuration>
</configurations>
Modified: vmkit/trunk/.cproject
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/.cproject?rev=180342&r1=180341&r2=180342&view=diff
==============================================================================
--- vmkit/trunk/.cproject (original)
+++ vmkit/trunk/.cproject Thu Apr 25 11:59:36 2013
@@ -43,6 +43,46 @@
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
+ <cconfiguration id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1218053986.1497685454">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1218053986.1497685454" moduleId="org.eclipse.cdt.core.settings" name="Build Release (GNU)">
+ <externalSettings/>
+ <extensions>
+ <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+ <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+ <extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ </extensions>
+ </storageModule>
+ <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1218053986.1497685454" name="Build Release (GNU)" parent="org.eclipse.linuxtools.cdt.autotools.core.configuration.build">
+ <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1218053986.1497685454." name="/" resourcePath="">
+ <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1691018896" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
+ <targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.388839228" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
+ <builder arguments="-j12 ENABLE_OPTIMIZED=1 REQUIRES_FRAME_POINTER=1" buildPath="${workspace_loc:/vmkit2}" command="make" id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.855896472" keepEnvironmentInBuildfile="false" managedBuildOn="true" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
+ <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.1507537189" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
+ <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.1734194693" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1218053986.1497685454" valueType="string"/>
+ </tool>
+ <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.807342704" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
+ <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1482650899" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
+ <option id="gnu.c.compiler.option.include.paths.1159924802" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value="/home/koutheir/PhD/VMKit/llvm/include"/>
+ </option>
+ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.907775198" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+ </tool>
+ <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.487434542" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp">
+ <option id="gnu.cpp.compiler.option.include.paths.201098224" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value="/home/koutheir/PhD/VMKit/llvm/include"/>
+ </option>
+ <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.220484884" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+ </tool>
+ </toolChain>
+ </folderInfo>
+ </configuration>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+ </cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="vmkit2.org.eclipse.linuxtools.cdt.autotools.core.projectType.1537789838" name="GNU Autotools" projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType"/>
Modified: vmkit/trunk/tests/dacapo/Makefile.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/dacapo/Makefile.inc?rev=180342&r1=180341&r2=180342&view=diff
==============================================================================
--- vmkit/trunk/tests/dacapo/Makefile.inc (original)
+++ vmkit/trunk/tests/dacapo/Makefile.inc Thu Apr 25 11:59:36 2013
@@ -1,10 +1,12 @@
TEMP_LEVEL := ../..
+BUILD_MODE := Release+Asserts
+# BUILD_MODE := Debug+Asserts
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)/vmkit2/Debug+Asserts/bin/j3
+J3_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/vmkit2/$(BUILD_MODE)/bin/j3
TEMP_J3 := $(PWD)/$(LEVEL)/$(DACAPO_VERSION)/j3
-IJVM_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/ijvm/Debug+Asserts/bin/j3
+IJVM_PATH := $(PWD)/../$(TEMP_LEVEL)/$(LEVEL)/ijvm/$(BUILD_MODE)/bin/j3
TEMP_IJVM := $(PWD)/$(LEVEL)/$(DACAPO_VERSION)/ijvm
ifndef ENABLE_J3
More information about the vmkit-commits
mailing list