[test-suite] r208667 - XCore target: Add target specific flags to root Makefiles.
Robert Lytton
robert at xmos.com
Mon May 12 23:25:07 PDT 2014
Author: rlytton
Date: Tue May 13 01:25:06 2014
New Revision: 208667
URL: http://llvm.org/viewvc/llvm-project?rev=208667&view=rev
Log:
XCore target: Add target specific flags to root Makefiles.
The default value of XCORE_TARGET_NEEDS_MEMORY is 32 (MB).
It should be noted that the XCore emulator's speed is affected by the size of memory.
Also the amount of host memory required is several times XCore-image memory size.
Thus running several large xcore-images in parallel may result in thrashing!
The default of 32 will require ~300MB of host memory.
As Makefile.config.in is included multiple times (viz: include $(LEVEL)/Makefile.config),
the addition of XCORE_TARGET_FLAGS to X_TARGET_FLAGS is done in Makefile.test
RUNTIMELIMIT is set to a default of 1 hour for the XCore emulator.
Test that take around or more than 1 hour to run have their RUNTIMELIMIT extended.
Modified:
test-suite/trunk/Makefile.config.in
test-suite/trunk/Makefile.programs
test-suite/trunk/Makefile.tests
test-suite/trunk/MultiSource/Applications/JM/ldecod/Makefile
test-suite/trunk/MultiSource/Applications/lua/Makefile
test-suite/trunk/MultiSource/Applications/minisat/Makefile
test-suite/trunk/MultiSource/Applications/spiff/Makefile
test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile
test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile
test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile
test-suite/trunk/MultiSource/Benchmarks/Bullet/Makefile
test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/Makefile
test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/Makefile
test-suite/trunk/MultiSource/Benchmarks/Olden/health/Makefile
test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/Makefile
test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile
test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/Makefile
test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/Makefile
test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile
test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile
test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile
test-suite/trunk/MultiSource/Benchmarks/mafft/Makefile
test-suite/trunk/MultiSource/Benchmarks/nbench/Makefile
test-suite/trunk/SingleSource/Benchmarks/CoyoteBench/Makefile
test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile
test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Makefile
test-suite/trunk/SingleSource/Benchmarks/Misc/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/Makefile
test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile
test-suite/trunk/SingleSource/Benchmarks/Shootout/Makefile
test-suite/trunk/SingleSource/Benchmarks/SmallPT/Makefile
test-suite/trunk/SingleSource/UnitTests/Makefile
test-suite/trunk/SingleSource/UnitTests/Vector/Makefile
Modified: test-suite/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.config.in?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/Makefile.config.in (original)
+++ test-suite/trunk/Makefile.config.in Tue May 13 01:25:06 2014
@@ -139,6 +139,17 @@ ifeq ($(ARCH),THUMB)
TEST_TARGET_FLAGS += -mthumb
endif
+ifeq ($(ARCH),XCore)
+ifndef XCORE_TARGET_NEEDS_MEMORY
+# The default memory for all tests is 32MB (rather than the usual default of 64K).
+# (32MB target memory requires ~300MB of host memory)
+XCORE_TARGET_NEEDS_MEMORY := 32
+endif
+XCORE_TARGET_FLAGS := --target=xcore -fcommon -fexceptions -mcmodel=large
+XCORE_TARGET_FLAGS += -Wl,-target=XS1-L1,-Xmapper,--defsymbol,-Xmapper,CmdLineWords=400
+XCORE_TARGET_FLAGS += -Wl,-Xmapper,--image-size,-Xmapper,$$(($(XCORE_TARGET_NEEDS_MEMORY) * 0x100000)),-Xmapper,--image-base,-Xmapper,$$(($(XCORE_TARGET_NEEDS_MEMORY) * 0x100000))
+endif
+
# PowerPC/Linux needs -ffp-contract=off so that:
# The outputs can be compared to gcc.
# The outputs match the reference outputs.
Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Tue May 13 01:25:06 2014
@@ -67,8 +67,13 @@ DIFFPROG := $(PROGDIR)/DiffOutput.sh "$(
# timeout. This is overridable on the commandline or in tests makefiles.
#
ifndef RUNTIMELIMIT
+ifeq ($(ARCH),XCore)
+ # 1 hours
+ RUNTIMELIMIT := 3600
+else
RUNTIMELIMIT := 500
endif
+endif
# If the program specified a REFERENCE_OUTPUT_FILE, they obviously want to
# USE_REFERENCE_OUTPUT.
Modified: test-suite/trunk/Makefile.tests
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.tests?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/Makefile.tests (original)
+++ test-suite/trunk/Makefile.tests Tue May 13 01:25:06 2014
@@ -23,6 +23,10 @@ include ${LEVEL}/Makefile.common
# TARGET_FLAGS in the TEST.* makefiles doesn't work out.
X_TARGET_FLAGS = $(TARGET_FLAGS) $(TEST_TARGET_FLAGS)
+ifeq ($(ARCH),XCore)
+X_TARGET_FLAGS += $(XCORE_TARGET_FLAGS)
+endif
+
STATS = -stats -time-passes
.PHONY: clean default
Modified: test-suite/trunk/MultiSource/Applications/JM/ldecod/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/ldecod/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/ldecod/Makefile (original)
+++ test-suite/trunk/MultiSource/Applications/JM/ldecod/Makefile Tue May 13 01:25:06 2014
@@ -5,6 +5,10 @@ LDFLAGS = -lm $(TOOLLINKOPTS)
RUN_OPTIONS = -i $(PROJ_SRC_DIR)/data/test.264 -o Output/test_dec.yuv -r $(PROJ_SRC_DIR)/data/test_rec.yuv
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
+
include ../../../Makefile.multisrc
clean::
Modified: test-suite/trunk/MultiSource/Applications/lua/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lua/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lua/Makefile (original)
+++ test-suite/trunk/MultiSource/Applications/lua/Makefile Tue May 13 01:25:06 2014
@@ -6,7 +6,10 @@ Source = lapi.c lcode.c ldebug.c ldo.c l
loslib.c ltablib.c lstrlib.c loadlib.c linit.c lua.c
LDFLAGS += -lm
-ifneq ($(ARCH),XCore)
+
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+else
CPPFLAGS += -DLUA_USE_POSIX
endif
Modified: test-suite/trunk/MultiSource/Applications/minisat/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/minisat/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/minisat/Makefile (original)
+++ test-suite/trunk/MultiSource/Applications/minisat/Makefile Tue May 13 01:25:06 2014
@@ -9,6 +9,9 @@ RUN_OPTIONS = -verbosity=0 $(PROJ_SRC_DI
else
ifdef LARGE_PROBLEM_SIZE
RUN_OPTIONS = -verbosity=0 $(PROJ_SRC_DIR)/long.cnf
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
else
RUN_OPTIONS = -verbosity=0 $(PROJ_SRC_DIR)/short.cnf
endif
Modified: test-suite/trunk/MultiSource/Applications/spiff/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/spiff/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/spiff/Makefile (original)
+++ test-suite/trunk/MultiSource/Applications/spiff/Makefile Tue May 13 01:25:06 2014
@@ -9,5 +9,11 @@ RUN_OPTIONS = $(PROJ_SRC_DIR)/Sample.3 $
#RUN_OPTIONS = ./one ./two
# you get the idea...
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+XCORE_TARGET_NEEDS_MEMORY = 1024
+endif
+endif
+
include ../../Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile Tue May 13 01:25:06 2014
@@ -12,6 +12,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS ="-n 30 15 30 -c 0.1 1.0 10.0"
else
RUN_OPTIONS ="-n 100 40 100 -c 0.1 1.0 10.0"
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
endif
include ../../../Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile Tue May 13 01:25:06 2014
@@ -5,4 +5,11 @@ PROG = AMGmk
LIBS += -lm
LDFLAGS += -lm
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes over 1 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
include ../../../Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile Tue May 13 01:25:06 2014
@@ -5,4 +5,11 @@ PROG = CrystalMk
LIBS += -lm
LDFLAGS += -lm
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
include ../../../Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/Bullet/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Bullet/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Bullet/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Bullet/Makefile Tue May 13 01:25:06 2014
@@ -3,8 +3,13 @@ PROG = bullet
CPPFLAGS += -I$(PROJ_SRC_DIR)/include -DNO_TIME
LDFLAGS = -lstdc++ -lm
+ifeq ($(ARCH),XCore)
+# Use default RUNTIMELIMIT for the XCore.
+XCORE_TARGET_NEEDS_MEMORY := 64
+else
# This test can take more than the default 500s timeout on Thumb1
RUNTIMELIMIT:=1000
+endif
include $(LEVEL)/Makefile.config
Modified: test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/Makefile Tue May 13 01:25:06 2014
@@ -11,4 +11,8 @@ else
STDIN_FILENAME = $(PROJ_SRC_DIR)/inputs
endif
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
+
include ../../Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/Makefile Tue May 13 01:25:06 2014
@@ -5,6 +5,10 @@ LDFLAGS =
ifdef SMALL_PROBLEM_SIZE
CPPFLAGS = -DSMALL_PROBLEM_SIZE
+else
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 512
+endif
endif
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/health/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/health/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/health/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/health/Makefile Tue May 13 01:25:06 2014
@@ -13,6 +13,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS = 8 15 1
else
RUN_OPTIONS = 9 20 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
endif
Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/Makefile Tue May 13 01:25:06 2014
@@ -10,6 +10,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS = 9
else
RUN_OPTIONS = 10
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
endif
Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile Tue May 13 01:25:06 2014
@@ -8,6 +8,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS = 20
else
RUN_OPTIONS = 22
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
endif
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/Makefile Tue May 13 01:25:06 2014
@@ -10,6 +10,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS = 102400
else
RUN_OPTIONS = 1024000
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
endif
Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/Makefile Tue May 13 01:25:06 2014
@@ -12,6 +12,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS = 10000 20 32 7
else
RUN_OPTIONS = 100000 20 32 7
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
endif
HASH_PROGRAM_OUTPUT = 1
Modified: test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/Makefile Tue May 13 01:25:06 2014
@@ -3,8 +3,16 @@ PROG = scimark2
CPPFLAGS =
LDFLAGS = -lm
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore target takes over 9hours to complete a medium sized problem.
+RUNTIMELIMIT := 50000
+# Ignore 'LARGE_PROBLEM_SIZE' requests
+endif
+else
ifdef LARGE_PROBLEM_SIZE
RUN_OPTIONS = -large
endif
+endif
include ../../Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = ControlFlow-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 2325 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = ControlLoops-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 1640 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = Expansion-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 4160 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = GlobalDataFlow-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 3450 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = InductionVariable-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 9100 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = LinearDependence-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 3570 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = LoopRerolling-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 5260 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = NodeSplitting-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 10000 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = NodeSplitting-flt
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 10000 5
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile Tue May 13 01:25:06 2014
@@ -4,5 +4,11 @@ PROG = StatementReordering-dbl
LDFLAGS = -lm
CFLAGS += -std=gnu99
RUN_OPTIONS = 20000 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile Tue May 13 01:25:06 2014
@@ -8,6 +8,9 @@ ifdef SMALL_PROBLEM_SIZE
RUN_OPTIONS = 1000
else
RUN_OPTIONS = 12000
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
endif
endif
Modified: test-suite/trunk/MultiSource/Benchmarks/mafft/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mafft/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mafft/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mafft/Makefile Tue May 13 01:25:06 2014
@@ -12,6 +12,13 @@ STDIN_FILENAME = $(PROJ_SRC_DIR)/pyruvat
LDFLAGS = -lm
FP_TOLERANCE = 0.00001
HASH_PROGRAM_OUTPUT = 1
+
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+# XCore takes ~2 hours.
+RUNTIMELIMIT:=10800
+endif
+
include $(LEVEL)/MultiSource/Makefile.multisrc
clean::
Modified: test-suite/trunk/MultiSource/Benchmarks/nbench/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/nbench/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/nbench/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/nbench/Makefile Tue May 13 01:25:06 2014
@@ -6,8 +6,13 @@ LDFLAGS =
include ../../Makefile.multisrc
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+else
# This test can take more than the default 500s timeout at -O0.
RUNTIMELIMIT:=750
+endif
# Always copy NNET.DAT so it's available with SRCDIR != OBJDIR builds.
# FIXME: Hack
Modified: test-suite/trunk/SingleSource/Benchmarks/CoyoteBench/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/CoyoteBench/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/CoyoteBench/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/CoyoteBench/Makefile Tue May 13 01:25:06 2014
@@ -1,5 +1,13 @@
LEVEL = ../../..
LDFLAGS += -lm -lstdc++
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+XCORE_TARGET_NEEDS_MEMORY := 128
+# XCore takes ~1.25 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/Large/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile Tue May 13 01:25:06 2014
@@ -4,4 +4,11 @@ LIBS = -lstdc++
FP_ABSTOLERANCE := 0.01
HASH_PROGRAM_OUTPUT := 1
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Makefile Tue May 13 01:25:06 2014
@@ -4,4 +4,10 @@ LDFLAGS += -lm -lstdc++
LIBS = -lstdc++
FP_ABSTOLERANCE := 0.01
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Misc/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc/Makefile Tue May 13 01:25:06 2014
@@ -15,4 +15,11 @@ ifeq ($(ARCH),Mips)
RUNTIMELIMIT := 2000
endif
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes over 2 hours.
+RUNTIMELIMIT:=10800
+endif
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile Tue May 13 01:25:06 2014
@@ -6,10 +6,16 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET
+else
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
ifeq ($(ARCH),Mips)
RUNTIMELIMIT := 2000
+else ifeq ($(ARCH),XCore)
+# Use default RUNTIMELIMIT for the XCore.
else
RUNTIMELIMIT := 1000
endif
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile Tue May 13 01:25:06 2014
@@ -6,10 +6,16 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(PO
ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET
+else
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
ifeq ($(ARCH),Mips)
RUNTIMELIMIT := 2000
+else ifeq ($(ARCH),XCore)
+# Use default RUNTIMELIMIT for the XCore.
else
RUNTIMELIMIT := 1000
endif
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile Tue May 13 01:25:06 2014
@@ -6,5 +6,9 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
HASH_PROGRAM_OUTPUT = 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile Tue May 13 01:25:06 2014
@@ -6,5 +6,9 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
HASH_PROGRAM_OUTPUT = 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/Makefile Tue May 13 01:25:06 2014
@@ -6,6 +6,10 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET
+else
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
endif
HASH_PROGRAM_OUTPUT = 1
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile Tue May 13 01:25:06 2014
@@ -6,5 +6,9 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
HASH_PROGRAM_OUTPUT = 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile Tue May 13 01:25:06 2014
@@ -6,6 +6,10 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET
+else
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
endif
HASH_PROGRAM_OUTPUT = 1
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/Makefile Tue May 13 01:25:06 2014
@@ -6,5 +6,9 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
HASH_PROGRAM_OUTPUT = 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile Tue May 13 01:25:06 2014
@@ -6,5 +6,9 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
HASH_PROGRAM_OUTPUT = 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/Makefile Tue May 13 01:25:06 2014
@@ -6,5 +6,9 @@ CFLAGS += -I $(PROJ_SRC_ROOT)/$(P
HASH_PROGRAM_OUTPUT = 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/Makefile Tue May 13 01:25:06 2014
@@ -5,5 +5,13 @@ FP_TOLERANCE := 0.00000001
DIRS=EH
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+XCORE_TARGET_NEEDS_MEMORY := 256
+# XCore takes over 2 hour.
+RUNTIMELIMIT:=10800
+endif
+endif
+
LDFLAGS += -lstdc++
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout/Makefile Tue May 13 01:25:06 2014
@@ -1,4 +1,8 @@
LEVEL = ../../..
LDFLAGS += -lm
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
Modified: test-suite/trunk/SingleSource/Benchmarks/SmallPT/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/SmallPT/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/SmallPT/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/SmallPT/Makefile Tue May 13 01:25:06 2014
@@ -2,8 +2,13 @@ LEVEL = ../../..
LDFLAGS += -lm -lstdc++
FP_TOLERANCE := 0.001
+ifeq ($(ARCH),XCore)
+# XCore takes over 2 hours
+RUNTIMELIMIT:=10800
+else
# This test can take more than the default 500s timeout at -O0.
RUNTIMELIMIT:=1200
+endif
include $(LEVEL)/Makefile.config
Modified: test-suite/trunk/SingleSource/UnitTests/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Makefile (original)
+++ test-suite/trunk/SingleSource/UnitTests/Makefile Tue May 13 01:25:06 2014
@@ -43,6 +43,9 @@ ifeq ($(ARCH),XCore)
PROGRAMS_TO_SKIP += AtomicOps
# XCore does not support init_priority attribute
PROGRAMS_TO_SKIP += initp1
+# 2007-04-25-weak contains a branch to zero.
+# XCore BLR instruction can only branch 21bits, hence restrict memory to 20bits viz: 0x100000->0x1fffff
+XCORE_TARGET_NEEDS_MEMORY := 1
endif
LDFLAGS += -lstdc++
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/Makefile?rev=208667&r1=208666&r2=208667&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/Makefile (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/Makefile Tue May 13 01:25:06 2014
@@ -30,6 +30,13 @@ ifndef CC_UNDER_TEST_IS_CLANG
PROGRAMS_TO_SKIP := constpool
endif
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
include $(LEVEL)/SingleSource/Makefile.singlesrc
More information about the llvm-commits
mailing list